DevTools: introduce Reattach message, get rid of DevToolsRuntimeProperties map

We want agent to save its state into a string instead of using a map of
runtime properties. Also the serialized state should be taken into account
only when existing client is reattached from one agent to another, this
is why we introduce Reattach message.

Also see https://bugs.webkit.org/show_bug.cgi?id=69335

BUG=None
TEST=None

Review URL: http://codereview.chromium.org/8135002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103920 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 13 insertions, 24 deletions

diff --git a/content/renderer/devtools_agent.cc b/content/renderer/devtools_agent.cc
index c9a27bb..1934641 100644
--- a/content/renderer/devtools_agent.cc
+++ b/content/renderer/devtools_agent.cc
@@ -78,6 +78,7 @@ 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_Reattach, OnReattach)
     IPC_MESSAGE_HANDLER(DevToolsAgentMsg_Detach, OnDetach)
     IPC_MESSAGE_HANDLER(DevToolsAgentMsg_FrontendLoaded, OnFrontendLoaded)
     IPC_MESSAGE_HANDLER(DevToolsAgentMsg_DispatchOnInspectorBackend,
@@ -111,22 +112,9 @@ int DevToolsAgent::hostIdentifier() {
   return routing_id();
 }
 
-void DevToolsAgent::runtimeFeatureStateChanged(
-    const WebKit::WebString& feature,
-    bool enabled) {
-  Send(new DevToolsHostMsg_RuntimePropertyChanged(
-      routing_id(),
-      feature.utf8(),
-      enabled ? "true" : "false"));
-}
-
-void DevToolsAgent::runtimePropertyChanged(
-    const WebKit::WebString& name,
-    const WebKit::WebString& value) {
-  Send(new DevToolsHostMsg_RuntimePropertyChanged(
-      routing_id(),
-      name.utf8(),
-      value.utf8()));
+void DevToolsAgent::saveAgentRuntimeState(
+    const WebKit::WebString& state) {
+  Send(new DevToolsHostMsg_SaveAgentRuntimeState(routing_id(), state.utf8()));
 }
 
 WebKit::WebDevToolsAgentClient::WebKitClientMessageLoop*
@@ -156,18 +144,19 @@ DevToolsAgent* DevToolsAgent::FromHostId(int host_id) {
   return NULL;
 }
 
-void DevToolsAgent::OnAttach(
-    const DevToolsRuntimeProperties& runtime_properties) {
+void DevToolsAgent::OnAttach() {
   WebDevToolsAgent* web_agent = GetWebAgent();
   if (web_agent) {
     web_agent->attach();
     is_attached_ = true;
-    for (DevToolsRuntimeProperties::const_iterator it =
-             runtime_properties.begin();
-         it != runtime_properties.end(); ++it) {
-      web_agent->setRuntimeProperty(WebString::fromUTF8(it->first),
-                                    WebString::fromUTF8(it->second));
-    }
+  }
+}
+
+void DevToolsAgent::OnReattach(const std::string& agent_state) {
+  WebDevToolsAgent* web_agent = GetWebAgent();
+  if (web_agent) {
+    web_agent->reattach(WebString::fromUTF8(agent_state));
+    is_attached_ = true;
   }
 }