diff --git a/atom/browser/atom_browser_client.cc b/atom/browser/atom_browser_client.cc index 61c97f2c35..3401ef5818 100644 --- a/atom/browser/atom_browser_client.cc +++ b/atom/browser/atom_browser_client.cc @@ -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.