Title: [200643] trunk/Source/WebInspectorUI
- Revision
- 200643
- Author
- [email protected]
- Date
- 2016-05-10 14:26:00 -0700 (Tue, 10 May 2016)
Log Message
Web Inspector: Call Trees and Memory view blank
https://bugs.webkit.org/show_bug.cgi?id=157486
<rdar://problem/26178404>
Reviewed by Timothy Hatcher.
* UserInterface/Views/TimelineRecordingContentView.js:
(WebInspector.TimelineRecordingContentView.prototype._currentContentViewDidChange):
(WebInspector.TimelineRecordingContentView.prototype._updateTimes):
Setting current time now handled by _updateTimelineViewTimes.
(WebInspector.TimelineRecordingContentView.prototype._capturingStopped):
Update times for the current TimelineView when the recording ends.
This ensures that views that don't call TimelineView.setupDataGrid are
able to update state that depends on the ruler selection.
(WebInspector.TimelineRecordingContentView.prototype._timeRangeSelectionChanged):
(WebInspector.TimelineRecordingContentView.prototype._updateTimelineViewTimes):
Renamed from _updateTimelineViewSelection. Sets start, end, and current times.
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (200642 => 200643)
--- trunk/Source/WebInspectorUI/ChangeLog 2016-05-10 20:45:28 UTC (rev 200642)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-05-10 21:26:00 UTC (rev 200643)
@@ -1,3 +1,24 @@
+2016-05-10 Matt Baker <[email protected]>
+
+ Web Inspector: Call Trees and Memory view blank
+ https://bugs.webkit.org/show_bug.cgi?id=157486
+ <rdar://problem/26178404>
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Views/TimelineRecordingContentView.js:
+ (WebInspector.TimelineRecordingContentView.prototype._currentContentViewDidChange):
+ (WebInspector.TimelineRecordingContentView.prototype._updateTimes):
+ Setting current time now handled by _updateTimelineViewTimes.
+ (WebInspector.TimelineRecordingContentView.prototype._capturingStopped):
+ Update times for the current TimelineView when the recording ends.
+ This ensures that views that don't call TimelineView.setupDataGrid are
+ able to update state that depends on the ruler selection.
+
+ (WebInspector.TimelineRecordingContentView.prototype._timeRangeSelectionChanged):
+ (WebInspector.TimelineRecordingContentView.prototype._updateTimelineViewTimes):
+ Renamed from _updateTimelineViewSelection. Sets start, end, and current times.
+
2016-05-10 Devin Rousso <[email protected]>
Web Inspector: Cleanup super getter/setter now that underlying issue is fixed
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js (200642 => 200643)
--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js 2016-05-10 20:45:28 UTC (rev 200642)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js 2016-05-10 21:26:00 UTC (rev 200643)
@@ -277,8 +277,7 @@
this._updateProgressView();
if (timelineView) {
- this._updateTimelineViewSelection(timelineView);
- timelineView.currentTime = this._currentTime;
+ this._updateTimelineViewTimes(timelineView);
let timeline = null;
if (timelineView.representedObject instanceof WebInspector.Timeline)
@@ -383,12 +382,10 @@
this._currentTime = currentTime;
this._timelineOverview.currentTime = currentTime;
+
if (this.currentTimelineView)
- this.currentTimelineView.currentTime = currentTime;
+ this._updateTimelineViewTimes(this.currentTimelineView);
- if (this._timelineOverview.timelineRuler.entireRangeSelected)
- this._updateTimelineViewSelection(this._overviewTimelineView);
-
// Force a layout now since we are already in an animation frame and don't need to delay it until the next.
this._timelineOverview.updateLayoutIfNeeded();
if (this.currentTimelineView)
@@ -448,6 +445,9 @@
if (this._updating)
this._stopUpdatingCurrentTime();
+
+ if (this.currentTimelineView)
+ this._updateTimelineViewTimes(this.currentTimelineView);
}
_debuggerPaused(event)
@@ -601,7 +601,7 @@
if (!this.currentTimelineView)
return;
- this._updateTimelineViewSelection(this.currentTimelineView);
+ this._updateTimelineViewTimes(this.currentTimelineView);
let selectedPathComponent;
if (this._timelineOverview.timelineRuler.entireRangeSelected)
@@ -678,7 +678,7 @@
return pathComponent;
}
- _updateTimelineViewSelection(timelineView)
+ _updateTimelineViewTimes(timelineView)
{
let timelineRuler = this._timelineOverview.timelineRuler;
let entireRangeSelected = timelineRuler.entireRangeSelected;
@@ -694,6 +694,7 @@
}
timelineView.startTime = this._timelineOverview.selectionStartTime;
+ timelineView.currentTime = this._currentTime;
timelineView.endTime = endTime;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
