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

6
atom/browser/atom_browser_main_parts.cc
View file

@ -129,9 +129,13 @@ void AtomBrowserMainParts::PostEarlyInitialization() {
// Support the "--debug" switch.
node_debugger_.reset(new NodeDebugger(js_env_->isolate()));
isolate_data_.reset(
new node::IsolateData(js_env_->isolate(), uv_default_loop()));
// Create the global environment.
node::Environment* env =
node_bindings_->CreateEnvironment(js_env_->context());
node_bindings_->CreateEnvironment(isolate_data_.get(),
js_env_->context());
// Make sure node can get correct environment when debugging.
if (node_debugger_->IsRunning())

5
atom/browser/atom_browser_main_parts.h
View file

@ -15,6 +15,10 @@
class BrowserProcess;
namespace node {
class IsolateData;
}
namespace atom {
class AtomBindings;
@ -82,6 +86,7 @@ class AtomBrowserMainParts : public brightray::BrowserMainParts {
std::unique_ptr<NodeBindings> node_bindings_;
std::unique_ptr<AtomBindings> atom_bindings_;
std::unique_ptr<NodeDebugger> node_debugger_;
std::unique_ptr<node::IsolateData> isolate_data_;
base::Timer gc_timer_;