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 with render process reuse disabled (#30852)

Browse Source
This commit is contained in:
Robo
2021-09-07 18:50:39 -07:00
committed by GitHub
parent 681d02a77d
commit 1ac4d27e22
3 changed files with 61 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1387,8 +1387,19 @@ void WebContents::HandleNewRenderFrame(
rwh_impl->disable_hidden_ = !background_throttling_;
auto* web_frame = WebFrameMain::FromRenderFrameHost(render_frame_host);
if (web_frame)
if (web_frame) {
// When render process reuse is disabled a new siteinstance will always be
// forced for every navigation, if a WebFrameMain instance was created
// for a FrameTreeNodeId before navigation started, the corresponding
// RenderFrameHost will not be the same when the navigation completes.
// Compare GlobalFrameRoutingId to avoid incorrect behavior.
if (!ElectronBrowserClient::Get()->CanUseCustomSiteInstance() &&
web_frame->render_frame_host()->GetGlobalFrameRoutingId() !=
render_frame_host->GetGlobalFrameRoutingId()) {
return;
}
web_frame->Connect();
}
}
void WebContents::RenderFrameCreated(