fix: BrowserView crash when 'beforeunload' prevented (electron#37205)

codebytere · web-flow · commit 8eee4f2df198 · 2023-02-14T18:40:37.000+01:00
fix: crash when beforeunload prevented
diff --git a/shell/browser/api/electron_api_browser_window.cc b/shell/browser/api/electron_api_browser_window.cc
@@ -112,7 +112,6 @@ BrowserWindow::~BrowserWindow() {
     api_web_contents_->RemoveObserver(this);
     // Destroy the WebContents.
     OnCloseContents();
-    api_web_contents_->Destroy();
   }
 }
 
@@ -140,6 +139,7 @@ void BrowserWindow::WebContentsDestroyed() {
 
 void BrowserWindow::OnCloseContents() {
   BaseWindow::ResetBrowserViews();
+  api_web_contents_->Destroy();
 }
 
 void BrowserWindow::OnRendererResponsive(content::RenderProcessHost*) {
diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc
@@ -1222,7 +1222,9 @@ void WebContents::CloseContents(content::WebContents* source) {
   for (ExtendedWebContentsObserver& observer : observers_)
     observer.OnCloseContents();
 
-  Destroy();
+  // If there are observers, OnCloseContents will call Destroy()
+  if (observers_.empty())
+    Destroy();
 }
 
 void WebContents::ActivateContents(content::WebContents* source) {

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,6 @@ BrowserWindow::~BrowserWindow() {`
`112`	`112`	`api_web_contents_->RemoveObserver(this);`
`113`	`113`	`// Destroy the WebContents.`
`114`	`114`	`OnCloseContents();`
`115`		`- api_web_contents_->Destroy();`
`116`	`115`	`}`
`117`	`116`	`}`
`118`	`117`
`@@ -140,6 +139,7 @@ void BrowserWindow::WebContentsDestroyed() {`
`140`	`139`
`141`	`140`	`void BrowserWindow::OnCloseContents() {`
`142`	`141`	`BaseWindow::ResetBrowserViews();`
	`142`	`+ api_web_contents_->Destroy();`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`void BrowserWindow::OnRendererResponsive(content::RenderProcessHost*) {`
Original file line number	Diff line number	Diff line change
`@@ -1222,7 +1222,9 @@ void WebContents::CloseContents(content::WebContents* source) {`
`1222`	`1222`	`for (ExtendedWebContentsObserver& observer : observers_)`
`1223`	`1223`	`observer.OnCloseContents();`
`1224`	`1224`
`1225`		`- Destroy();`
	`1225`	`+ // If there are observers, OnCloseContents will call Destroy()`
	`1226`	`+ if (observers_.empty())`
	`1227`	`+ Destroy();`
`1226`	`1228`	`}`
`1227`	`1229`
`1228`	`1230`	`void WebContents::ActivateContents(content::WebContents* source) {`