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

Upgrade to node 7.4

Browse source
This commit is contained in:
Kevin Sawicki 2017-01-18 09:56:41 -08:00 • committed by Birunthan Mohanathas
parent 43067e01e9
commit 54e2c480cb
10 changed files with 35 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
atom/common/api/atom_api_asar.cc
View file

@ -132,12 +132,12 @@ void InitAsarSupport(v8::Isolate* isolate,
v8::Local<v8::Value> require) {
// Evaluate asar_init.coffee.
const char* asar_init_native = reinterpret_cast<const char*>(
static_cast<const unsigned char*>(node::asar_init_native));
static_cast<const unsigned char*>(node::asar_init_data));
v8::Local<v8::Script> asar_init = v8::Script::Compile(v8::String::NewFromUtf8(
isolate,
asar_init_native,
v8::String::kNormalString,
sizeof(node::asar_init_native) -1));
sizeof(node::asar_init_data) -1));
v8::Local<v8::Value> result = asar_init->Run();
// Initialize asar support.
@ -146,10 +146,10 @@ void InitAsarSupport(v8::Isolate* isolate,
std::string)> init;
if (mate::ConvertFromV8(isolate, result, &init)) {
const char* asar_native = reinterpret_cast<const char*>(
static_cast<const unsigned char*>(node::asar_native));
static_cast<const unsigned char*>(node::asar_data));
init.Run(process,
require,
std::string(asar_native, sizeof(node::asar_native) - 1));
std::string(asar_native, sizeof(node::asar_data) - 1));
}
}

4
atom/common/node_bindings.cc
View file

@ -144,7 +144,7 @@ void NodeBindings::Initialize() {
}
node::Environment* NodeBindings::CreateEnvironment(
v8::Handle<v8::Context> context) {
node::IsolateData* isolate_data, v8::Handle<v8::Context> context) {
auto args = AtomCommandLine::argv();
// Feed node the path to initialization script.
@ -160,7 +160,7 @@ node::Environment* NodeBindings::CreateEnvironment(
std::unique_ptr<const char*[]> c_argv = StringVectorToArgArray(args);
node::Environment* env = node::CreateEnvironment(
context->GetIsolate(), uv_default_loop(), context,
isolate_data, context,
args.size(), c_argv.get(), 0, nullptr);
// Node uses the deprecated SetAutorunMicrotasks(false) mode, we should switch

4
atom/common/node_bindings.h
View file

@ -16,6 +16,7 @@ class MessageLoop;
namespace node {
class Environment;
class IsolateData;
}
namespace atom {
@ -30,7 +31,8 @@ class NodeBindings {
void Initialize();
// Create the environment and load node.js.
node::Environment* CreateEnvironment(v8::Handle<v8::Context> context);
node::Environment* CreateEnvironment(node::IsolateData* isolate_data,
v8::Handle<v8::Context> context);
// Load node.js in the environment.
void LoadEnvironment(node::Environment* env);