Changeset 244615 in webkit

Timestamp:

Apr 24, 2019 2:30:51 PM (5 years ago)

Author:

Devin Rousso

Message:

Web Inspector: Network: importing a HAR with an active detail view shows no content
​https://bugs.webkit.org/show_bug.cgi?id=197223

Reviewed by Timothy Hatcher.

When hiding the detail view, we force a layout of the Network table, which causes the
cached row count to be set to 0, which prevents the reloadDataAddedToEndOnly from
rendering anything since the WI.Table thinks it has no rows.

Given that all of the users of WI.Table are backed by an array, we don't need to cache the
number of rows since .length is an extremely cheap operation. In turn, this guarantees
that we are always rendering with an accurate value.

• UserInterface/Views/Table.js:

(WI.Table):
(WI.Table.prototype.get numberOfRows):
(WI.Table.prototype.reloadData):
(WI.Table.prototype._removeRows):

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/Table.js (modified) (5 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2019-04-24  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: Network: importing a HAR with an active detail view shows no content
+        https://bugs.webkit.org/show_bug.cgi?id=197223
+
+        Reviewed by Timothy Hatcher.
+
+        When hiding the detail view, we force a `layout` of the Network table, which causes the
+        cached row count to be set to `0`, which prevents the `reloadDataAddedToEndOnly` from
+        rendering anything since the `WI.Table` thinks it has no rows.
+
+        Given that all of the users of `WI.Table` are backed by an array, we don't need to cache the
+        number of rows since `.length` is an extremely cheap operation. In turn, this guarantees
+        that we are always rendering with an accurate value.
+
+        * UserInterface/Views/Table.js:
+        (WI.Table):
+        (WI.Table.prototype.get numberOfRows):
+        (WI.Table.prototype.reloadData):
+        (WI.Table.prototype._removeRows):
+
 2019-04-23  Devin Rousso  <drousso@apple.com>
 

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

@@ -77 +77 @@
 
         this._cachedRows = new Map;
-        this._cachedNumberOfRows = NaN;
 
         this._columnSpecs = new Map;
@@ -114 +113 @@
         this._visibleRowIndexEnd = NaN;
 
+        console.assert(this._dataSource.tableNumberOfRows, "Table data source must implement tableNumberOfRows.");
         console.assert(this._dataSource.tableIndexForRepresentedObject, "Table data source must implement tableIndexForRepresentedObject.");
         console.assert(this._dataSource.tableRepresentedObjectForIndex, "Table data source must implement tableRepresentedObjectForIndex.");
@@ -146 +146 @@
     get numberOfRows()
     {
-        if (isNaN(this._cachedNumberOfRows))
-            this._cachedNumberOfRows = this._dataSource.tableNumberOfRows(this);
-
-        return this._cachedNumberOfRows;
+        return this._dataSource.tableNumberOfRows(this);
     }
 
@@ -254 +251 @@
         this._selectionController.reset();
 
-        this._cachedNumberOfRows = NaN;
         this._previousRevealedRowCount = NaN;
         this.needsLayout();
@@ -1436 +1432 @@
             return;
 
-        for (let index = lastIndex + 1; index < this._cachedNumberOfRows; ++index)
+        for (let index = lastIndex + 1; index < this.numberOfRows; ++index)
             adjustRowAtIndex(index);
 
-        this._cachedNumberOfRows -= removed;
-        console.assert(this._cachedNumberOfRows >= 0);
 
         this._selectionController.didRemoveItems(representedObjects);
 
-        if (this._delegate.tableDidRemoveRows) {
+        if (this._delegate.tableDidRemoveRows)
             this._delegate.tableDidRemoveRows(this, rowIndexes);
-            console.assert(this._cachedNumberOfRows === this._dataSource.tableNumberOfRows(this), "Table data source should update after removing rows.");
-        }
     }