small tune of IPC interface.

diff --git a/browser/api/atom_api_browser_ipc.cc b/browser/api/atom_api_browser_ipc.cc
index 0173edc..ac9d6c2 100644 (file)
--- a/browser/api/atom_api_browser_ipc.cc
+++ b/browser/api/atom_api_browser_ipc.cc
@@ -22,12 +22,12 @@ namespace api {
 v8::Handle<v8::Value> BrowserIPC::Send(const v8::Arguments &args) {
   v8::HandleScope scope;
 
-  if (!args[0]->IsNumber() || !args[1]->IsNumber() || !args[2]->IsString())
+  if (!args[0]->IsString() || !args[1]->IsNumber() || !args[2]->IsNumber())
     return node::ThrowTypeError("Bad argument");
 
-  int process_id = args[0]->IntegerValue();
-  int routing_id = args[1]->IntegerValue();
-  std::string channel(*v8::String::Utf8Value(args[2]));
+  std::string channel(*v8::String::Utf8Value(args[0]));
+  int process_id = args[1]->IntegerValue();
+  int routing_id = args[2]->IntegerValue();
 
   RenderViewHost* render_view_host(RenderViewHost::FromID(
       process_id, routing_id));

diff --git a/browser/api/atom_browser_bindings.cc b/browser/api/atom_browser_bindings.cc
index fb9089d..1d6c795 100644 (file)
--- a/browser/api/atom_browser_bindings.cc
+++ b/browser/api/atom_browser_bindings.cc
@@ -50,13 +50,17 @@ void AtomBrowserBindings::OnRendererMessage(int process_id,
 
   scoped_ptr<V8ValueConverter> converter(new V8ValueConverterImpl());
 
+  // process.emit('ATOM_INTERNAL_MESSAGE', 'message', process_id, routing_id);
   std::vector<v8::Handle<v8::Value>> arguments;
   arguments.reserve(3 + args.GetSize());
   arguments.push_back(v8::String::New(channel.c_str(), channel.size()));
+  const base::Value* value;
+  if (args.Get(0, &value))
+    arguments.push_back(converter->ToV8Value(value, context));
   arguments.push_back(v8::Integer::New(process_id));
   arguments.push_back(v8::Integer::New(routing_id));
 
-  for (size_t i = 0; i < args.GetSize(); i++) {
+  for (size_t i = 1; i < args.GetSize(); i++) {
     const base::Value* value;
     if (args.Get(i, &value))
       arguments.push_back(converter->ToV8Value(value, context));

diff --git a/browser/api/lib/ipc.coffee b/browser/api/lib/ipc.coffee
index 108bc30..80d56b1 100644 (file)
--- a/browser/api/lib/ipc.coffee
+++ b/browser/api/lib/ipc.coffee
@@ -4,12 +4,12 @@ send = process.atom_binding('ipc').send
 class Ipc extends EventEmitter
   constructor: ->
     process.on 'ATOM_INTERNAL_MESSAGE', (args...) =>
-      @emit('message', args...)
+      @emit(args...)
 
   send: (process_id, routing_id, args...) ->
-    @sendChannel(process_id, routing_id, 'ATOM_INTERNAL_MESSAGE', args...)
+    @sendChannel(process_id, routing_id, 'message', args...)
 
   sendChannel: (args...) ->
-    send(args...)
+    send('ATOM_INTERNAL_MESSAGE', args...)
 
 module.exports = new Ipc

diff --git a/renderer/api/atom_renderer_bindings.cc b/renderer/api/atom_renderer_bindings.cc
index 702690c..9471277 100644 (file)
--- a/renderer/api/atom_renderer_bindings.cc
+++ b/renderer/api/atom_renderer_bindings.cc
@@ -51,8 +51,8 @@ void AtomRendererBindings::BindToFrame(WebFrame* frame) {
   AtomBindings::BindTo(GetProcessObject(context));
 }
 
-void AtomRendererBindings::OnRendererMessage(const std::string& channel,
-                                             const base::ListValue& args) {
+void AtomRendererBindings::OnBrowserMessage(const std::string& channel,
+                                            const base::ListValue& args) {
   if (!render_view_->GetWebView())
     return;
 

diff --git a/renderer/api/atom_renderer_bindings.h b/renderer/api/atom_renderer_bindings.h
index 17bc1a0..1b25f1b 100644 (file)
--- a/renderer/api/atom_renderer_bindings.h
+++ b/renderer/api/atom_renderer_bindings.h
@@ -32,8 +32,8 @@ class AtomRendererBindings : public AtomBindings {
   void BindToFrame(WebKit::WebFrame* frame);
 
   // Dispatch messages from browser.
-  void OnRendererMessage(const std::string& channel,
-                         const base::ListValue& args);
+  void OnBrowserMessage(const std::string& channel,
+                        const base::ListValue& args);
 
  private:
   content::RenderView* render_view_;

diff --git a/renderer/api/lib/ipc.coffee b/renderer/api/lib/ipc.coffee
index 884cab7..cafb25b 100644 (file)
--- a/renderer/api/lib/ipc.coffee
+++ b/renderer/api/lib/ipc.coffee
@@ -4,12 +4,12 @@ send = process.atom_binding('ipc').send
 class Ipc extends EventEmitter
   constructor: ->
     process.on 'ATOM_INTERNAL_MESSAGE', (args...) =>
-      @emit('message', args...)
+      @emit(args...)
 
   send: (args...) ->
-    @sendChannel('ATOM_INTERNAL_MESSAGE', args...)
+    @sendChannel('message', args...)
 
   sendChannel: (args...) ->
-    send(args...)
+    send('ATOM_INTERNAL_MESSAGE', args...)
 
 module.exports = new Ipc

diff --git a/renderer/atom_render_view_observer.cc b/renderer/atom_render_view_observer.cc
index 30007cc..daf2459 100644 (file)
--- a/renderer/atom_render_view_observer.cc
+++ b/renderer/atom_render_view_observer.cc
@@ -82,16 +82,16 @@ void AtomRenderViewObserver::FrameWillClose(WebFrame* frame) {
 bool AtomRenderViewObserver::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(AtomRenderViewObserver, message)
-    IPC_MESSAGE_HANDLER(AtomViewMsg_Message, OnRendererMessage)
+    IPC_MESSAGE_HANDLER(AtomViewMsg_Message, OnBrowserMessage)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
   return handled;
 }
 
-void AtomRenderViewObserver::OnRendererMessage(const std::string& channel,
-                                               const base::ListValue& args) {
-  atom_bindings()->OnRendererMessage(channel, args);
+void AtomRenderViewObserver::OnBrowserMessage(const std::string& channel,
+                                              const base::ListValue& args) {
+  atom_bindings()->OnBrowserMessage(channel, args);
 }
 
 }  // namespace atom

diff --git a/renderer/atom_render_view_observer.h b/renderer/atom_render_view_observer.h
index 82715f8..55f1cdf 100644 (file)
--- a/renderer/atom_render_view_observer.h
+++ b/renderer/atom_render_view_observer.h
@@ -34,8 +34,8 @@ class AtomRenderViewObserver : content::RenderViewObserver {
   // content::RenderViewObserver implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
-  void OnRendererMessage(const std::string& channel,
-                         const base::ListValue& args);
+  void OnBrowserMessage(const std::string& channel,
+                        const base::ListValue& args);
 
   scoped_ptr<AtomRendererBindings> atom_bindings_;