Merge WebKit at r61871: Initial merge by git.

Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5

1 files changed, 1 insertions, 47 deletions

diff --git a/WebKit/chromium/src/js/InjectDispatch.js b/WebKit/chromium/src/js/InjectDispatch.js
index 30caaf2..cda84e5 100644
--- a/WebKit/chromium/src/js/InjectDispatch.js
+++ b/WebKit/chromium/src/js/InjectDispatch.js
@@ -49,60 +49,14 @@ InspectorControllerDispatcher.dispatch = function(functionName, json_args)
 };
 
 /**
- * Special controller object for APU related messages. Outgoing messages
- * are sent to this object if the ApuAgentDispatcher is enabled.
- **/
-var ApuAgentDispatcher = { enabled : false };
-
-/**
- * Dispatches messages to APU. This filters and transforms
- * outgoing messages that are used by APU.
- * @param {string} method name of the dispatch method.
- **/
-ApuAgentDispatcher.dispatchToApu = function(method, args)
-{
-    if (method !== "addRecordToTimeline" && method !== "updateResource" && method !== "addResource")
-        return;
-    // TODO(knorton): Transform args so they can be used
-    // by APU.
-    DevToolsAgentHost.dispatchToApu(JSON.stringify(args));
-};
-
-/**
  * This is called by the InspectorFrontend for serialization.
  * We serialize the call and send it to the client over the IPC
  * using dispatchOut bound method.
  */
 function dispatch(method, var_args) {
-    // Handle all messages with non-primitieve arguments here.
     var args = Array.prototype.slice.call(arguments);
-
-    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;
-    }
-
-    // Sniff some inspector controller state changes in order to support
-    // cross-navigation instrumentation. Keep names in sync with
-    // webdevtoolsagent_impl.
-    if (method === "timelineProfilerWasStarted")
-        DevToolsAgentHost.runtimeFeatureStateChanged("timeline-profiler", true);
-    else if (method === "timelineProfilerWasStopped")
-        DevToolsAgentHost.runtimeFeatureStateChanged("timeline-profiler", false);
-    else if (method === "resourceTrackingWasEnabled")
-        DevToolsAgentHost.runtimeFeatureStateChanged("resource-tracking", true);
-    else if (method === "resourceTrackingWasDisabled")
-        DevToolsAgentHost.runtimeFeatureStateChanged("resource-tracking", false);
-
-    if (ApuAgentDispatcher.enabled) {
-        ApuAgentDispatcher.dispatchToApu(method, args);
-        return;
-    }
-
     var call = JSON.stringify(args);
-    DevToolsAgentHost.dispatch(call);
+    DevToolsAgentHost.dispatch(call, method);
 };
 
 function close() {