Changeset 74236 in webkit

Timestamp:

Dec 17, 2010 12:29:52 AM (13 years ago)

Author:

loislo@chromium.org

Message:

2010-12-17 Ilya Tikhonovsky <​loislo@chromium.org>

Reviewed by Yury Semikhatsky.

Web Inspector: remove unnecessary dependencies from InspectorBackendStub.

InspectorBackendStub is a transport-only thing but it has dependencies with
Callback.js and WebInspector namespace. Callback can be integrated into
InspectorBackendStub because it is the only client.
Without these dependencies InspectorBackendStub can be used as an API
wrapper for Inspector Protocol.

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

• WebCore.gypi:
• inspector/CodeGeneratorInspector.pm:
• inspector/front-end/Callback.js: Removed.
• inspector/front-end/WebKit.qrc:
• inspector/front-end/inspector.html:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.gypi (modified) (1 diff)
• inspector/CodeGeneratorInspector.pm (modified) (4 diffs)
• inspector/front-end/Callback.js (deleted)
• inspector/front-end/WebKit.qrc (modified) (1 diff)
• inspector/front-end/inspector.html (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-12-17  Ilya Tikhonovsky  <loislo@chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: remove unnecessary dependencies from InspectorBackendStub.
+
+        InspectorBackendStub is a transport-only thing but it has dependencies with
+        Callback.js and WebInspector namespace. Callback can be integrated into
+        InspectorBackendStub because it is the only client.
+        Without these dependencies InspectorBackendStub can be used as an API
+        wrapper for Inspector Protocol.
+
+        https://bugs.webkit.org/show_bug.cgi?id=51184
+
+        * WebCore.gypi:
+        * inspector/CodeGeneratorInspector.pm:
+        * inspector/front-end/Callback.js: Removed.
+        * inspector/front-end/WebKit.qrc:
+        * inspector/front-end/inspector.html:
+
 2010-12-15  Andrey Kosyakov  <caseq@chromium.org>
 

trunk/WebCore/WebCore.gypi

@@ -4602 +4602 @@
             'inspector/front-end/BreakpointManager.js',
             'inspector/front-end/BreakpointsSidebarPane.js',
-            'inspector/front-end/Callback.js',
             'inspector/front-end/CallStackSidebarPane.js',
             'inspector/front-end/ChangesView.js',

trunk/WebCore/inspector/CodeGeneratorInspector.pm

@@ -565 +565 @@
 $licenseTemplate
 
-WebInspector.InspectorBackendStub = function()
-{
+InspectorBackendStub = function()
+{
+    this._lastCallbackId = 1;
+    this._callbacks = {};
     this._domainDispatchers = {};
 $JSStubs
 }
 
-WebInspector.InspectorBackendStub.prototype = {
+InspectorBackendStub.prototype = {
+    _wrap: function(callback)
+    {
+        var callbackId = this._lastCallbackId++;
+        this._callbacks[callbackId] = callback || function() {};
+        return callbackId;
+    },
+
+    _processResponse: function(callbackId, args)
+    {
+        var callback = this._callbacks[callbackId];
+        callback.apply(null, args);
+        delete this._callbacks[callbackId];
+    },
+
+    _removeResponseCallbackEntry: function(callbackId)
+    {
+        delete this._callbacks[callbackId];
+    },
 
     _registerDelegate: function(commandInfo)
@@ -602 +622 @@
                 return;
             }
-            request.seq = WebInspector.Callback.wrap(args[0]);
+            request.seq = this._wrap(args[0]);
         }
 
@@ -631 +651 @@
         if ("seq" in messageObject) { // just a response for some request
             if (messageObject.success)
-                WebInspector.Callback.processResponse(messageObject.seq, arguments);
+                this._processResponse(messageObject.seq, arguments);
             else {
-                WebInspector.Callback.removeResponseCallbackEntry(messageObject.seq)
+                this._removeResponseCallbackEntry(messageObject.seq)
                 this.reportProtocolError(messageObject);
             }
@@ -658 +678 @@
         for (var i = 0; i < messageObject.errors.length; ++i)
             console.error("    " + messageObject.errors[i]);
-        WebInspector.Callback.removeResponseCallbackEntry(messageObject.seq);
-    }
-}
-
-InspectorBackend = new WebInspector.InspectorBackendStub();
+        this._removeResponseCallbackEntry(messageObject.seq);
+    }
+}
+
+InspectorBackend = new InspectorBackendStub();
 
 EOF

trunk/WebCore/inspector/front-end/WebKit.qrc

@@ -13 +13 @@
     <file>BreakpointManager.js</file>
     <file>BreakpointsSidebarPane.js</file>
-    <file>Callback.js</file>
     <file>CallStackSidebarPane.js</file>
     <file>ChangesView.js</file>

trunk/WebCore/inspector/front-end/inspector.html

@@ -56 +56 @@
     <script type="text/javascript" src="Placard.js"></script>
     <script type="text/javascript" src="View.js"></script>
-    <script type="text/javascript" src="Callback.js"></script>
     <script type="text/javascript" src="Drawer.js"></script>
     <script type="text/javascript" src="ChangesView.js"></script>