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

update node::Environment::TickInfo calls

Browse source
This commit is contained in:
Shelley Vohr 2018-03-02 15:58:51 -08:00 committed by Cheng Zhao
parent e3bb3c3906
commit c8ef15cf40
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
atom/common/api/atom_bindings.cc
View file

@ -103,11 +103,11 @@ void AtomBindings::OnCallNextTick(uv_async_t* handle) {
if (callback_scope.in_makecallback()) if (callback_scope.in_makecallback())
continue; continue;
node::Environment::TickInfo* tick_info = env->tick_info(); node::Environment::TickInfo* tick_info = env->tick_info();
if (tick_info->length() == 0) if (!tick_info->has_scheduled())
env->isolate()->RunMicrotasks(); env->isolate()->RunMicrotasks();
v8::Local<v8::Object> process = env->process_object(); v8::Local<v8::Object> process = env->process_object();
if (tick_info->length() == 0) if (!tick_info->has_scheduled())
tick_info->set_index(0); return;
env->tick_callback_function()->Call(process, 0, nullptr).IsEmpty(); env->tick_callback_function()->Call(process, 0, nullptr).IsEmpty();
} }

2
vendor/node vendored

@ -1 +1 @@
Subproject commit 86c3cc8a38a15a05a05c8a256eb72013cd240e78 Subproject commit 9c2b9b16af48f33d2fa73bab30206ba5b15d9dde