Make ExtensionMsg_MessageInvoke run a module system function rather than a

chrome/renderer/extensions/miscellaneous_bindings.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/extensions/miscellaneous_bindings.h"
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 116 matching lines @@
     CHECK_EQ(2, args.Length());
     CHECK(args[0]->IsInt32());
     CHECK(args[1]->IsBoolean());
 
     int port_id = args[0]->Int32Value();
     if (!HasPortData(port_id))
       return v8::Undefined();
 
     // Send via the RenderThread because the RenderView might be closing.
     bool notify_browser = args[1]->BooleanValue();
-    if (notify_browser) {
+    if (notify_browser)
       content::RenderThread::Get()->Send(
           new ExtensionHostMsg_CloseChannel(port_id, std::string()));
-    }
-
     ClearPortData(port_id);
 
     return v8::Undefined();
   }
 
   // A new port has been created for a context.  This occurs both when script
   // opens a connection, and when a connection is opened to this script.
   v8::Handle<v8::Value> PortAddRef(const v8::Arguments& args) {
     // Arguments are (int32 port_id).
     CHECK_EQ(1, args.Length());
@@ skipping 101 matching lines @@
 
     v8::Handle<v8::Value> arguments[] = {
       v8::Integer::New(target_port_id),
       v8::String::New(channel_name.c_str(), channel_name.size()),
       tab,
       v8::String::New(source_extension_id.c_str(), source_extension_id.size()),
       v8::String::New(target_extension_id.c_str(), target_extension_id.size()),
       v8::String::New(source_url_spec.c_str(), source_url_spec.size())
     };
 
-    v8::Handle<v8::Value> retval;
-    v8::TryCatch try_catch;
-    if (!(*it)->CallChromeHiddenMethod("Port.dispatchOnConnect",
-                                      arraysize(arguments), arguments,
-                                      &retval)) {
-      continue;
-    }
-
-    if (try_catch.HasCaught()) {
-      LOG(ERROR) << "Exception caught when calling Port.dispatchOnConnect.";
-      continue;
-    }
+    v8::Handle<v8::Value> retval = (*it)->module_system()->CallModuleMethod(

[koz (OOO until 15th September), 2013/05/31 04:28:44]

No more need for v8::TryCatch?

[not at google - send to devlin, 2013/05/31 22:47:07]

Yeah CallModuleMethod handles it. I figure it's simpler than forcing callers to
deal with it; I've been making it a crash error if that happens (when JS wants
to call into user code they should make sure to catch and deal with errors).

+        "miscellaneous_bindings",
+        "dispatchOnConnect",
+        arraysize(arguments), arguments);
 
     if (retval.IsEmpty()) {
-      LOG(ERROR) << "Empty return value from Port.dispatchOnConnect.";
+      LOG(ERROR) << "Empty return value from dispatchOnConnect.";
       continue;
     }
 
     CHECK(retval->IsBoolean());
-    if (retval->BooleanValue())
-      port_created = true;
+    port_created |= retval->BooleanValue();
   }
 
   // If we didn't create a port, notify the other end of the channel (treat it
   // as a disconnect).
   if (!port_created) {
     content::RenderThread::Get()->Send(
         new ExtensionHostMsg_CloseChannel(
             target_port_id, kReceivingEndDoesntExistError));
   }
 }
@@ skipping 12 matching lines @@
         restrict_to_render_view != (*it)->GetRenderView()) {
       continue;
     }
 
     v8::Handle<v8::Context> context = (*it)->v8_context();
     v8::Context::Scope context_scope(context);
 
     // Check to see whether the context has this port before bothering to create
     // the message.
     v8::Handle<v8::Value> port_id_handle = v8::Integer::New(target_port_id);
-    v8::Handle<v8::Value> has_port;
-    v8::TryCatch try_catch;
-    if (!(*it)->CallChromeHiddenMethod("Port.hasPort", 1, &port_id_handle,
-                                       &has_port)) {
-      continue;
-    }
-
-    if (try_catch.HasCaught()) {
-      LOG(ERROR) << "Exception caught when calling Port.hasPort.";
-      continue;
-    }
+    v8::Handle<v8::Value> has_port = (*it)->module_system()->CallModuleMethod(
+        "miscellaneous_bindings",
+        "hasPort",
+        1, &port_id_handle);
 
     CHECK(!has_port.IsEmpty());
     if (!has_port->BooleanValue())
       continue;
 
     std::vector<v8::Handle<v8::Value> > arguments;
 
     // Convert the message to a v8 object; either a value or undefined.
     // See PostMessage for more details.
     if (message.empty()) {
       arguments.push_back(v8::Undefined());
     } else {
       CHECK_EQ(1u, message.GetSize());
       const base::Value* message_value = NULL;
       message.Get(0, &message_value);
       scoped_ptr<V8ValueConverter> converter(V8ValueConverter::create());
       arguments.push_back(converter->ToV8Value(message_value, context));
     }
 
     arguments.push_back(port_id_handle);
-    CHECK((*it)->CallChromeHiddenMethod("Port.dispatchOnMessage",
-                                        arguments.size(),
-                                        &arguments[0],
-                                        NULL));
+    (*it)->module_system()->CallModuleMethod("miscellaneous_bindings",
+                                             "dispatchOnMessage",
+                                             &arguments);
   }
 }
 
 // static
 void MiscellaneousBindings::DispatchOnDisconnect(
     const ChromeV8ContextSet::ContextSet& contexts,
     int port_id,
     const std::string& error_message,
     content::RenderView* restrict_to_render_view) {
   v8::HandleScope handle_scope;
 
   for (ChromeV8ContextSet::ContextSet::const_iterator it = contexts.begin();
        it != contexts.end(); ++it) {
     if (restrict_to_render_view &&
         restrict_to_render_view != (*it)->GetRenderView()) {
       continue;
     }
 
     std::vector<v8::Handle<v8::Value> > arguments;
     arguments.push_back(v8::Integer::New(port_id));
     if (!error_message.empty()) {
       arguments.push_back(v8::String::New(error_message.c_str()));
     } else {
       arguments.push_back(v8::Null());
     }
-    (*it)->CallChromeHiddenMethod("Port.dispatchOnDisconnect",
-                                  arguments.size(), &arguments[0],
-                                  NULL);
+    (*it)->module_system()->CallModuleMethod("miscellaneous_bindings",
+                                             "dispatchOnDisconnect",
+                                             &arguments);
   }
 }
 
 }  // namespace extensions