Changeset 259741 in webkit

Timestamp:

Apr 8, 2020, 12:02:28 PM (6 years ago)

Author:

Devin Rousso

Message:

Web Inspector: Uncaught Exception: undefined is not an object (evaluating 'this._target.NetworkAgent.getResponseBody')
​https://bugs.webkit.org/show_bug.cgi?id=210168

Reviewed by Timothy Hatcher.

If a script is loaded by the main page and a Worker, the WI.Script from the Worker
will be associated with the WI.Resource from the main page, the call stack in the Sources
Tab will use the WI.Resource over the WI.Script, but the WI.Target for a Worker does
not have a NetworkAgent or PageAgent. As such, inside WI.Resource, if the _target is
a WI.TargetType.Worker, use the DebuggerAgent.

• UserInterface/Models/Resource.js:

(WI.Resource.prototype.requestContentFromBackend):

• UserInterface/Main.html:

Drive-by: remove unnecessary <script>.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Main.html (modified) (1 diff)
• UserInterface/Models/Resource.js (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2020-04-08  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: Uncaught Exception: undefined is not an object (evaluating 'this._target.NetworkAgent.getResponseBody')
+        https://bugs.webkit.org/show_bug.cgi?id=210168
+
+        Reviewed by Timothy Hatcher.
+
+        If a script is loaded by the main page and a `Worker`, the `WI.Script` from the `Worker`
+        will be associated with the `WI.Resource` from the main page, the call stack in the Sources
+        Tab will use the `WI.Resource` over the `WI.Script`, but the `WI.Target` for a `Worker` does
+        not have a `NetworkAgent` or `PageAgent`. As such, inside `WI.Resource`, if the `_target` is
+        a `WI.TargetType.Worker`, use the `DebuggerAgent`.
+
+        * UserInterface/Models/Resource.js:
+        (WI.Resource.prototype.requestContentFromBackend):
+
+        * UserInterface/Main.html:
+        Drive-by: remove unnecessary `<script>`.
+
 2020-04-08  Devin Rousso  <drousso@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Main.html

@@ -894 +894 @@
     <script src="Controllers/WorkerManager.js"></script>
 
-    <script src="Workers/Formatter/FormatterContentBuilder.js"></script>
-
     <script src="Controllers/DiagnosticController.js"></script>
     <script src="Controllers/DiagnosticEventRecorder.js"></script>

trunk/Source/WebInspectorUI/UserInterface/Models/Resource.js

@@ -846 +846 @@
             return specialContentPromise;
 
-        // If we have the requestIdentifier we can get the actual response for this specific resource.
-        // Otherwise the content will be cached resource data, which might not exist anymore.
-        if (this._requestIdentifier)
-            return this._target.NetworkAgent.getResponseBody(this._requestIdentifier);
-
-        // There is no request identifier or frame to request content from.
-        if (this._parentFrame)
-            return this._target.PageAgent.getResourceContent(this._parentFrame.id, this._url);
+        if (this._target.type === WI.TargetType.Worker) {
+            console.assert(this.isScript);
+            let scriptForTarget = this.scripts.find((script) => script.target === this._target);
+            console.assert(scriptForTarget);
+            if (scriptForTarget)
+                return scriptForTarget.requestContentFromBackend();
+        } else {
+            // If we have the requestIdentifier we can get the actual response for this specific resource.
+            // Otherwise the content will be cached resource data, which might not exist anymore.
+            if (this._requestIdentifier)
+                return this._target.NetworkAgent.getResponseBody(this._requestIdentifier);
+
+            // There is no request identifier or frame to request content from.
+            if (this._parentFrame)
+                return this._target.PageAgent.getResourceContent(this._parentFrame.id, this._url);
+        }
 
         return Promise.reject(new Error("Content request failed."));