Changeset 64035 in webkit

Timestamp:

Jul 26, 2010 1:29:21 AM (14 years ago)

Author:

loislo@chromium.org

Message:

2010-07-26 Ilya Tikhonovsky <​loislo@chromium.org>

Reviewed by Pavel Feldman.

Chromium DevTools: refactor query params, add basic
support for WebSocket-based backend.

​https://bugs.webkit.org/show_bug.cgi?id=42893

• src/js/DevTools.js: (devtools.ToolsAgent.prototype.dispatchOnClient_): (WebInspector.loaded): (WebInspector.doLoadedDone): (devtools.domContentLoaded):
• src/js/InspectorControllerImpl.js:

Location:

trunk/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• src/js/DevTools.js (modified) (3 diffs)
• src/js/InspectorControllerImpl.js (modified) (1 diff)

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-07-26  Ilya Tikhonovsky  <loislo@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Chromium DevTools: refactor query params, add basic
+        support for WebSocket-based backend.
+
+        https://bugs.webkit.org/show_bug.cgi?id=42893
+
+        * src/js/DevTools.js:
+        (devtools.ToolsAgent.prototype.dispatchOnClient_):
+        (WebInspector.loaded):
+        (WebInspector.doLoadedDone):
+        (devtools.domContentLoaded):
+        * src/js/InspectorControllerImpl.js:
+
 2010-07-24  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/WebKit/chromium/src/js/DevTools.js

@@ -94 +94 @@
 devtools.ToolsAgent.prototype.dispatchOnClient_ = function(message)
 {
-    var args = JSON.parse(message);
+    var args = typeof message === "string" ? JSON.parse(message) : message;
     var methodName = args[0];
     var parameters = args.slice(1);
@@ -130 +130 @@
 var context = {};  // Used by WebCore's inspector routines.
 
+(function() {
+    WebInspector._paramsObject = {};
+
+    var queryParams = window.location.search;
+    if (queryParams) {
+        var params = queryParams.substring(1).split("&");
+        for (var i = 0; i < params.length; ++i) {
+            var pair = params[i].split("=");
+            WebInspector._paramsObject[pair[0]] = pair[1];
+        }
+    }
+    if ("page" in WebInspector._paramsObject) {
+        WebInspector.socket = new WebSocket("ws://" + window.location.host + "/devtools/page/" + WebInspector._paramsObject.page);
+        WebInspector.socket.onmessage = function(message) { eval(message.data); }
+        WebInspector.socket.onerror = function(error) { console.err(error); }
+        WebInspector.socket.onopen = function() {
+            WebInspector.socketOpened = true;
+            if (WebInspector.loadedDone)
+                WebInspector.doLoadedDone();
+        };
+    }
+})();
 ///////////////////////////////////////////////////////////////////////////////
 // Here and below are overrides to existing WebInspector methods only.
@@ -146 +168 @@
     Preferences.appCacheEnabled = false;
 
+    if ("page" in WebInspector._paramsObject) {
+        WebInspector.loadedDone = true;
+        if (WebInspector.socketOpened)
+            WebInspector.doLoadedDone();
+        return;
+    }
+    WebInspector.doLoadedDone();
+}
+
+WebInspector.doLoadedDone = function() {
     oldLoaded.call(this);
-
     InspectorFrontendHost.loaded();
-};
+}
 
 devtools.domContentLoaded = function()
 {
-    var queryParams = window.location.search;
-    if (queryParams) {
-        var params = queryParams.substring(1).split("&");
-        var paramsObject = {};
-        for (var i = 0; i < params.length; ++i) {
-            var pair = params[i].split("=");
-            paramsObject[pair[0]] = pair[1];
-        }
-        WebInspector.setAttachedWindow(paramsObject.docked === "true");
-        if (paramsObject.toolbar_color && paramsObject.text_color)
-            WebInspector.setToolbarColors(paramsObject.toolbar_color, paramsObject.text_color);
-    }
+    WebInspector.setAttachedWindow(WebInspector._paramsObject.docked === "true");
+    if (WebInspector._paramsObject.toolbar_color && WebInspector._paramsObject.text_color)
+        WebInspector.setToolbarColors(WebInspector._paramsObject.toolbar_color, WebInspector._paramsObject.text_color);
 }
 document.addEventListener("DOMContentLoaded", devtools.domContentLoaded, false);

trunk/WebKit/chromium/src/js/InspectorControllerImpl.js

@@ -142 +142 @@
  * implementation.
  */
-devtools.InspectorBackendImpl.prototype.callInspectorController_ = function(methodName, var_arg)
+devtools.InspectorBackendImpl.prototype.callInspectorController_ = function()
 {
-    var args = Array.prototype.slice.call(arguments, 1);
-    args.unshift(methodName);
-    RemoteToolsAgent.dispatchOnInspectorController(WebInspector.Callback.wrap(function(){}), JSON.stringify(args));
+    var args = Array.prototype.slice.call(arguments);
+    var message = JSON.stringify(args);
+    var callbackId = WebInspector.Callback.wrap(function(){});
+    if ("page" in WebInspector._paramsObject)
+        WebInspector.socket.send(callbackId + " " + message);
+    else
+        RemoteToolsAgent.dispatchOnInspectorController(callbackId, message);
 };