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

Separate LoadEnvironment from CreateEnvironment

Browse source
This commit is contained in:
Cheng Zhao 2015-01-21 14:00:19 -08:00
parent 854c59df5c
commit 5e58915bdd
4 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
atom/browser/atom_browser_main_parts.cc
View file

@ -63,8 +63,9 @@ void AtomBrowserMainParts::PostEarlyInitialization() {
// Support the "--debug" switch. // Support the "--debug" switch.
node_debugger_.reset(new NodeDebugger(js_env_->isolate())); node_debugger_.reset(new NodeDebugger(js_env_->isolate()));
// Create the global environment. // Create and load the global environment.
global_env = node_bindings_->CreateEnvironment(js_env_->context()); global_env = node_bindings_->CreateEnvironment(js_env_->context());
node_bindings_->LoadEnvironment(global_env);
// Make sure node can get correct environment when debugging. // Make sure node can get correct environment when debugging.
if (node_debugger_->IsRunning()) if (node_debugger_->IsRunning())

6
atom/common/node_bindings.cc
View file

@ -247,11 +247,13 @@ node::Environment* NodeBindings::CreateEnvironment(
env->set_process_object(process_object); env->set_process_object(process_object);
SetupProcessObject(env, argc, argv, exec_argc, exec_argv); SetupProcessObject(env, argc, argv, exec_argc, exec_argv);
LoadEnvironment(env);
return env; return env;
} }
void NodeBindings::LoadEnvironment(node::Environment* env) {
node::LoadEnvironment(env);
}
void NodeBindings::PrepareMessageLoop() { void NodeBindings::PrepareMessageLoop() {
DCHECK(!is_browser_ || BrowserThread::CurrentlyOn(BrowserThread::UI)); DCHECK(!is_browser_ || BrowserThread::CurrentlyOn(BrowserThread::UI));

3
atom/common/node_bindings.h
View file

@ -32,6 +32,9 @@ class NodeBindings {
// Create the environment and load node.js. // Create the environment and load node.js.
virtual node::Environment* CreateEnvironment(v8::Handle<v8::Context> context); virtual node::Environment* CreateEnvironment(v8::Handle<v8::Context> context);
// Load node.js in the environment.
void LoadEnvironment(node::Environment* env);
// Prepare for message loop integration. // Prepare for message loop integration.
virtual void PrepareMessageLoop(); virtual void PrepareMessageLoop();

1
atom/renderer/atom_renderer_client.cc
View file

@ -148,6 +148,7 @@ void AtomRendererClient::DidCreateScriptContext(blink::WebFrame* frame,
// Setup node environment for each window. // Setup node environment for each window.
node::Environment* env = node_bindings_->CreateEnvironment(context); node::Environment* env = node_bindings_->CreateEnvironment(context);
node_bindings_->LoadEnvironment(env);
// Add atom-shell extended APIs. // Add atom-shell extended APIs.
atom_bindings_->BindToFrame(frame); atom_bindings_->BindToFrame(frame);