Title: [184427] trunk/Source/WebInspectorUI
- Revision
- 184427
- Author
- [email protected]
- Date
- 2015-05-15 20:00:05 -0700 (Fri, 15 May 2015)
Log Message
Web Inspector: Timeline data grid displays wrong records after switching between Timelines/Frames mode
https://bugs.webkit.org/show_bug.cgi?id=145084
Reviewed by Timothy Hatcher.
Update timeline sidebar filter whenever the view mode changes.
* UserInterface/Views/TimelineSidebarPanel.js:
(WebInspector.TimelineSidebarPanel.prototype.treeElementForRepresentedObject.get if.get if):
(WebInspector.TimelineSidebarPanel.get else):
(WebInspector.TimelineSidebarPanel.prototype.treeElementForRepresentedObject.get if):
(WebInspector.TimelineSidebarPanel.prototype.treeElementForRepresentedObject):
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (184426 => 184427)
--- trunk/Source/WebInspectorUI/ChangeLog 2015-05-16 02:31:34 UTC (rev 184426)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-05-16 03:00:05 UTC (rev 184427)
@@ -1,3 +1,18 @@
+2015-05-15 Matt Baker <[email protected]>
+
+ Web Inspector: Timeline data grid displays wrong records after switching between Timelines/Frames mode
+ https://bugs.webkit.org/show_bug.cgi?id=145084
+
+ Reviewed by Timothy Hatcher.
+
+ Update timeline sidebar filter whenever the view mode changes.
+
+ * UserInterface/Views/TimelineSidebarPanel.js:
+ (WebInspector.TimelineSidebarPanel.prototype.treeElementForRepresentedObject.get if.get if):
+ (WebInspector.TimelineSidebarPanel.get else):
+ (WebInspector.TimelineSidebarPanel.prototype.treeElementForRepresentedObject.get if):
+ (WebInspector.TimelineSidebarPanel.prototype.treeElementForRepresentedObject):
+
2015-05-15 Joseph Pecoraro <[email protected]>
Web Inspector: Bump image format number to force image regeneration
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js (184426 => 184427)
--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js 2015-05-16 02:31:34 UTC (rev 184426)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js 2015-05-16 03:00:05 UTC (rev 184427)
@@ -740,20 +740,21 @@
this._frameSelectionChartSection.collapsed = false;
}
- if (!selectedByUser)
- return;
+ if (selectedByUser) {
+ if (this._viewMode === WebInspector.TimelineSidebarPanel.ViewMode.RenderingFrames) {
+ if (this._timelinesTreeOutline.selectedTreeElement)
+ this._previousTimelineSelection = this._timelinesTreeOutline.selectedTreeElement.representedObject;
- if (this._viewMode === WebInspector.TimelineSidebarPanel.ViewMode.RenderingFrames) {
- if (this._timelinesTreeOutline.selectedTreeElement)
- this._previousTimelineSelection = this._timelinesTreeOutline.selectedTreeElement.representedObject;
+ console.assert(this._displayedRecording);
+ this.showTimelineViewForTimeline(this._displayedRecording.timelines.get(WebInspector.TimelineRecord.Type.RenderingFrame));
+ } else if (this._previousTimelineSelection) {
+ this.showTimelineViewForTimeline(this._previousTimelineSelection);
+ this._previousTimelineSelection = null;
+ } else
+ this.showTimelineOverview();
+ }
- console.assert(this._displayedRecording);
- this.showTimelineViewForTimeline(this._displayedRecording.timelines.get(WebInspector.TimelineRecord.Type.RenderingFrame));
- } else if (this._previousTimelineSelection) {
- this.showTimelineViewForTimeline(this._previousTimelineSelection);
- this._previousTimelineSelection = null;
- } else
- this.showTimelineOverview();
+ this.updateFilter();
}
_refreshFrameSelectionChart()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
