DevTools: pass class and method name as arguments to RPC messages

webkit/glue/webdevtoolsclient_impl.cc

 // Copyright (c) 2009 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 "config.h"
 
 #include <string>
 
 #include "Document.h"
 #include "DOMWindow.h"
@@ skipping 104 matching lines @@
   dev_tools_host_->AddProtoFunction(
       "activateWindow",
       WebDevToolsClientImpl::JsActivateWindow);
   dev_tools_host_->Build();
 }
 
 WebDevToolsClientImpl::~WebDevToolsClientImpl() {
 }
 
 void WebDevToolsClientImpl::DispatchMessageFromAgent(
-    const std::string& raw_msg) {
+      const std::string& class_name,
+      const std::string& method_name,
+      const std::string& raw_msg) {
+  std::string expr = StringPrintf(
+      "devtools.dispatch('%s','%s',%s)",
+      class_name.c_str(),
+      method_name.c_str(),
+      raw_msg.c_str());
   if (!loaded_) {
-    pending_incoming_messages_.append(raw_msg);
+    pending_incoming_messages_.append(expr);
     return;
   }
-  std::string expr = StringPrintf("devtools.dispatch(%s)", raw_msg.c_str());
+  ExecuteScript(expr);
+}
+
+void WebDevToolsClientImpl::ExecuteScript(const std::string& expr) {
   web_view_impl_->GetMainFrame()->ExecuteScript(
       WebScriptSource(WebString::fromUTF8(expr)));
 }
 
-void WebDevToolsClientImpl::SendRpcMessage(const std::string& raw_msg) {
-  delegate_->SendMessageToAgent(raw_msg);
+
+void WebDevToolsClientImpl::SendRpcMessage(const std::string& class_name,
+                                           const std::string& method_name,
+                                           const std::string& raw_msg) {
+  delegate_->SendMessageToAgent(class_name, method_name, raw_msg);
 }
 
 // static
 v8::Handle<v8::Value> WebDevToolsClientImpl::JsAddSourceToFrame(
     const v8::Arguments& args) {
   if (args.Length() < 2) {
     return v8::Undefined();
   }
 
   v8::TryCatch exception_catcher;
@@ skipping 26 matching lines @@
 
   // Grant the devtools page the ability to have source view iframes.
   Page* page = V8Proxy::retrieveFrameForEnteredContext()->page();
   SecurityOrigin* origin = page->mainFrame()->domWindow()->securityOrigin();
   origin->grantUniversalAccess();
 
   for (Vector<std::string>::iterator it =
            client->pending_incoming_messages_.begin();
        it != client->pending_incoming_messages_.end();
        ++it) {
-    client->DispatchMessageFromAgent(*it);
+    client->ExecuteScript(*it);
   }
   client->pending_incoming_messages_.clear();
   return v8::Undefined();
 }
 
 // static
 v8::Handle<v8::Value> WebDevToolsClientImpl::JsActivateWindow(
     const v8::Arguments& args) {
   WebDevToolsClientImpl* client = static_cast<WebDevToolsClientImpl*>(
       v8::External::Cast(*args.Data())->Value());
   client->delegate_->ActivateWindow();
   return v8::Undefined();
 }