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

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

Browse source 
Revert "Fix window.opener being null when nativeWindowOpen is used"
This commit is contained in:
John Kleinschmidt 2017-08-07 14:14:47 -04:00 • committed by GitHub
commit d06eeeede8
1 changed files with 3 additions and 15 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,14 +100,13 @@ bool AtomBrowserClient::ShouldCreateNewSiteInstance(
int process_id = current_instance->GetProcess()->GetID(); int process_id = current_instance->GetProcess()->GetID();
if (!IsRendererSandboxed(process_id)) { if (!IsRendererSandboxed(process_id)) {
auto web_contents = if (!RendererUsesNativeWindowOpen(process_id)) {
content::WebContents::FromRenderFrameHost(render_frame_host);
if (!WebContentsPreferences::UsesNativeWindowOpen(web_contents)) {
// non-sandboxed renderers without native window.open should always create // non-sandboxed renderers without native window.open should always create
// a new SiteInstance // a new SiteInstance
return true; return true;
} }
auto web_contents =
content::WebContents::FromRenderFrameHost(render_frame_host);
if (!ChildWebContentsTracker::IsChildWebContents(web_contents)) { if (!ChildWebContentsTracker::IsChildWebContents(web_contents)) {
// Root WebContents should always create new process to make sure // Root WebContents should always create new process to make sure
// native addons are loaded correctly after reload / navigation. // native addons are loaded correctly after reload / navigation.
@ -115,17 +114,6 @@ bool AtomBrowserClient::ShouldCreateNewSiteInstance(
// reuse process to allow synchronous cross-window scripting.) // reuse process to allow synchronous cross-window scripting.)
return true; 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. // Create new a SiteInstance if navigating to a different site.