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

fix: <webview> not working in scriptable popups (#19218)

trop[bot] 5 years ago
parent
f3b9f58b7f
commit
fb51509153
5 changed files with 53 additions and 3 deletions
Split View Show Diff Stats
  1. 3 3
      atom/browser/web_contents_preferences.cc
  2. 21 0
      spec/api-browser-window-spec.js
  3. 3 0
      spec/fixtures/api/new-window-webview-preload.js
  4. 20 0
      spec/fixtures/api/new-window-webview.html
  5. 6 0
      spec/static/main.js

+ 3 - 3
atom/browser/web_contents_preferences.cc
View File 

@@ -147,8 +147,6 @@ WebContentsPreferences::WebContentsPreferences(
 
 #endif
 
   SetDefaultBoolIfUndefined(options::kOffscreen, false);
 
 
-  SetDefaults();
 
-
 
   // If this is a <webview> tag, and the embedder is offscreen-rendered, then
 
   // this WebContents is also offscreen-rendered.
 
   int guest_instance_id = 0;
 
@@ -166,7 +164,7 @@ WebContentsPreferences::WebContentsPreferences(
 
     }
 
   }
 
 
-  last_preference_ = preference_.Clone();
 
+  SetDefaults();
 
 }
 
 
 WebContentsPreferences::~WebContentsPreferences() {
 
@@ -178,6 +176,8 @@ void WebContentsPreferences::SetDefaults() {
 
   if (IsEnabled(options::kSandbox)) {
 
     SetBool(options::kNativeWindowOpen, true);
 
   }
 
+
 
+  last_preference_ = preference_.Clone();
 
 }
 
 
 bool WebContentsPreferences::SetDefaultBoolIfUndefined(

+ 21 - 0
spec/api-browser-window-spec.js
View File 

@@ -2095,6 +2095,27 @@ describe('BrowserWindow module', () => {
 
         })
 
         w.loadFile(path.join(fixtures, 'api', 'native-window-open-native-addon.html'))
 
       })
 
+      it('<webview> works in a scriptable popup', (done) => {
 
+        const preload = path.join(fixtures, 'api', 'new-window-webview-preload.js')
 
+
 
+        w.destroy()
 
+        w = new BrowserWindow({
 
+          show: false,
 
+          webPreferences: {
 
+            nodeIntegrationInSubFrames: true,
 
+            nativeWindowOpen: true,
 
+            webviewTag: true,
 
+            preload
 
+          }
 
+        })
 
+
 
+        ipcRenderer.send('set-options-on-next-new-window', w.webContents.id, 'show', false)
 
+
 
+        ipcMain.once('webview-loaded', () => {
 
+          done()
 
+        })
 
+        w.loadFile(path.join(fixtures, 'api', 'new-window-webview.html'))
 
+      })
 
       it('should inherit the nativeWindowOpen setting in opened windows', (done) => {
 
         w.destroy()
 
         w = new BrowserWindow({

+ 3 - 0
spec/fixtures/api/new-window-webview-preload.js
View File 

@@ -0,0 +1,3 @@
 
+const { ipcRenderer } = require('electron')
 
+
 
+window.ipcRenderer = ipcRenderer

+ 20 - 0
spec/fixtures/api/new-window-webview.html
View File 

@@ -0,0 +1,20 @@
 
+<!DOCTYPE html>
 
+<html>
 
+  <head>
 
+    <meta charset="utf-8">
 
+    <title></title>
 
+  </head>
 
+  <body>
 
+    <script type="text/javascript">
 
+      const code = `
 
+var webview = document.createElement('webview')
 
+webview.src = 'about:blank'
 
+webview.addEventListener('did-finish-load', () => {
 
+  ipcRenderer.send('webview-loaded')
 
+}, {once: true})
 
+document.body.appendChild(webview)
 
+`
 
+      open('about:blank').eval(code)
 
+    </script>
 
+  </body>
 
+</html>

+ 6 - 0
spec/static/main.js
View File 

@@ -341,6 +341,12 @@ ipcMain.on('prevent-next-new-window', (event, id) => {
 
   webContents.fromId(id).once('new-window', event => event.preventDefault())
 
 })
 
 
+ipcMain.on('set-options-on-next-new-window', (event, id, key, value) => {
 
+  webContents.fromId(id).once('new-window', (event, url, frameName, disposition, options) => {
 
+    options[key] = value
 
+  })
 
+})
 
+
 
 ipcMain.on('set-web-preferences-on-next-new-window', (event, id, key, value) => {
 
   webContents.fromId(id).once('new-window', (event, url, frameName, disposition, options) => {
 
     options.webPreferences[key] = value