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

fix: DCHECK on reload when forcefullyCrashRenderer() is called (#30544)

Browse source
This commit is contained in:
Shelley Vohr 2021-08-18 20:23:06 +02:00 • committed by GitHub
parent 29749f3dc6
commit 90b5ba3bed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
shell/browser/electron_browser_client.cc
View file

@ -951,9 +951,9 @@ void ElectronBrowserClient::RenderProcessReady(
void ElectronBrowserClient::RenderProcessExited( void ElectronBrowserClient::RenderProcessExited(
content::RenderProcessHost* host, content::RenderProcessHost* host,
const content::ChildProcessTerminationInfo& info) { const content::ChildProcessTerminationInfo& info) {
if (delegate_) { if (delegate_)
static_cast<api::App*>(delegate_)->RenderProcessExited(host); static_cast<api::App*>(delegate_)->RenderProcessExited(host);
} host->RemoveObserver(this);
} }
void OnOpenExternal(const GURL& escaped_url, bool allowed) { void OnOpenExternal(const GURL& escaped_url, bool allowed) {

7
spec-main/api-web-contents-spec.ts
View file

@ -1330,6 +1330,13 @@ describe('webContents module', () => {
w.webContents.reload(); w.webContents.reload();
expect(w.webContents.isCrashed()).to.equal(false); expect(w.webContents.isCrashed()).to.equal(false);
}); });
it('does not crash when a new page is loaded after forcefullyCrashRenderer()', async () => {
expect(w.webContents.isCrashed()).to.equal(false);
w.webContents.forcefullyCrashRenderer();
await w.loadFile(path.join(fixturesPath, 'pages', 'base-page.html'));
expect(w.webContents.isCrashed()).to.equal(false);
});
}); });
} }