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

Initialize node after WebKit is initialized.

Browse source
This commit is contained in:
Cheng Zhao 2014-09-01 18:43:43 +08:00
parent 241b07f763
commit a413935e91
2 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
atom/renderer/atom_renderer_client.cc
View file

@ -14,10 +14,12 @@
#include "chrome/renderer/printing/print_web_view_helper.h" #include "chrome/renderer/printing/print_web_view_helper.h"
#include "content/public/renderer/render_frame.h" #include "content/public/renderer/render_frame.h"
#include "content/public/renderer/render_frame_observer.h" #include "content/public/renderer/render_frame_observer.h"
#include "content/public/renderer/render_thread.h"
#include "base/command_line.h" #include "base/command_line.h"
#include "native_mate/converter.h" #include "native_mate/converter.h"
#include "third_party/WebKit/public/web/WebDocument.h" #include "third_party/WebKit/public/web/WebDocument.h"
#include "third_party/WebKit/public/web/WebFrame.h" #include "third_party/WebKit/public/web/WebFrame.h"
#include "third_party/WebKit/public/web/WebKit.h"
#include "atom/common/node_includes.h" #include "atom/common/node_includes.h"
@ -83,7 +85,7 @@ AtomRendererClient::AtomRendererClient()
AtomRendererClient::~AtomRendererClient() { AtomRendererClient::~AtomRendererClient() {
} }
void AtomRendererClient::RenderThreadStarted() { void AtomRendererClient::WebKitInitialized() {
if (!IsNodeBindingEnabled()) if (!IsNodeBindingEnabled())
return; return;
@ -94,12 +96,16 @@ void AtomRendererClient::RenderThreadStarted() {
// Create a default empty environment which would be used when we need to // Create a default empty environment which would be used when we need to
// run V8 code out of a window context (like running a uv callback). // run V8 code out of a window context (like running a uv callback).
v8::Isolate* isolate = v8::Isolate::GetCurrent(); v8::Isolate* isolate = blink::mainThreadIsolate();
v8::HandleScope handle_scope(isolate); v8::HandleScope handle_scope(isolate);
v8::Local<v8::Context> context = v8::Context::New(isolate); v8::Local<v8::Context> context = v8::Context::New(isolate);
global_env = node::Environment::New(context); global_env = node::Environment::New(context);
} }
void AtomRendererClient::RenderThreadStarted() {
content::RenderThread::Get()->AddObserver(this);
}
void AtomRendererClient::RenderFrameCreated( void AtomRendererClient::RenderFrameCreated(
content::RenderFrame* render_frame) { content::RenderFrame* render_frame) {
new AtomRenderFrameObserver(render_frame, this); new AtomRenderFrameObserver(render_frame, this);

7
atom/renderer/atom_renderer_client.h
View file

@ -9,6 +9,7 @@
#include <vector> #include <vector>
#include "content/public/renderer/content_renderer_client.h" #include "content/public/renderer/content_renderer_client.h"
#include "content/public/renderer/render_process_observer.h"
namespace node { namespace node {
class Environment; class Environment;
@ -19,7 +20,8 @@ namespace atom {
class AtomRendererBindings; class AtomRendererBindings;
class NodeBindings; class NodeBindings;
class AtomRendererClient : public content::ContentRendererClient { class AtomRendererClient : public content::ContentRendererClient,
public content::RenderProcessObserver {
public: public:
AtomRendererClient(); AtomRendererClient();
virtual ~AtomRendererClient(); virtual ~AtomRendererClient();
@ -41,6 +43,9 @@ class AtomRendererClient : public content::ContentRendererClient {
DISABLE, DISABLE,
}; };
// content::RenderProcessObserver:
virtual void WebKitInitialized() OVERRIDE;
// content::ContentRendererClient: // content::ContentRendererClient:
virtual void RenderThreadStarted() OVERRIDE; virtual void RenderThreadStarted() OVERRIDE;
virtual void RenderFrameCreated(content::RenderFrame* render_frame) OVERRIDE; virtual void RenderFrameCreated(content::RenderFrame* render_frame) OVERRIDE;