Changeset 223170 in webkit

Timestamp:

Oct 11, 2017, 12:55:24 AM (9 years ago)

Author:

Joseph Pecoraro

Message:

Web Inspector: Network Tab - Show initially loaded resources even if network info not logged
​https://bugs.webkit.org/show_bug.cgi?id=178098
<rdar://problem/34073529>

Reviewed by Devin Rousso.

• UserInterface/Models/Resource.js:

(WI.Resource.prototype.hasResponse):
Resources loaded by Page.getFrameTree have a response but no status code data.
So include finished resources as having a resource.

• UserInterface/Views/NetworkTableContentView.js:

(WI.NetworkTableContentView):
(WI.NetworkTableContentView.prototype.closed):
(WI.NetworkTableContentView.prototype._populateWithInitialResourcesIfNeeded):
(WI.NetworkTableContentView.prototype._mainFrameDidChange):
Listen for the first main frame change to perform an initial population.

(WI.NetworkTableContentView.prototype._insertResourceAndReloadTable):
This path is not currently taken when table is null, but change the code so
that if it is reached without the table it would behave gracefully.

• UserInterface/Views/ResourceHeadersContentView.js:

(WI.ResourceHeadersContentView.prototype._refreshSummarySection):
On first open none of the resources have a statusCode. Show an emDash.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Models/Resource.js (modified) (1 diff)
• UserInterface/Views/NetworkTableContentView.js (modified) (5 diffs)
• UserInterface/Views/ResourceHeadersContentView.js (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2017-10-11  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: Network Tab - Show initially loaded resources even if network info not logged
+        https://bugs.webkit.org/show_bug.cgi?id=178098
+        <rdar://problem/34073529>
+
+        Reviewed by Devin Rousso.
+
+        * UserInterface/Models/Resource.js:
+        (WI.Resource.prototype.hasResponse):
+        Resources loaded by Page.getFrameTree have a response but no status code data.
+        So include finished resources as having a resource.
+
+        * UserInterface/Views/NetworkTableContentView.js:
+        (WI.NetworkTableContentView):
+        (WI.NetworkTableContentView.prototype.closed):
+        (WI.NetworkTableContentView.prototype._populateWithInitialResourcesIfNeeded):
+        (WI.NetworkTableContentView.prototype._mainFrameDidChange):
+        Listen for the first main frame change to perform an initial population.
+
+        (WI.NetworkTableContentView.prototype._insertResourceAndReloadTable):
+        This path is not currently taken when table is null, but change the code so
+        that if it is reached without the table it would behave gracefully.
+
+        * UserInterface/Views/ResourceHeadersContentView.js:
+        (WI.ResourceHeadersContentView.prototype._refreshSummarySection):
+        On first open none of the resources have a statusCode. Show an emDash.
+
 2017-10-10  Brian Burg  <bburg@apple.com>
 

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

@@ -654 +654 @@
     hasResponse()
     {
-        return !isNaN(this._statusCode);
+        return !isNaN(this._statusCode) || this._finished;
     }
 

trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js

@@ -103 +103 @@
         WI.Resource.addEventListener(WI.Resource.Event.LoadingDidFail, this._resourceLoadingDidFail, this);
         WI.Resource.addEventListener(WI.Resource.Event.TransferSizeDidChange, this._resourceTransferSizeDidChange, this);
+        WI.frameResourceManager.addEventListener(WI.FrameResourceManager.Event.MainFrameDidChange, this._mainFrameDidChange, this);
         WI.timelineManager.persistentNetworkTimeline.addEventListener(WI.Timeline.Event.RecordAdded, this._networkTimelineRecordAdded, this);
+
+        this._needsInitialPopulate = true;
     }
 
@@ -191 +194 @@
         WI.Frame.removeEventListener(null, null, this);
         WI.Resource.removeEventListener(null, null, this);
+        WI.frameResourceManager.removeEventListener(WI.FrameResourceManager.Event.MainFrameDidChange, this._mainFrameDidChange, this);
         WI.timelineManager.persistentNetworkTimeline.removeEventListener(WI.Timeline.Event.RecordAdded, this._networkTimelineRecordAdded, this);
 
@@ -648 +652 @@
     }
 
+    _populateWithInitialResourcesIfNeeded()
+    {
+        if (!this._needsInitialPopulate)
+            return;
+
+        this._needsInitialPopulate = false;
+
+        console.assert(WI.frameResourceManager.mainFrame);
+
+        let populateFrameResources = (frame) => {
+            if (frame.provisionalMainResource)
+                this._pendingInsertions.push(frame.provisionalMainResource);
+            else if (frame.mainResource)
+                this._pendingInsertions.push(frame.mainResource);
+
+            for (let resource of frame.resourceCollection.items)
+                this._pendingInsertions.push(resource);
+
+            for (let childFrame of frame.childFrameCollection.items)
+                populateFrameResources(childFrame);
+        };
+
+        populateFrameResources(WI.frameResourceManager.mainFrame);
+
+        this.needsLayout();
+    }
+
     _checkTextFilterAgainstFinishedResource(resource)
     {
@@ -829 +860 @@
     }
 
+    _mainFrameDidChange()
+    {
+        this._populateWithInitialResourcesIfNeeded();
+    }
+
     _resourceLoadingDidFinish(event)
     {
@@ -895 +931 @@
     _insertResourceAndReloadTable(resource)
     {
-        if (!(WI.tabBrowser.selectedTabContentView instanceof WI.NetworkTabContentView)) {
+        if (!this._table || !(WI.tabBrowser.selectedTabContentView instanceof WI.NetworkTabContentView)) {
             this._pendingInsertions.push(resource);
             this.needsLayout();
             return;
         }
-
-        console.assert(this._table);
-        if (!this._table)
-            return;
 
         let entry = this._entryForResource(resource);

trunk/Source/WebInspectorUI/UserInterface/Views/ResourceHeadersContentView.js

@@ -267 +267 @@
 
         let status = emDash;
-        if (this._resource.hasResponse())
+        if (!isNaN(this._resource.statusCode))
             status = this._resource.statusCode + (this._resource.statusText ? " " + this._resource.statusText : "");
         this._appendKeyValuePair(detailsElement, WI.UIString("Status"), status);