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

Merge pull request #9961 from electron/fix-window-opener

Browse source 
Fix window.opener being null when nativeWindowOpen is used
This commit is contained in:
Cheng Zhao 2017-08-04 21:18:47 +09:00 committed by GitHub
commit 63d7aee1a6
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
atom/browser/atom_browser_client.cc
View file

@ -100,13 +100,14 @@ bool AtomBrowserClient::ShouldCreateNewSiteInstance(
int process_id = current_instance->GetProcess()->GetID();
if (!IsRendererSandboxed(process_id)) {
if (!RendererUsesNativeWindowOpen(process_id)) {
auto web_contents =
content::WebContents::FromRenderFrameHost(render_frame_host);
if (!WebContentsPreferences::UsesNativeWindowOpen(web_contents)) {
// non-sandboxed renderers without native window.open should always create
// a new SiteInstance
return true;
}
auto web_contents =
content::WebContents::FromRenderFrameHost(render_frame_host);
if (!ChildWebContentsTracker::IsChildWebContents(web_contents)) {
// Root WebContents should always create new process to make sure
// native addons are loaded correctly after reload / navigation.
@ -114,6 +115,17 @@ bool AtomBrowserClient::ShouldCreateNewSiteInstance(
// reuse process to allow synchronous cross-window scripting.)
return true;
}
// In a non-sandboxed renderer with native window open we should
// reuse the same site to allow cross-window scripting. We do
// not need to check urls / domains as native window open logic
// handles cross site scripting protection.
//
// NOTE: We know that nativeWindowOpen is enabled at this point
// because we check if it is NOT enabled above this point. We
// will only reach this return if sandbox is disabled but
// nativeWindowOpen is enabled.
return false;
}
// Create new a SiteInstance if navigating to a different site.