Move node integration from RenderViewObserver to RendererClient.
This commit is contained in:
parent
02d94c8b2e
commit
df0094b6cb
6 changed files with 54 additions and 57 deletions
|
@ -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;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue