github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: crash when navigating from a page with webview that has inherited zoom level (#24757) (#24766)

Browse Source
This commit is contained in:
Robo
2020-08-03 12:55:24 -07:00
committed by GitHub
parent 96bd258b0f
commit d3e5b791a5
5 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
shell/browser/api/electron_api_web_contents.cc
View File

@@ -1352,6 +1352,11 @@ bool WebContents::OnMessageReceived(const IPC::Message& message) {
// we need to make sure the api::WebContents is also deleted.
// For #4, the WebContents will be destroyed by embedder.
void WebContents::WebContentsDestroyed() {
// Give chance for guest delegate to cleanup its observers
// since the native class is only destroyed in the next tick.
if (guest_delegate_)
guest_delegate_->WillDestroy();
// Cleanup relationships with other parts.
RemoveFromWeakMap();

4
shell/browser/web_view_guest_delegate.cc
View File

@@ -58,6 +58,10 @@ void WebViewGuestDelegate::AttachToIframe(
api_web_contents_->Emit("did-attach");
}
void WebViewGuestDelegate::WillDestroy() {
ResetZoomController();
}
void WebViewGuestDelegate::DidDetach() {
ResetZoomController();
}

1
shell/browser/web_view_guest_delegate.h
View File

@@ -24,6 +24,7 @@ class WebViewGuestDelegate : public content::BrowserPluginGuestDelegate,
// Attach to the iframe.
void AttachToIframe(content::WebContents* embedder_web_contents,
int embedder_frame_id);
void WillDestroy();
protected:
// content::BrowserPluginGuestDelegate:

19
spec-main/webview-spec.ts
View File

@@ -273,6 +273,25 @@ describe('<webview> tag', function () {
const [, zoomLevel] = await emittedOnce(ipcMain, 'webview-origin-zoom-level')
expect(zoomLevel).to.equal(2.0)
})
it('does not crash when navigating with zoom level inherited from parent', async () => {
const w = new BrowserWindow({
show: false,
webPreferences: {
webviewTag: true,
nodeIntegration: true,
zoomFactor: 1.2,
session: webviewSession
}
})
const attachPromise = emittedOnce(w.webContents, 'did-attach-webview')
const readyPromise = emittedOnce(ipcMain, 'dom-ready')
w.loadFile(path.join(fixtures, 'pages', 'webview-zoom-inherited.html'))
const [, webview] = await attachPromise
await readyPromise
expect(webview.getZoomFactor()).to.equal(1.2)
await w.loadURL(`${zoomScheme}://host1`)
})
})
describe('nativeWindowOpen option', () => {

12
spec/fixtures/pages/webview-zoom-inherited.html vendored Normal file
View File

@@ -0,0 +1,12 @@
<html>
<body>
<webview src="./a.html" id="view" partition="webview-temp"/>
</body>
<script>
const {ipcRenderer} = require('electron')
const view = document.getElementById('view')
view.addEventListener('dom-ready', () => {
ipcRenderer.send('dom-ready')
})
</script>
</html>