DevTools: Move InspectorController message filtering to the injected side.

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

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

2 files changed, 8 insertions, 9 deletions

diff --git a/webkit/glue/devtools/js/devtools.js b/webkit/glue/devtools/js/devtools.js
index f8d055b..33ba39f 100644
--- a/webkit/glue/devtools/js/devtools.js
+++ b/webkit/glue/devtools/js/devtools.js
@@ -151,15 +151,7 @@ devtools.ToolsAgent.prototype.addMessageToConsole_ = function(message) {
  * @private
  */
 devtools.ToolsAgent.prototype.dispatchOnClient_ = function(message) {
-  var messageObj = JSON.parse(message);
-  // Filter out messages we don't need here.
-  var method = messageObj[0];
-  if (method == 'inspectedWindowCleared' ||
-      method == 'reset' ||
-      method == 'setAttachedWindow') {
-    return;
-  }
-  WebInspector.dispatch.apply(WebInspector, messageObj);
+  WebInspector.dispatch.apply(WebInspector, JSON.parse(message));
 };
 
 
diff --git a/webkit/glue/devtools/js/inject_dispatch.js b/webkit/glue/devtools/js/inject_dispatch.js
index a228ae8..0416676 100644
--- a/webkit/glue/devtools/js/inject_dispatch.js
+++ b/webkit/glue/devtools/js/inject_dispatch.js
@@ -47,6 +47,13 @@ var dispatch = function(method, var_args) {
     for (var i = 2; i < args.length; ++i) {
       args[i] = devtools$$obj.wrapConsoleObject(args[i]);
     }
+  } else if (method == 'inspectedWindowCleared' ||
+      method == 'reset' ||
+      method == 'setAttachedWindow') {
+    // Filter out messages we don't need here.
+    // We do it on the sender side since they may have non-serializable
+    // parameters.
+    return;
   }
   var call = JSON.stringify(args);
   DevToolsAgentHost.dispatch(call);