Title: [184336] trunk/Source/WebInspectorUI
- Revision
- 184336
- Author
- [email protected]
- Date
- 2015-05-14 08:33:12 -0700 (Thu, 14 May 2015)
Log Message
Web Inspector: Current time marker is always at zero in Rendering Frames ruler
https://bugs.webkit.org/show_bug.cgi?id=144518
Reviewed by Timothy Hatcher.
The current and end time values for the rendering frame timeline overview should always be equal to the frame
number of the last record in the rendering frames timeline.
* UserInterface/Views/TimelineOverview.js:
(WebInspector.TimelineOverview):
(WebInspector.TimelineOverview.prototype.updateLayout):
* UserInterface/Views/TimelineRecordingContentView.js:
(WebInspector.TimelineRecordingContentView.prototype._updateTimes):
(WebInspector.TimelineRecordingContentView.prototype._recordingTimesUpdated):
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (184335 => 184336)
--- trunk/Source/WebInspectorUI/ChangeLog 2015-05-14 10:52:20 UTC (rev 184335)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-05-14 15:33:12 UTC (rev 184336)
@@ -1,3 +1,20 @@
+2015-05-14 Matt Baker <[email protected]>
+
+ Web Inspector: Current time marker is always at zero in Rendering Frames ruler
+ https://bugs.webkit.org/show_bug.cgi?id=144518
+
+ Reviewed by Timothy Hatcher.
+
+ The current and end time values for the rendering frame timeline overview should always be equal to the frame
+ number of the last record in the rendering frames timeline.
+
+ * UserInterface/Views/TimelineOverview.js:
+ (WebInspector.TimelineOverview):
+ (WebInspector.TimelineOverview.prototype.updateLayout):
+ * UserInterface/Views/TimelineRecordingContentView.js:
+ (WebInspector.TimelineRecordingContentView.prototype._updateTimes):
+ (WebInspector.TimelineRecordingContentView.prototype._recordingTimesUpdated):
+
2015-05-11 Brent Fulgham <[email protected]>
[Win] Move Windows build target to Windows 7 (or newer)
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js (184335 => 184336)
--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js 2015-05-14 10:52:20 UTC (rev 184335)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js 2015-05-14 15:33:12 UTC (rev 184336)
@@ -66,6 +66,7 @@
this._startTime = 0;
this._currentTime = 0;
+ this._revealCurrentTime = false;
this._endTime = 0;
this._minimumDurationPerPixel = minimumDurationPerPixel;
this._maximumDurationPerPixel = maximumDurationPerPixel;
@@ -280,7 +281,7 @@
if (this._revealCurrentTime) {
this.revealMarker(this._currentTimeMarker);
- delete this._revealCurrentTime;
+ this._revealCurrentTime = false;
}
const visibleDuration = this.visibleDuration;
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js (184335 => 184336)
--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js 2015-05-14 10:52:20 UTC (rev 184335)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js 2015-05-14 15:33:12 UTC (rev 184336)
@@ -428,9 +428,12 @@
if (this.currentTimelineView)
this.currentTimelineView.currentTime = currentTime;
- if (this._renderingFrameTimeline && this.currentTimelineView.representedObject.type === WebInspector.TimelineRecord.Type.RenderingFrame) {
- var oldEndTime = this._renderingFrameTimelineOverview.endTime;
- this._renderingFrameTimelineOverview.endTime = this._renderingFrameTimeline.records.length;
+ if (this._renderingFrameTimeline) {
+ var currentFrameNumber = 0;
+ if (this._renderingFrameTimeline.records.length)
+ currentFrameNumber = this._renderingFrameTimeline.records.lastValue.frameNumber;
+
+ this._renderingFrameTimelineOverview.currentTime = this._renderingFrameTimelineOverview.endTime = currentFrameNumber;
}
this._timelineSidebarPanel.updateFilter();
@@ -513,6 +516,10 @@
// We might want to have the backend send a "start" record to get current time moving.
for (var timeline of this._recording.timelines.values()) {
+ // The rendering frame timeline doesn't use a time axis.
+ if (timeline.type === WebInspector.TimelineRecord.Type.RenderingFrame)
+ continue;
+
var lastRecord = timeline.records.lastValue;
if (!lastRecord)
continue;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
