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

Add comments and use ToLocal instead of ToLocalChecked

Browse source
This commit is contained in:
Samuel Attard 2017-11-15 18:21:47 +11:00
parent 3c0b233d04
commit 8a8f169628
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
atom/common/api/event_emitter_caller.cc
View file

@ -20,13 +20,22 @@ v8::Local<v8::Value> CallMethodWithArgs(v8::Isolate* isolate,
v8::MicrotasksScope::kRunMicrotasks); v8::MicrotasksScope::kRunMicrotasks);
// Use node::MakeCallback to call the callback, and it will also run pending // Use node::MakeCallback to call the callback, and it will also run pending
// tasks in Node.js. // tasks in Node.js.
v8::MaybeLocal<v8::Value> ret = node::MakeCallback(isolate, obj, method, v8::MaybeLocal<v8::Value> ret = node::MakeCallback(isolate, obj, method, args->size(), &args->front(),
args->size(), {0, 0});
&args->front(), {0, 0}); // If the JS function throws an exception (doesn't return a value) the result
// of MakeCallback will be empty, in this case we need to return "false" as
// that indicates that the event emitter did not handle the event
if (ret.IsEmpty()) { if (ret.IsEmpty()) {
return v8::Boolean::New(isolate, false); return v8::Boolean::New(isolate, false);
} }
return ret.ToLocalChecked();
v8::Local<v8::Value> localRet;
if (ret.ToLocal(&localRet)) {
return localRet;
}
// Should be unreachable, but the compiler complains if we don't check
// the result of ToLocal
return v8::Undefined(isolate);
} }
} // namespace internal } // namespace internal