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

Send document-start/end to the right context when contextIsolation=true (#12738)

Browse source
This commit is contained in:
Jeremy Apthorp 2018-05-04 23:39:54 -07:00 • committed by Shelley Vohr
parent 022b6973b2
commit 118da36b52
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
atom/renderer/atom_renderer_client.cc
View file

@ -218,8 +218,9 @@ node::Environment* AtomRendererClient::GetEnvironment(
if (injected_frames_.find(render_frame) == injected_frames_.end())
return nullptr;
v8::HandleScope handle_scope(v8::Isolate::GetCurrent());
node::Environment* env = node::Environment::GetCurrent(
render_frame->GetWebFrame()->MainWorldScriptContext());
auto context =
GetContext(render_frame->GetWebFrame(), v8::Isolate::GetCurrent());
node::Environment* env = node::Environment::GetCurrent(context);
if (environments_.find(env) == environments_.end())
return nullptr;
return env;