Changeset 244577 in webkit

Timestamp:

Apr 23, 2019, 6:28:49 PM (7 years ago)

Author:

Devin Rousso

Message:

Web Inspector: REGRESSION(r238168): Network: preserve log doesn't show main frame main resource changes
​https://bugs.webkit.org/show_bug.cgi?id=197220
<rdar://problem/49960464>

Reviewed by Timothy Hatcher.

• UserInterface/Views/NetworkTableContentView.js:

(WI.NetworkTableContentView.prototype.reset):
(WI.NetworkTableContentView.prototype._addCollection):
(WI.NetworkTableContentView.prototype._resetCollection): Added.
(WI.NetworkTableContentView.prototype._changeCollection):
(WI.NetworkTableContentView.prototype._mainResourceDidChange):
We want to add the frame's main resource in the case that it's the main frame, but we also
want to clear the main collection of data (e.g. if viewing an imported HAR).
Drive-by: _groupByDOMNodeNavigationItem was renamed in a previous patch.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/NetworkTableContentView.js (modified) (4 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2019-04-23  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: REGRESSION(r238168): Network: preserve log doesn't show main frame main resource changes
+        https://bugs.webkit.org/show_bug.cgi?id=197220
+        <rdar://problem/49960464>
+
+        Reviewed by Timothy Hatcher.
+
+        * UserInterface/Views/NetworkTableContentView.js:
+        (WI.NetworkTableContentView.prototype.reset):
+        (WI.NetworkTableContentView.prototype._addCollection):
+        (WI.NetworkTableContentView.prototype._resetCollection): Added.
+        (WI.NetworkTableContentView.prototype._changeCollection):
+        (WI.NetworkTableContentView.prototype._mainResourceDidChange):
+        We want to add the frame's main resource in the case that it's the main frame, but we also
+        want to clear the main collection of data (e.g. if viewing an imported HAR).
+        Drive-by: `_groupByDOMNodeNavigationItem` was renamed in a previous patch.
+
 2019-04-23  Devin Rousso  <drousso@apple.com>
 

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

@@ -307 +307 @@
     {
         this._runForMainCollection((collection) => {
-            collection.entries = [];
-            collection.filteredEntries = [];
-            collection.pendingInsertions = [];
-            collection.pendingUpdates = [];
-            collection.waterfallStartTime = NaN;
-            collection.waterfallEndTime = NaN;
+            this._resetCollection(collection);
         });
 
@@ -527 +522 @@
     _addCollection()
     {
-        let collection = {
-            entries: [],
-            filteredEntries: [],
-            pendingInsertions: [],
-            pendingUpdates: [],
-            waterfallStartTime: NaN,
-            waterfallEndTime: NaN,
-        };
-
+        let collection = {};
+        this._resetCollection(collection);
         this._collections.push(collection);
-
         return collection;
+    }
+
+    _resetCollection(collection)
+    {
+        collection.entries = [];
+        collection.filteredEntries = [];
+        collection.pendingInsertions = [];
+        collection.pendingUpdates = [];
+        collection.waterfallStartTime = NaN;
+        collection.waterfallEndTime = NaN;
     }
 
@@ -587 +584 @@
         let isMain = collection === this._mainCollection;
         this._checkboxesNavigationItemGroup.hidden = !isMain;
-        this._groupByDOMNodeNavigationItem.hidden = !isMain;
+        this._groupMediaRequestsByDOMNodeNavigationItem.hidden = !isMain;
         this._clearNetworkItemsNavigationItem.enabled = isMain;
         this._collectionsPathNavigationItem.components = [this._pathComponentsMap.get(collection)];
@@ -1589 +1586 @@
     _mainResourceDidChange(event)
     {
-        let frame = event.target;
-        if (!frame.isMainFrame() || !WI.settings.clearNetworkOnNavigate.value)
-            return;
-
-        this.reset();
-
         this._runForMainCollection((collection) => {
+            let frame = event.target;
+            if (frame.isMainFrame() && WI.settings.clearNetworkOnNavigate.value)
+                this._resetCollection(collection);
+
             if (this._transitioningPageTarget) {
                 this._transitioningPageTarget = false;