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

Only create isolated context in main frame

Browse source
This commit is contained in:
Kevin Sawicki 2017-01-13 12:54:23 -08:00
parent 2e62d81c24
commit dcf9a395c2
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
atom/renderer/atom_renderer_client.cc
View file

@ -139,7 +139,7 @@ class AtomRenderFrameObserver : public content::RenderFrameObserver {
} }
bool ShouldNotifyClient(int world_id) { bool ShouldNotifyClient(int world_id) {
if (renderer_client_->isolated_world()) if (renderer_client_->isolated_world() && render_frame_->IsMainFrame())
return IsIsolatedWorld(world_id); return IsIsolatedWorld(world_id);
else else
return IsMainWorld(world_id); return IsMainWorld(world_id);
@ -151,7 +151,8 @@ class AtomRenderFrameObserver : public content::RenderFrameObserver {
if (ShouldNotifyClient(world_id)) if (ShouldNotifyClient(world_id))
renderer_client_->DidCreateScriptContext(context, render_frame_); renderer_client_->DidCreateScriptContext(context, render_frame_);
if (renderer_client_->isolated_world() && IsMainWorld(world_id)) { if (renderer_client_->isolated_world() && IsMainWorld(world_id)
&& render_frame_->IsMainFrame()) {
CreateIsolatedWorldContext(); CreateIsolatedWorldContext();
SetupMainWorldOverrides(context); SetupMainWorldOverrides(context);
} }