DevTools: Get rid of DevTools RPC.

chrome/renderer/devtools_agent.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 "chrome/renderer/devtools_agent.h"
 
 #include "base/command_line.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/devtools_messages.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/devtools_agent_filter.h"
 #include "chrome/renderer/render_view.h"
 #include "grit/webkit_chromium_resources.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebDevToolsAgent.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebDevToolsMessageData.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebPoint.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebString.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebView.h"
 #include "webkit/glue/devtools_message_data.h"
 #include "webkit/glue/webkit_glue.h"
 
 using WebKit::WebDevToolsAgent;
 using WebKit::WebDevToolsAgentClient;
 using WebKit::WebPoint;
 using WebKit::WebString;
@@ skipping 47 matching lines @@
     web_agent->didNavigate();
   }
 }
 
 // Called on the Renderer thread.
 bool DevToolsAgent::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(DevToolsAgent, message)
     IPC_MESSAGE_HANDLER(DevToolsAgentMsg_Attach, OnAttach)
     IPC_MESSAGE_HANDLER(DevToolsAgentMsg_Detach, OnDetach)
-    IPC_MESSAGE_HANDLER(DevToolsAgentMsg_RpcMessage, OnRpcMessage)
+    IPC_MESSAGE_HANDLER(DevToolsAgentMsg_DispatchOnInspectorBackend,
+                        OnDispatchOnInspectorBackend)
     IPC_MESSAGE_HANDLER(DevToolsAgentMsg_InspectElement, OnInspectElement)
     IPC_MESSAGE_HANDLER(DevToolsAgentMsg_SetApuAgentEnabled,
                         OnSetApuAgentEnabled)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
-void DevToolsAgent::sendMessageToFrontend(
-    const WebKit::WebDevToolsMessageData& data) {
+void DevToolsAgent::sendMessageToInspectorFrontend(
+    const WebKit::WebString& message) {
   IPC::Message* m = new ViewHostMsg_ForwardToDevToolsClient(
       routing_id_,
-      DevToolsClientMsg_RpcMessage(DevToolsMessageData(data)));
+      DevToolsClientMsg_DispatchOnInspectorFrontend(message.utf8()));
   render_view_->Send(m);
 }
 
+void DevToolsAgent::sendDebuggerOutput(const WebKit::WebString& data) {
+  IPC::Message* m = new ViewHostMsg_ForwardToDevToolsClient(
+      routing_id_,
+      DevToolsClientMsg_DebuggerOutput(data.utf8()));
+  render_view_->Send(m);
+}
+
+void DevToolsAgent::sendDispatchToAPU(const WebKit::WebString& data) {
+  IPC::Message* m = new ViewHostMsg_ForwardToDevToolsClient(
+      routing_id_,
+      DevToolsClientMsg_DispatchToAPU(data.utf8()));
+  render_view_->Send(m);
+}
+
 int DevToolsAgent::hostIdentifier() {
   return routing_id_;
 }
 
 void DevToolsAgent::forceRepaint() {
   render_view_->GenerateFullRepaint();
 }
 
 void DevToolsAgent::runtimeFeatureStateChanged(const WebKit::WebString& feature,
                                                bool enabled) {
@@ skipping 52 matching lines @@
   }
 }
 
 void DevToolsAgent::OnDetach() {
   WebDevToolsAgent* web_agent = GetWebAgent();
   if (web_agent) {
     web_agent->detach();
   }
 }
 
-void DevToolsAgent::OnRpcMessage(const DevToolsMessageData& data) {
+void DevToolsAgent::OnDispatchOnInspectorBackend(const std::string& message) {
   WebDevToolsAgent* web_agent = GetWebAgent();
-  if (web_agent) {
-    web_agent->dispatchMessageFromFrontend(data.ToWebDevToolsMessageData());
-  }
+  if (web_agent)
+    web_agent->dispatchOnInspectorBackend(WebString::fromUTF8(message));
 }
 
 void DevToolsAgent::OnInspectElement(int x, int y) {
   WebDevToolsAgent* web_agent = GetWebAgent();
   if (web_agent) {
     web_agent->attach();
     web_agent->inspectElementAt(WebPoint(x, y));
   }
 }
 
 void DevToolsAgent::OnSetApuAgentEnabled(bool enabled) {
   WebDevToolsAgent* web_agent = GetWebAgent();
   if (web_agent)
     web_agent->setRuntimeFeatureEnabled("apu-agent", enabled);
 }
 
 WebDevToolsAgent* DevToolsAgent::GetWebAgent() {
   WebView* web_view = render_view_->webview();
   if (!web_view)
     return NULL;
   return web_view->devToolsAgent();
 }