Attachment 349704 Details for Bug 189603 – Patch

[patch] Patch

bug-189603-20180913141906.patch (text/plain), 6.66 KB, created by Matt Baker on 2018-09-13 14:19:09 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Matt Baker

Created: 2018-09-13 14:19:09 PDT

Size: 6.66 KB

patch

obsolete

>Subversion Revision: 235988
>diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
>index c071c6546cb507041306a3b6318f5edc6c096e4f..b92c72258452856e10601fad3e460287f9b2c161 100644
>--- a/Source/WebInspectorUI/ChangeLog
>+++ b/Source/WebInspectorUI/ChangeLog
>@@ -1,3 +1,33 @@
>+2018-09-13  Matt Baker  <mattbaker@apple.com>
>+
>+        Web Inspector: Timelines: clicking a row in Script > Events grid triggers Location popover when column is hidden
>+        https://bugs.webkit.org/show_bug.cgi?id=189603
>+        <rdar://problem/44431403>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        TimelineDataGrid controls showing/hiding the call frame popover, with subclasses
>+        overriding callFramePopoverAnchorElement to position it. This patch adds
>+        another overridable base class method, shouldShowCallFramePopover, which subclasses
>+        can use to block the popover when the Location column is hidden.
>+
>+        * UserInterface/Views/DataGrid.js:
>+        (WI.DataGrid.prototype.layout):
>+        (WI.DataGrid.prototype._positionResizerElements):
>+        (WI.DataGrid.prototype._isColumnVisible): Deleted.
>+
>+        * UserInterface/Views/LayoutTimelineDataGrid.js:
>+        (WI.LayoutTimelineDataGrid.prototype.shouldShowCallFramePopover):
>+        (WI.LayoutTimelineDataGrid):
>+
>+        * UserInterface/Views/ScriptTimelineDataGrid.js:
>+        (WI.ScriptTimelineDataGrid.prototype.shouldShowCallFramePopover):
>+        (WI.ScriptTimelineDataGrid):
>+
>+        * UserInterface/Views/TimelineDataGrid.js:
>+        (WI.TimelineDataGrid.prototype.shouldShowCallFramePopover):
>+        (WI.TimelineDataGrid.prototype._dataGridSelectedNodeChanged):
>+
> 2018-09-12  Joseph Pecoraro  <pecoraro@apple.com>
> 
>         Web Inspector: fix test case failures in js-isLikelyStackTrace.html
>diff --git a/Source/WebInspectorUI/UserInterface/Views/DataGrid.js b/Source/WebInspectorUI/UserInterface/Views/DataGrid.js
>index 2e6421c1edc559887a6fee2b4b575d180da40104..9fa15458aaa19cf6b2bf197502d2a8aa85fce01e 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/DataGrid.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/DataGrid.js
>@@ -857,7 +857,7 @@ WI.DataGrid = class DataGrid extends WI.View
>             let columnWidths = [];
>             for (let i = 0; i < numColumns; ++i) {
>                 let headerCellElement = cells[i];
>-                if (this._isColumnVisible(headerCellElement.columnIdentifier)) {
>+                if (this.isColumnVisible(headerCellElement.columnIdentifier)) {
>                     let columnWidth = headerCellElement.offsetWidth;
>                     let percentWidth = ((columnWidth / tableWidth) * 100) + "%";
>                     columnWidths.push(percentWidth);
>@@ -894,7 +894,7 @@ WI.DataGrid = class DataGrid extends WI.View
>         this._cachedScrollableOffsetHeight = NaN;
>     }
> 
>-    _isColumnVisible(columnIdentifier)
>+    isColumnVisible(columnIdentifier)
>     {
>         return !this.columns.get(columnIdentifier)["hidden"];
>     }
>@@ -969,7 +969,7 @@ WI.DataGrid = class DataGrid extends WI.View
> 
>             leadingOffset = columnWidths[i];
> 
>-            if (this._isColumnVisible(this.orderedColumns[i])) {
>+            if (this.isColumnVisible(this.orderedColumns[i])) {
>                 resizer.element.style.removeProperty("display");
>                 resizer.element.style.setProperty(WI.resolvedLayoutDirection() === WI.LayoutDirection.RTL ? "right" : "left", `${leadingOffset}px`);
>                 resizer[WI.DataGrid.PreviousColumnOrdinalSymbol] = i;
>diff --git a/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineDataGrid.js b/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineDataGrid.js
>index c49ab5ec34cd1e41f2e4f8610aa7568834d41acb..4f3e0529ffb37d3229a08a6a663833f83d260436 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineDataGrid.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineDataGrid.js
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (C) 2013, 2015 Apple Inc. All rights reserved.
>+ * Copyright (C) 2013-2018 Apple Inc. All rights reserved.
>  *
>  * Redistribution and use in source and binary forms, with or without
>  * modification, are permitted provided that the following conditions
>@@ -31,4 +31,9 @@ WI.LayoutTimelineDataGrid = class LayoutTimelineDataGrid extends WI.TimelineData
>     {
>         return this.selectedNode.elementWithColumnIdentifier("location");
>     }
>+
>+    shouldShowCallFramePopover()
>+    {
>+        return this.isColumnVisible("location");
>+    }
> };
>diff --git a/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineDataGrid.js b/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineDataGrid.js
>index 3597ad4a42dcbeda20cc08cf39816cbf90d3ff06..05f911e182ac33a78d8778cf061992041f83fbd5 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineDataGrid.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineDataGrid.js
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (C) 2013, 2015 Apple Inc. All rights reserved.
>+ * Copyright (C) 2013-2018 Apple Inc. All rights reserved.
>  *
>  * Redistribution and use in source and binary forms, with or without
>  * modification, are permitted provided that the following conditions
>@@ -31,4 +31,9 @@ WI.ScriptTimelineDataGrid = class ScriptTimelineDataGrid extends WI.TimelineData
>     {
>         return this.selectedNode.elementWithColumnIdentifier("location");
>     }
>+
>+    shouldShowCallFramePopover()
>+    {
>+        return this.isColumnVisible("location");
>+    }
> };
>diff --git a/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js b/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js
>index 63edac6c94ea596a18d74af020c4a3ace52a1fe7..f8e46d8764db61456ef3396486f9cdfee61b50a1 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (C) 2013, 2015 Apple Inc. All rights reserved.
>+ * Copyright (C) 2013-2018 Apple Inc. All rights reserved.
>  *
>  * Redistribution and use in source and binary forms, with or without
>  * modification, are permitted provided that the following conditions
>@@ -121,6 +121,12 @@ WI.TimelineDataGrid = class TimelineDataGrid extends WI.DataGrid
>         return null;
>     }
> 
>+    shouldShowCallFramePopover()
>+    {
>+        // Implemented by subclasses.
>+        return false;
>+    }
>+
>     addRowInSortOrder(dataGridNode, parentDataGridNode)
>     {
>         parentDataGridNode = parentDataGridNode || this;
>@@ -320,7 +326,8 @@ WI.TimelineDataGrid = class TimelineDataGrid extends WI.DataGrid
>             return;
>         }
> 
>-        this._showPopoverForSelectedNodeSoon();
>+        if (this.shouldShowCallFramePopover())
>+            this._showPopoverForSelectedNodeSoon();
>     }
> 
>     _showPopoverForSelectedNodeSoon()

Actions: View | Formatted Diff | Diff

Attachments on bug 189603: 349704