Changeset 238750 in webkit

Timestamp:

Nov 30, 2018 1:13:27 PM (5 years ago)

Author:

Joseph Pecoraro

Message:

Web Inspector: Uncaught Exception opening Web Inspector to Debugger Tab
​https://bugs.webkit.org/show_bug.cgi?id=192174

Reviewed by Devin Rousso.

• UserInterface/Protocol/InspectorBackend.js:

(InspectorBackendClass.prototype.runAfterPendingDispatches):
Dispatch the callback with a timeout if there is no backend target yet
so it doesn't get lost.

• UserInterface/Protocol/Connection.js:

(InspectorBackend.Connection.prototype.runAfterPendingDispatches):
Change the ambiguous name "script" to the more familiar "callback".

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Protocol/Connection.js (modified) (4 diffs)
• UserInterface/Protocol/InspectorBackend.js (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2018-11-30  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: Uncaught Exception opening Web Inspector to Debugger Tab
+        https://bugs.webkit.org/show_bug.cgi?id=192174
+
+        Reviewed by Devin Rousso.
+
+        * UserInterface/Protocol/InspectorBackend.js:
+        (InspectorBackendClass.prototype.runAfterPendingDispatches):
+        Dispatch the callback with a timeout if there is no backend target yet
+        so it doesn't get lost.
+
+        * UserInterface/Protocol/Connection.js:
+        (InspectorBackend.Connection.prototype.runAfterPendingDispatches):
+        Change the ambiguous name "script" to the more familiar "callback".
+
 2018-11-30  Devin Rousso  <drousso@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Protocol/Connection.js

@@ -39 +39 @@
         this._pendingResponses = new Map;
         this._agents = {};
-        this._deferredScripts = [];
+        this._deferredCallbacks = [];
         this._target = null;
     }
@@ -73 +73 @@
     }
 
-    runAfterPendingDispatches(script)
-    {
-        console.assert(typeof script === "function");
+    runAfterPendingDispatches(callback)
+    {
+        console.assert(typeof callback === "function");
 
         if (!this._pendingResponses.size)
-            script.call(this);
+            callback.call(this);
         else
-            this._deferredScripts.push(script);
+            this._deferredCallbacks.push(callback);
     }
 
@@ -131 +131 @@
             tracer.logDidHandleResponse(this, messageObject, {rtt: roundTripTime, dispatch: processingTime});
 
-        if (this._deferredScripts.length && !this._pendingResponses.size)
+        if (this._deferredCallbacks.length && !this._pendingResponses.size)
             this._flushPendingScripts();
     }
@@ -268 +268 @@
         console.assert(this._pendingResponses.size === 0);
 
-        let scriptsToRun = this._deferredScripts;
-        this._deferredScripts = [];
+        let scriptsToRun = this._deferredCallbacks;
+        this._deferredCallbacks = [];
         for (let script of scriptsToRun)
             script.call(this);

trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorBackend.js

@@ -173 +173 @@
     }
 
-    runAfterPendingDispatches(script)
-    {
+    runAfterPendingDispatches(callback)
+    {
+        if (!WI.mainTarget) {
+            callback();
+            return;
+        }
+
         // FIXME: Should this respect pending dispatches in all connections?
-        WI.mainTarget.connection.runAfterPendingDispatches(script);
+        WI.mainTarget.connection.runAfterPendingDispatches(callback);
     }