github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to node 8.2.0

Browse Source
This commit is contained in:
Kevin Sawicki
2017-07-11 10:09:02 -07:00
committed by Aleksei Kuzmin
parent 9f8f95f4c9
commit 9d2aa6f1c7
5 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
atom/browser/node_debugger.cc
View File

@@ -27,9 +27,9 @@ void NodeDebugger::Start() {
node::DebugOptions options;
for (auto& arg : base::CommandLine::ForCurrentProcess()->argv()) {
#if defined(OS_WIN)
options.ParseOption(base::UTF16ToUTF8(arg));
options.ParseOption("Electron", base::UTF16ToUTF8(arg));
#else
options.ParseOption(arg);
options.ParseOption("Electron", arg);
#endif
}

3
atom/common/api/event_emitter_caller.cc
View File

@@ -20,7 +20,8 @@ v8::Local<v8::Value> CallMethodWithArgs(v8::Isolate* isolate,
v8::MicrotasksScope::kRunMicrotasks);
// Use node::MakeCallback to call the callback, and it will also run pending
// tasks in Node.js.
return node::MakeCallback(isolate, obj, method, args->size(), &args->front());
return node::MakeCallback(isolate, obj, method, args->size(), &args->front(),
0, 0).ToLocalChecked();
}
} // namespace internal