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

fix: use context counter as contextId (backport 3-0-x)

Browse source 
For sandboxed renderer it may not have a node::Environment in the context,
using a increasing counter as contextId works for all cases.
This commit is contained in:
Cheng Zhao 2018-07-19 13:29:47 +09:00 • committed by Jeremy Apthorp
parent 8d9775b0b1
commit 136cf389e8
10 changed files with 68 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
atom/renderer/atom_sandboxed_renderer_client.cc
View file

@ -97,7 +97,7 @@ void InitializeBindings(v8::Local<v8::Object> binding,
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
if (command_line->HasSwitch(switches::kGuestInstanceID))
b.Set(options::kGuestInstanceID,
command_line->GetSwitchValueASCII(switches::kGuestInstanceID));
command_line->GetSwitchValueASCII(switches::kGuestInstanceID));
}
class AtomSandboxedRenderFrameObserver : public AtomRenderFrameObserver {
@ -153,6 +153,8 @@ void AtomSandboxedRendererClient::RenderViewCreated(
void AtomSandboxedRendererClient::DidCreateScriptContext(
v8::Handle<v8::Context> context,
content::RenderFrame* render_frame) {
RendererClientBase::DidCreateScriptContext(context, render_frame);
// Only allow preload for the main frame or
// For devtools we still want to run the preload_bundle script
if (!render_frame->IsMainFrame() && !IsDevTools(render_frame))