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

Add atom-shell bindings before loading environment

Browse source
This commit is contained in:
Cheng Zhao 2015-01-21 15:02:09 -08:00
parent 5e58915bdd
commit 7e33e26465
8 changed files with 74 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

6
atom/renderer/atom_renderer_client.cc
View file

@ -148,10 +148,9 @@ void AtomRendererClient::DidCreateScriptContext(blink::WebFrame* frame,
// Setup node environment for each window.
node::Environment* env = node_bindings_->CreateEnvironment(context);
node_bindings_->LoadEnvironment(env);
// Add atom-shell extended APIs.
atom_bindings_->BindToFrame(frame);
atom_bindings_->BindTo(env->isolate(), env->process_object());
// Store the created environment.
web_page_envs_.push_back(env);
@ -159,6 +158,9 @@ void AtomRendererClient::DidCreateScriptContext(blink::WebFrame* frame,
// Make uv loop being wrapped by window context.
if (node_bindings_->uv_env() == NULL)
node_bindings_->set_uv_env(env);
// Load everything.
node_bindings_->LoadEnvironment(env);
}
void AtomRendererClient::WillReleaseScriptContext(