Title: [197919] trunk/Source/WebInspectorUI
Revision
197919
Author
[email protected]
Date
2016-03-09 19:16:44 -0800 (Wed, 09 Mar 2016)

Log Message

Web Inspector: LayoutTimelineView path components should reflect grid row nesting
https://bugs.webkit.org/show_bug.cgi?id=155279
<rdar://problem/25075355>

Reviewed by Timothy Hatcher.

* UserInterface/Views/LayoutTimelineView.js:
(WebInspector.LayoutTimelineView.prototype.get selectionPathComponents):
Walk grid nodes to build path component array.

Modified Paths

Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (197918 => 197919)


--- trunk/Source/WebInspectorUI/ChangeLog	2016-03-10 02:41:34 UTC (rev 197918)
+++ trunk/Source/WebInspectorUI/ChangeLog	2016-03-10 03:16:44 UTC (rev 197919)
@@ -1,5 +1,17 @@
 2016-03-09  Matt Baker  <[email protected]>
 
+        Web Inspector: LayoutTimelineView path components should reflect grid row nesting
+        https://bugs.webkit.org/show_bug.cgi?id=155279
+        <rdar://problem/25075355>
+
+        Reviewed by Timothy Hatcher.
+
+        * UserInterface/Views/LayoutTimelineView.js:
+        (WebInspector.LayoutTimelineView.prototype.get selectionPathComponents):
+        Walk grid nodes to build path component array.
+
+2016-03-09  Matt Baker  <[email protected]>
+
         Web Inspector: Timelines UI redesign: use DataGridNode for TimelineView selection path components
         https://bugs.webkit.org/show_bug.cgi?id=154954
         <rdar://problem/24947939>

Modified: trunk/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineView.js (197918 => 197919)


--- trunk/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineView.js	2016-03-10 02:41:34 UTC (rev 197918)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineView.js	2016-03-10 03:16:44 UTC (rev 197919)
@@ -104,15 +104,24 @@
 
     get selectionPathComponents()
     {
-        if (!this._dataGrid.selectedNode || this._dataGrid.selectedNode.hidden)
+        let dataGridNode = this._dataGrid.selectedNode;
+        if (!dataGridNode || dataGridNode.hidden)
             return null;
 
-        let timelineDataGridNode = this._dataGrid.selectedNode;
-        console.assert(timelineDataGridNode instanceof WebInspector.TimelineDataGridNode);
+        let pathComponents = [];
 
-        let pathComponent = new WebInspector.TimelineDataGridNodePathComponent(timelineDataGridNode);
-        pathComponent.addEventListener(WebInspector.HierarchicalPathComponent.Event.SiblingWasSelected, this.dataGridNodePathComponentSelected, this);
-        return [pathComponent];
+        while (dataGridNode && !dataGridNode.root) {
+            console.assert(dataGridNode instanceof WebInspector.TimelineDataGridNode);
+            if (dataGridNode.hidden)
+                return null;
+
+            let pathComponent = new WebInspector.TimelineDataGridNodePathComponent(dataGridNode);
+            pathComponent.addEventListener(WebInspector.HierarchicalPathComponent.Event.SiblingWasSelected, this.dataGridNodePathComponentSelected, this);
+            pathComponents.unshift(pathComponent);
+            dataGridNode = dataGridNode.parent;
+        }
+
+        return pathComponents;
     }
 
     shown()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to