Title: [201131] branches/safari-602.1.32-branch/Source/WebInspectorUI
- Revision
- 201131
- Author
- [email protected]
- Date
- 2016-05-19 01:39:47 -0700 (Thu, 19 May 2016)
Log Message
Merge r200656. rdar://problem/25898256
Modified Paths
Diff
Modified: branches/safari-602.1.32-branch/Source/WebInspectorUI/ChangeLog (201130 => 201131)
--- branches/safari-602.1.32-branch/Source/WebInspectorUI/ChangeLog 2016-05-19 08:08:30 UTC (rev 201130)
+++ branches/safari-602.1.32-branch/Source/WebInspectorUI/ChangeLog 2016-05-19 08:39:47 UTC (rev 201131)
@@ -1,3 +1,32 @@
+2016-05-19 Babak Shafiei <[email protected]>
+
+ Merge r200656. rdar://problem/25898256
+
+ 2016-05-10 Matt Baker <[email protected]>
+
+ 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 <[email protected]>
Merge r200918. rdar://problem/26230168
Modified: branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/DataGrid.js (201130 => 201131)
--- branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/DataGrid.js 2016-05-19 08:08:30 UTC (rev 201130)
+++ branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/DataGrid.js 2016-05-19 08:39:47 UTC (rev 201131)
@@ -2028,6 +2028,22 @@
this.collapse();
}
+ hasAncestor(ancestor)
+ {
+ if (!ancestor)
+ return false;
+
+ let currentAncestor = this.parent;
+ while (currentAncestor) {
+ if (ancestor === currentAncestor)
+ return true;
+
+ currentAncestor = currentAncestor.parent;
+ }
+
+ return false;
+ }
+
refresh()
{
if (!this._element || !this.dataGrid)
Modified: branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineOverviewGraph.js (201130 => 201131)
--- branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineOverviewGraph.js 2016-05-19 08:08:30 UTC (rev 201130)
+++ branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineOverviewGraph.js 2016-05-19 08:39:47 UTC (rev 201131)
@@ -259,9 +259,8 @@
if (newSelectedRecord[WebInspector.RenderingFrameTimelineOverviewGraph.RecordWasFilteredSymbol])
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) {
this.selectedRecord = newSelectedRecord;
Modified: branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js (201130 => 201131)
--- branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js 2016-05-19 08:08:30 UTC (rev 201130)
+++ branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js 2016-05-19 08:39:47 UTC (rev 201131)
@@ -325,8 +325,12 @@
if (this.currentTimelineView === this._overviewTimelineView)
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);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
