Changeset 201131 in webkit

Timestamp:

May 19, 2016, 1:39:47 AM (9 years ago)

Author:

bshafiei@apple.com

Message:

Merge r200656. rdar://problem/25898256

Location:

branches/safari-602.1.32-branch/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/DataGrid.js (modified) (1 diff)
• UserInterface/Views/RenderingFrameTimelineOverviewGraph.js (modified) (1 diff)
• UserInterface/Views/TimelineRecordingContentView.js (modified) (1 diff)

branches/safari-602.1.32-branch/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2016-05-19  Babak Shafiei  <bshafiei@apple.com>
+
+        Merge r200656. rdar://problem/25898256
+
+    2016-05-10  Matt Baker  <mattbaker@apple.com>
+
+            Web Inspector: Can't select record bar in Frames timeline
+            https://bugs.webkit.org/show_bug.cgi?id=156963
+            <rdar://problem/25898256>
+
+            Reviewed by Timothy Hatcher.
+
+            Sync record selection between the Rendering Frames grid and overview graph.
+
+            * UserInterface/Views/DataGrid.js:
+            (WebInspector.DataGridNode.prototype.hasAncestor):
+            Add helper function needed by TimelineView.
+
+            * UserInterface/Views/RenderingFrameTimelineOverviewGraph.js:
+            (WebInspector.RenderingFrameTimelineOverviewGraph.prototype._mouseClicked):
+            Don't deselect the selected record when clicked. Initially this seemed
+            like a good idea but it complicates the UI for no added value.
+
+            * UserInterface/Views/TimelineRecordingContentView.js:
+            (WebInspector.TimelineRecordingContentView.prototype._contentViewSelectionPathComponentDidChange):
+            Get path components from the current TimelineView instead of the
+            TimelineRecordingContentView, now that the selected record appears
+            in the bottom ContentBrowser's navigation bar.
+
 2016-05-17  Babak Shafiei  <bshafiei@apple.com>
 

branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/DataGrid.js

@@ -2029 +2029 @@
     }
 
+    hasAncestor(ancestor)
+    {
+        if (!ancestor)
+            return false;
+
+        let currentAncestor = this.parent;
+        while (currentAncestor) {
+            if (ancestor === currentAncestor)
+                return true;
+
+            currentAncestor = currentAncestor.parent;
+        }
+
+        return false;
+    }
+
     refresh()
     {

branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineOverviewGraph.js

@@ -260 +260 @@
             return;
 
-        // Clicking the selected frame causes it to be deselected.
         if (this.selectedRecord === newSelectedRecord)
-            newSelectedRecord = null;
+            return;
 
         if (frameIndex >= this.timelineOverview.selectionStartTime && frameIndex < this.timelineOverview.selectionStartTime + this.timelineOverview.selectionDuration) {

branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js

@@ -326 +326 @@
             return;
 
-        var recordPathComponent = this.selectionPathComponents.find(function(element) { return element.representedObject instanceof WebInspector.TimelineRecord; });
-        var record = recordPathComponent ? recordPathComponent.representedObject : null;
+        let record = null;
+        if (this.currentTimelineView.selectionPathComponents) {
+            let recordPathComponent = this.currentTimelineView.selectionPathComponents.find((element) => element.representedObject instanceof WebInspector.TimelineRecord);
+            record = recordPathComponent ? recordPathComponent.representedObject : null;
+        }
+
         this._timelineOverview.selectRecord(event.target.representedObject, record);
     }