Attachment 372358 Details for Bug 198951 – Patch

[patch] Patch

bug-198951-20190618120110.patch (text/plain), 3.14 KB, created by Devin Rousso on 2019-06-18 12:01:10 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Devin Rousso

Created: 2019-06-18 12:01:10 PDT

Size: 3.14 KB

patch

obsolete

>diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
>index d8a0087b090b84c273c215a6ed018e360ba099a7..11bcd81ff5ce1979de9274ed66a8ceca4f2726a1 100644
>--- a/Source/WebInspectorUI/ChangeLog
>+++ b/Source/WebInspectorUI/ChangeLog
>@@ -1,3 +1,19 @@
>+2019-06-18  Devin Rousso  <drousso@apple.com>
>+
>+        Web Inspector: Network: detail view shouldn't stay open when the related entry is removed
>+        https://bugs.webkit.org/show_bug.cgi?id=198951
>+
>+        Reviewed by Joseph Pecoraro.
>+
>+        * UserInterface/Views/NetworkTableContentView.js:
>+        (WI.NetworkTableContentView.prototype._mainResourceDidChange):
>+        Hide the detail view if the main resource changes and we aren't preserving the log.
>+
>+        * UserInterface/Views/Table.js:
>+        (WI.Table.prototype.reloadVisibleColumnCells):
>+        Only attempt to populate cells for rows that the `_dataSource` actually has. Without this,
>+        the `_delegate` may be asked to populate a cell for a row it doesn't have, which would error.
>+
> 2019-06-17  Matt Baker  <mattbaker@apple.com>
> 
>         Web Inspector: Elements: remove ellipses from "Break on" context menu item title
>diff --git a/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js b/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js
>index cffd1cf284c59a1fcd70310836d5eda86fb3532a..872eab8441e42d546b4b1bad5af8853f881ee620 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js
>@@ -1585,11 +1585,15 @@ WI.NetworkTableContentView = class NetworkTableContentView extends WI.ContentVie
> 
>     _mainResourceDidChange(event)
>     {
>-        this._runForMainCollection((collection) => {
>+        this._runForMainCollection((collection, wasMain) => {
>             let frame = event.target;
>-            if (frame.isMainFrame() && WI.settings.clearNetworkOnNavigate.value)
>+            if (frame.isMainFrame() && WI.settings.clearNetworkOnNavigate.value) {
>                 this._resetCollection(collection);
> 
>+                if (wasMain && !this._needsInitialPopulate)
>+                    this._hideDetailView();
>+            }
>+
>             if (this._transitioningPageTarget) {
>                 this._transitioningPageTarget = false;
>                 this._needsInitialPopulate = true;
>diff --git a/Source/WebInspectorUI/UserInterface/Views/Table.js b/Source/WebInspectorUI/UserInterface/Views/Table.js
>index 8215b2c09d4a2c616a32128889d27bb74208a7f5..e44a7c26182ec6c36f6af4919aa315cc04814d6c 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/Table.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/Table.js
>@@ -281,7 +281,8 @@ WI.Table = class Table extends WI.View
>         if (columnIndex === -1)
>             return;
> 
>-        for (let rowIndex = this._visibleRowIndexStart; rowIndex < this._visibleRowIndexEnd; ++rowIndex) {
>+        let numberOfRows = Math.min(this._visibleRowIndexEnd, this.numberOfRows);
>+        for (let rowIndex = this._visibleRowIndexStart; rowIndex < numberOfRows; ++rowIndex) {
>             let row = this._cachedRows.get(rowIndex);
>             if (!row)
>                 continue;

Actions: View | Formatted Diff | Diff

Attachments on bug 198951: 372320 | 372358