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

chore: bump node to v12.10.0 (master) (#20129)

Browse source 
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
This commit is contained in:
Electron Bot 2019-10-14 18:46:10 -04:00 • committed by Shelley Vohr
parent 8dad0c7aaa
commit 6c6bff81ac
9 changed files with 13 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

7
shell/renderer/atom_renderer_client.cc
View file

@ -121,11 +121,10 @@ void AtomRendererClient::DidCreateScriptContext(
node::tracing::TraceEventHelper::SetAgent(node::CreateAgent());
// Setup node environment for each window.
v8::Local<v8::Context> context =
node::MaybeInitializeContext(renderer_context);
DCHECK(!context.IsEmpty());
DCHECK(node::InitializeContext(renderer_context));
node::Environment* env =
node_bindings_->CreateEnvironment(context, nullptr, true);
node_bindings_->CreateEnvironment(renderer_context, nullptr, true);
// If we have disabled the site instance overrides we should prevent loading
// any non-context aware native module
if (command_line->HasSwitch(switches::kDisableElectronSiteInstanceOverrides))

5
shell/renderer/web_worker_observer.cc
View file

@ -48,10 +48,9 @@ void WebWorkerObserver::ContextCreated(v8::Local<v8::Context> worker_context) {
node_bindings_->PrepareMessageLoop();
// Setup node environment for each window.
v8::Local<v8::Context> context = node::MaybeInitializeContext(worker_context);
DCHECK(!context.IsEmpty());
DCHECK(node::InitializeContext(worker_context));
node::Environment* env =
node_bindings_->CreateEnvironment(context, nullptr, true);
node_bindings_->CreateEnvironment(worker_context, nullptr, true);
// Add Electron extended APIs.
electron_bindings_->BindTo(env->isolate(), env->process_object());