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

Move node integration from RenderViewObserver to RendererClient.

Browse source
This commit is contained in:
Cheng Zhao 2013-12-23 22:08:45 +08:00
parent 02d94c8b2e
commit df0094b6cb
6 changed files with 54 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

18
renderer/api/atom_renderer_bindings.cc
View file

@ -4,9 +4,6 @@
#include "renderer/api/atom_renderer_bindings.h"
#include <vector>
#include "base/logging.h"
#include "common/v8/native_type_conversions.h"
#include "content/public/renderer/render_view.h"
#include "third_party/WebKit/public/web/WebFrame.h"
@ -14,9 +11,7 @@
#include "common/v8/node_common.h"
using content::RenderView;
using content::V8ValueConverter;
using WebKit::WebFrame;
namespace atom {
@ -32,14 +27,13 @@ v8::Handle<v8::Object> GetProcessObject(v8::Handle<v8::Context> context) {
} // namespace
AtomRendererBindings::AtomRendererBindings(RenderView* render_view)
: render_view_(render_view) {
AtomRendererBindings::AtomRendererBindings() {
}
AtomRendererBindings::~AtomRendererBindings() {
}
void AtomRendererBindings::BindToFrame(WebFrame* frame) {
void AtomRendererBindings::BindToFrame(WebKit::WebFrame* frame) {
v8::HandleScope handle_scope(node_isolate);
v8::Handle<v8::Context> context = frame->mainWorldScriptContext();
@ -47,19 +41,19 @@ void AtomRendererBindings::BindToFrame(WebFrame* frame) {
return;
v8::Context::Scope scope(context);
AtomBindings::BindTo(GetProcessObject(context));
}
void AtomRendererBindings::OnBrowserMessage(const string16& channel,
void AtomRendererBindings::OnBrowserMessage(content::RenderView* render_view,
const string16& channel,
const base::ListValue& args) {
if (!render_view_->GetWebView())
if (!render_view->GetWebView())
return;
v8::HandleScope handle_scope(node_isolate);
v8::Local<v8::Context> context =
render_view_->GetWebView()->mainFrame()->mainWorldScriptContext();
render_view->GetWebView()->mainFrame()->mainWorldScriptContext();
if (context.IsEmpty())
return;

7
renderer/api/atom_renderer_bindings.h
View file

@ -25,19 +25,18 @@ namespace atom {
class AtomRendererBindings : public AtomBindings {
public:
explicit AtomRendererBindings(content::RenderView* render_view);
AtomRendererBindings();
virtual ~AtomRendererBindings();
// Call BindTo for process object of the frame.
void BindToFrame(WebKit::WebFrame* frame);
// Dispatch messages from browser.
void OnBrowserMessage(const string16& channel,
void OnBrowserMessage(content::RenderView* render_view,
const string16& channel,
const base::ListValue& args);
private:
content::RenderView* render_view_;
DISALLOW_COPY_AND_ASSIGN(AtomRendererBindings);
};