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

Upgrade Node to v5.10.0

Browse source
This commit is contained in:
Cheng Zhao 2016-04-03 15:05:47 +09:00
parent 442ccbe204
commit 39a20ea4fb
3 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -98,8 +98,17 @@ void AtomBindings::OnCallNextTick(uv_async_t* handle) {
self->pending_next_ticks_.begin();
it != self->pending_next_ticks_.end(); ++it) {
node::Environment* env = *it;
// KickNextTick, copied from node.cc:
node::Environment::AsyncCallbackScope callback_scope(env);
env->KickNextTick(&callback_scope);
if (callback_scope.in_makecallback())
continue;
node::Environment::TickInfo* tick_info = env->tick_info();
if (tick_info->length() == 0)
env->isolate()->RunMicrotasks();
v8::Local<v8::Object> process = env->process_object();
if (tick_info->length() == 0)
tick_info->set_index(0);
env->tick_callback_function()->Call(process, 0, nullptr).IsEmpty();
}
self->pending_next_ticks_.clear();