Home Explore 引导页 在线工具 Blog
Register Sign In
Pchen0
/
electron
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

fix: webview crash when removing in close event (#39008)

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <[email protected]>
trop[bot] 1 year ago
parent
6c7e9b861d
commit
35cf190ab9
4 changed files with 83 additions and 1 deletions
Split View Show Diff Stats
  1. 3 1
      shell/browser/api/electron_api_web_contents.cc
  2. 32 0
      spec/fixtures/crash-cases/webview-remove-on-wc-close/index.html
  3. 29 0
      spec/fixtures/crash-cases/webview-remove-on-wc-close/index.js
  4. 19 0
      spec/fixtures/crash-cases/webview-remove-on-wc-close/webview.html

+ 3 - 1
shell/browser/api/electron_api_web_contents.cc
View File 

@@ -1343,7 +1343,9 @@ void WebContents::CloseContents(content::WebContents* source) {
 
   for (ExtendedWebContentsObserver& observer : observers_)
 
     observer.OnCloseContents();
 
 
-  Destroy();
 
+  // This is handled by the embedder frame.
 
+  if (!IsGuest())
 
+    Destroy();
 
 }
 
 
 void WebContents::ActivateContents(content::WebContents* source) {

+ 32 - 0
spec/fixtures/crash-cases/webview-remove-on-wc-close/index.html
View File 

@@ -0,0 +1,32 @@
 
+<!DOCTYPE html>
 
+<html lang="en">
 
+
 
+<head>
 
+  <meta charset="UTF-8">
 
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
+  <title>Document</title>
 
+  <style>
 
+    .webview {
 
+      border: 1px solid black;
 
+    }
 
+  </style>
 
+</head>
 
+
 
+<body>
 
+  <button class="close-btn">close webview</button>
 
+  <webview class="webview" src="./webview.html"></webview>
 
+  <script>
 
+    const close = document.querySelector('.close-btn')
 
+    const webview = document.querySelector('.webview')
 
+
 
+    webview.addEventListener('close', () => {
 
+      webview.parentNode.removeChild(webview)
 
+    })
 
+
 
+    close.addEventListener('click', () => {
 
+      webview.executeJavaScript('window.close()', true)
 
+    })
 
+  </script>
 
+</body>
 
+
 
+</html>

+ 29 - 0
spec/fixtures/crash-cases/webview-remove-on-wc-close/index.js
View File 

@@ -0,0 +1,29 @@
 
+const { app, BrowserWindow } = require('electron');
 
+
 
+app.whenReady().then(() => {
 
+  const win = new BrowserWindow({
 
+    webPreferences: {
 
+      webviewTag: true
 
+    }
 
+  });
 
+
 
+  win.loadFile('index.html');
 
+
 
+  win.webContents.on('did-attach-webview', (event, contents) => {
 
+    contents.on('render-process-gone', () => {
 
+      process.exit(1);
 
+    });
 
+
 
+    contents.on('destroyed', () => {
 
+      process.exit(0);
 
+    });
 
+
 
+    contents.on('did-finish-load', () => {
 
+      win.webContents.executeJavaScript('document.querySelector(\'.close-btn\').click()');
 
+    });
 
+
 
+    contents.on('will-prevent-unload', event => {
 
+      event.preventDefault();
 
+    });
 
+  });
 
+});

+ 19 - 0
spec/fixtures/crash-cases/webview-remove-on-wc-close/webview.html
View File 

@@ -0,0 +1,19 @@
 
+<!DOCTYPE html>
 
+<html lang="en">
 
+
 
+<head>
 
+  <meta charset="UTF-8">
 
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
+  <title>Document</title>
 
+</head>
 
+
 
+<body>
 
+  <h1>webview page</h1>
 
+  <script>
 
+    window.addEventListener('beforeunload', event => {
 
+      event.returnValue = 'test'
 
+    })
 
+  </script>
 
+</body>
 
+
 
+</html>