mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
* fix: cleanup webview zoom level observers on navigation

* add spec

* webview should be on same partition

* wait for webview to finish loading
This commit is contained in:
Robo 2020-07-28 13:00:44 -07:00 committed by GitHub
parent 38fafe4986
commit b6321cc22d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 41 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1413,6 +1413,11 @@ bool WebContents::OnMessageReceived(const IPC::Message& message) {
// we need to make sure the api::WebContents is also deleted. // we need to make sure the api::WebContents is also deleted.
// For #4, the WebContents will be destroyed by embedder. // For #4, the WebContents will be destroyed by embedder.
void WebContents::WebContentsDestroyed() { 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. // Cleanup relationships with other parts.
RemoveFromWeakMap(); RemoveFromWeakMap();

4
shell/browser/web_view_guest_delegate.cc
View file

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

1
shell/browser/web_view_guest_delegate.h
View file

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

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

@ -315,6 +315,25 @@ describe('<webview> tag', function () {
const [, zoomLevel] = await emittedOnce(ipcMain, 'webview-origin-zoom-level'); const [, zoomLevel] = await emittedOnce(ipcMain, 'webview-origin-zoom-level');
expect(zoomLevel).to.equal(2.0); 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', () => { 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>