Renderer can now use process.send to send messages to browser.

renderer/api/atom_renderer_bindings.cc

@@ -5,17 +5,56 @@
 #include "renderer/api/atom_renderer_bindings.h"
 
 #include "base/logging.h"
+#include "base/values.h"
+#include "common/api/api_messages.h"
+#include "content/public/renderer/render_view.h"
+#include "content/public/renderer/v8_value_converter.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
+#include "vendor/node/src/node.h"
+
+using content::RenderView;
+using content::V8ValueConverter;
+using WebKit::WebFrame;
+using WebKit::WebView;
 
 namespace atom {
 
-AtomRendererBindings::AtomRendererBindings() {
+namespace {
+
+v8::Handle<v8::Object> GetProcessObject(v8::Handle<v8::Context> context) {
+  v8::Handle<v8::Object> process =
+      context->Global()->Get(v8::String::New("process"))->ToObject();
+  DCHECK(!process.IsEmpty());
+
+  return process;
+}
+
+RenderView* GetCurrentRenderView() {
+  WebFrame* frame = WebFrame::frameForCurrentContext();
+  DCHECK(frame);
+  if (!frame)
+    return NULL;
+
+  WebView* view = frame->view();
+  if (!view)
+    return NULL;  // can happen during closing.
+
+  RenderView* render_view = RenderView::FromWebView(view);
+  DCHECK(render_view);
+  return render_view;
+}
+
+}  // namespace
+
+AtomRendererBindings::AtomRendererBindings(RenderView* render_view)
+    : render_view_(render_view) {
 }
 
 AtomRendererBindings::~AtomRendererBindings() {
 }
 
-void AtomRendererBindings::BindToFrame(WebKit::WebFrame* frame) {
+void AtomRendererBindings::BindToFrame(WebFrame* frame) {
   v8::HandleScope handle_scope;
 
   v8::Handle<v8::Context> context = frame->mainWorldScriptContext();
@@ -24,11 +63,46 @@ void AtomRendererBindings::BindToFrame(WebKit::WebFrame* frame) {
 
   v8::Context::Scope scope(context);
 
-  v8::Handle<v8::Object> process =
-      context->Global()->Get(v8::String::New("process"))->ToObject();
-  DCHECK(!process.IsEmpty());
+  AtomBindings::BindTo(GetProcessObject(context));
+}
 
-  AtomBindings::BindTo(process);
+void AtomRendererBindings::AddIPCBindings(WebFrame* frame) {
+  v8::HandleScope handle_scope;
+
+  v8::Handle<v8::Context> context = frame->mainWorldScriptContext();
+  if (context.IsEmpty())
+    return;
+
+  v8::Context::Scope scope(context);
+
+  v8::Handle<v8::Object> process = GetProcessObject(context);
+
+  node::SetMethod(process, "send", Send);
+}
+
+// static
+v8::Handle<v8::Value> AtomRendererBindings::Send(const v8::Arguments &args) {
+  v8::HandleScope scope;
+
+  RenderView* render_view = GetCurrentRenderView();
+
+  // Convert Arguments to Array, so we can use V8ValueConverter to convert it
+  // to ListValue.
+  v8::Local<v8::Array> v8_args = v8::Array::New(args.Length());
+  for (int i = 0; i < args.Length(); ++i)
+    v8_args->Set(i, args[i]);
+
+  scoped_ptr<V8ValueConverter> converter(V8ValueConverter::create());
+  scoped_ptr<base::Value> arguments(
+      converter->FromV8Value(v8_args, v8::Context::GetCurrent()));
+
+  DCHECK(arguments && arguments->IsType(base::Value::TYPE_LIST));
+
+  render_view->Send(new AtomViewHostMsg_Message(
+      render_view->GetRoutingID(),
+      *static_cast<base::ListValue*>(arguments.get())));
+
+  return v8::Undefined();
 }
 
 }  // namespace atom

renderer/api/atom_renderer_bindings.h

@@ -7,17 +7,32 @@
 
 #include "common/api/atom_bindings.h"
 
+namespace content {
+class RenderView;
+}
+
+namespace WebKit {
+class WebFrame;
+}
+
 namespace atom {
 
 class AtomRendererBindings : public AtomBindings {
  public:
-  AtomRendererBindings();
+  explicit AtomRendererBindings(content::RenderView* render_view);
   virtual ~AtomRendererBindings();
 
   // Call BindTo for process object of the frame.
   void BindToFrame(WebKit::WebFrame* frame);
 
+  // Add process.send and make process.on accept IPC message.
+  void AddIPCBindings(WebKit::WebFrame* frame);
+
  private:
+  static v8::Handle<v8::Value> Send(const v8::Arguments &args);
+
+  content::RenderView* render_view_;
+
   DISALLOW_COPY_AND_ASSIGN(AtomRendererBindings);
 };
 

renderer/atom_render_view_observer.cc

@@ -54,6 +54,7 @@ AtomRenderViewObserver::AtomRenderViewObserver(
     content::RenderView* render_view,
     AtomRendererClient* renderer_client)
     : content::RenderViewObserver(render_view),
+      atom_bindings_(new AtomRendererBindings(render_view)),
       renderer_client_(renderer_client) {
   // Interact with dirty workarounds of extra node context in WebKit.
   webkit_atom::SetEnterFirstWindowContext(EnterFirstWindowContext);
@@ -68,7 +69,8 @@ void AtomRenderViewObserver::DidClearWindowObject(WebFrame* frame) {
   web_frames().push_back(frame);
 
   renderer_client_->node_bindings()->BindTo(frame);
-  renderer_client_->atom_bindings()->BindToFrame(frame);
+  atom_bindings()->BindToFrame(frame);
+  atom_bindings()->AddIPCBindings(frame);
 }
 
 void AtomRenderViewObserver::FrameWillClose(WebFrame* frame) {

renderer/atom_render_view_observer.h

@@ -5,10 +5,12 @@
 #ifndef ATOM_RENDERER_ATOM_RENDER_VIEW_OBSERVER_
 #define ATOM_RENDERER_ATOM_RENDER_VIEW_OBSERVER_
 
+#include "base/memory/scoped_ptr.h"
 #include "content/public/renderer/render_view_observer.h"
 
 namespace atom {
 
+class AtomRendererBindings;
 class AtomRendererClient;
 
 class AtomRenderViewObserver : content::RenderViewObserver {
@@ -16,6 +18,8 @@ class AtomRenderViewObserver : content::RenderViewObserver {
   explicit AtomRenderViewObserver(content::RenderView* render_view,
                                   AtomRendererClient* renderer_client);
 
+  AtomRendererBindings* atom_bindings() const { return atom_bindings_.get(); }
+
  protected:
   virtual ~AtomRenderViewObserver();
 
@@ -23,6 +27,8 @@ class AtomRenderViewObserver : content::RenderViewObserver {
   virtual void FrameWillClose(WebKit::WebFrame*) OVERRIDE;
 
  private:
+  scoped_ptr<AtomRendererBindings> atom_bindings_;
+
   // Weak reference to renderer client.
   AtomRendererClient* renderer_client_;
 

renderer/atom_renderer_client.cc

@@ -5,7 +5,6 @@
 #include "renderer/atom_renderer_client.h"
 
 #include "common/node_bindings.h"
-#include "renderer/api/atom_renderer_bindings.h"
 #include "renderer/atom_render_view_observer.h"
 #include "vendor/node/src/node_internals.h"
 
@@ -16,8 +15,7 @@ extern void SetNodeContext(v8::Persistent<v8::Context> context);
 namespace atom {
 
 AtomRendererClient::AtomRendererClient()
-    : atom_bindings_(new AtomRendererBindings),
-      node_bindings_(NodeBindings::Create(false)) {
+    : node_bindings_(NodeBindings::Create(false)) {
 }
 
 AtomRendererClient::~AtomRendererClient() {

renderer/atom_renderer_client.h

@@ -9,7 +9,6 @@
 
 namespace atom {
 
-class AtomRendererBindings;
 class NodeBindings;
 
 class AtomRendererClient : public content::ContentRendererClient {
@@ -17,14 +16,12 @@ class AtomRendererClient : public content::ContentRendererClient {
   AtomRendererClient();
   virtual ~AtomRendererClient();
 
-  AtomRendererBindings* atom_bindings() const { return atom_bindings_.get(); }
   NodeBindings* node_bindings() const { return node_bindings_.get(); }
 
  private:
   virtual void RenderThreadStarted() OVERRIDE;
   virtual void RenderViewCreated(content::RenderView*) OVERRIDE;
 
-  scoped_ptr<AtomRendererBindings> atom_bindings_;
   scoped_ptr<NodeBindings> node_bindings_;
 
   DISALLOW_COPY_AND_ASSIGN(AtomRendererClient);