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

chore: bump node to v12.18.0 (master) (#23789)

Browse source 
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
This commit is contained in:
Electron Bot 2020-06-17 15:57:12 -07:00 • committed by GitHub
parent 4e66f1b2c6
commit b665eb6d43
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
41 changed files with 266 additions and 314 deletions
Download patch file Download diff file Expand all files Collapse all files

5
shell/app/node_main.cc
View file

@ -251,9 +251,8 @@ int NodeMain(int argc, char* argv[]) {
{
v8::HandleScope scope(isolate);
node::InternalCallbackScope callback_scope(
env, v8::Local<v8::Object>(), {1, 0},
node::InternalCallbackScope::kAllowEmptyResource |
node::InternalCallbackScope::kSkipAsyncHooks);
env, v8::Object::New(isolate), {1, 0},
node::InternalCallbackScope::kSkipAsyncHooks);
node::LoadEnvironment(env);
}

5
shell/browser/microtasks_runner.cc
View file

@ -30,9 +30,10 @@ void MicrotasksRunner::DidProcessTask(const base::PendingTask& pending_task) {
// handle the checkpoint in the browser process.
{
auto* node_env = electron::ElectronBrowserMainParts::Get()->node_env();
v8::HandleScope scope(isolate_);
node::InternalCallbackScope microtasks_scope(
node_env->env(), v8::Local<v8::Object>(), {0, 0},
node::InternalCallbackScope::kAllowEmptyResource);
node_env->env(), v8::Object::New(isolate_), {0, 0},
node::InternalCallbackScope::kNoFlags);
}
}

7
shell/common/api/electron_bindings.cc
View file

@ -132,9 +132,10 @@ void ElectronBindings::OnCallNextTick(uv_async_t* handle) {
node::Environment* env = *it;
gin_helper::Locker locker(env->isolate());
v8::Context::Scope context_scope(env->context());
node::InternalCallbackScope scope(
env, v8::Local<v8::Object>(), {0, 0},
node::InternalCallbackScope::kAllowEmptyResource);
v8::HandleScope handle_scope(env->isolate());
node::InternalCallbackScope scope(env, v8::Object::New(env->isolate()),
{0, 0},
node::InternalCallbackScope::kNoFlags);
}
self->pending_next_ticks_.clear();