1 files changed, 49 insertions, 7 deletions

diff --git a/WebCore/inspector/front-end/inspector.js b/WebCore/inspector/front-end/inspector.js
index 4e8e633..fa57916 100644
--- a/WebCore/inspector/front-end/inspector.js
+++ b/WebCore/inspector/front-end/inspector.js
@@ -28,7 +28,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-function preloadImages()
+// Keep this ; so that concatenated version of the script worked.
+;(function preloadImages()
 {
     (new Image()).src = "Images/clearConsoleButtonGlyph.png";
     (new Image()).src = "Images/consoleButtonGlyph.png";
@@ -45,9 +46,7 @@ function preloadImages()
     (new Image()).src = "Images/recordToggledButtonGlyph.png";
     (new Image()).src = "Images/reloadButtonGlyph.png";
     (new Image()).src = "Images/undockButtonGlyph.png";
-}
-
-preloadImages();
+})();
 
 var WebInspector = {
     resources: {},
@@ -427,10 +426,39 @@ WebInspector.PlatformFlavor = {
     MacTiger: "mac-tiger",
     MacLeopard: "mac-leopard",
     MacSnowLeopard: "mac-snowleopard"
-}
+};
+
+(function parseQueryParameters()
+{
+    WebInspector.queryParamsObject = {};
+    var queryParams = window.location.search;
+    if (!queryParams)
+        return;
+    var params = queryParams.substring(1).split("&");
+    for (var i = 0; i < params.length; ++i) {
+        var pair = params[i].split("=");
+        WebInspector.queryParamsObject[pair[0]] = pair[1];
+    }
+})();
 
 WebInspector.loaded = function()
 {
+    if ("page" in WebInspector.queryParamsObject) {
+        WebInspector.socket = new WebSocket("ws://" + window.location.host + "/devtools/page/" + WebInspector.queryParamsObject.page);
+        WebInspector.socket.onmessage = function(message) { WebInspector_syncDispatch(message.data); }
+        WebInspector.socket.onerror = function(error) { console.error(error); }
+        WebInspector.socket.onopen = function() {
+            InspectorFrontendHost.sendMessageToBackend = WebInspector.socket.send.bind(WebInspector.socket);
+            InspectorFrontendHost.loaded = WebInspector.socket.send.bind(WebInspector.socket, "loaded");
+            WebInspector.doLoadedDone();
+        }
+        return;
+    }
+    WebInspector.doLoadedDone();
+}
+
+WebInspector.doLoadedDone = function()
+{
     InspectorBackend.setInjectedScriptSource("(" + injectedScriptConstructor + ");");
 
     var platform = WebInspector.platform;
@@ -581,6 +609,15 @@ WebInspector.dispatch = function() {
     setTimeout(delayDispatch, 0);
 }
 
+// This function is purposely put into the global scope for easy access.
+WebInspector_syncDispatch = function(message)
+{
+    var args = JSON.parse(message);
+    var methodName = args[0];
+    var parameters = args.slice(1);
+    WebInspector[methodName].apply(WebInspector, parameters);
+}
+
 WebInspector.dispatchMessageFromBackend = function(arguments)
 {
     WebInspector.dispatch.apply(this, arguments);
@@ -1109,6 +1146,11 @@ WebInspector.selectDatabase = function(o)
     WebInspector.panels.storage.selectDatabase(o);
 }
 
+WebInspector.consoleMessagesCleared = function()
+{
+    WebInspector.console.clearMessages();
+}
+
 WebInspector.selectDOMStorage = function(o)
 {
     WebInspector.showPanel("storage");
@@ -1470,7 +1512,7 @@ WebInspector.log = function(message, messageLevel)
     // return indication if we can actually log a message
     function isLogAvailable()
     {
-        return WebInspector.ConsoleMessage && WebInspector.ObjectProxy && self.console;
+        return WebInspector.ConsoleMessage && WebInspector.RemoteObject && self.console;
     }
 
     // flush the queue of pending messages
@@ -1510,7 +1552,7 @@ WebInspector.log = function(message, messageLevel)
         WebInspector.log.repeatCount = repeatCount;
 
         // ConsoleMessage expects a proxy object
-        message = new WebInspector.ObjectProxy(null, null, [], message, false);
+        message = new WebInspector.RemoteObject.fromPrimitiveValue(message);
 
         // post the message
         var msg = new WebInspector.ConsoleMessage(