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

chore: simplify main world setup of contextIsolation (#16046)

Browse source
This commit is contained in:
Cheng Zhao 2018-12-14 06:25:12 +09:00 • committed by John Kleinschmidt
parent d6d245d0c3
commit 897c6e93cb
7 changed files with 34 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

5
atom/renderer/atom_render_frame_observer.cc
View file

@ -96,9 +96,10 @@ void AtomRenderFrameObserver::DidCreateScriptContext(
renderer_client_->DidCreateScriptContext(context, render_frame_);
if (renderer_client_->isolated_world() && IsMainWorld(world_id) &&
render_frame_->IsMainFrame()) {
// Only the top window's main frame has isolated world.
render_frame_->IsMainFrame() && !render_frame_->GetWebFrame()->Opener()) {
CreateIsolatedWorldContext();
renderer_client_->SetupMainWorldOverrides(context);
renderer_client_->SetupMainWorldOverrides(context, render_frame_);
}
}