Title: [201082] trunk/Source/WebInspectorUI
- Revision
- 201082
- Author
- mattba...@apple.com
- Date
- 2016-05-18 09:33:19 -0700 (Wed, 18 May 2016)
Log Message
Web Inspector: REGRESSION(r197488): Incorrect start time in Rendering Frames timeline grid
https://bugs.webkit.org/show_bug.cgi?id=157840
<rdar://problem/26344937>
Reviewed by Brian Burg.
* UserInterface/Views/TimelineRecordingContentView.js:
(WebInspector.TimelineRecordingContentView.prototype._updateTimes):
The Rendering Frames timeline view needs a valid zero time.
(WebInspector.TimelineRecordingContentView.prototype._timeRangeSelectionChanged):
Adjust ruler selection path component values by the zero time unless
the current view is the Rendering Frames timeline view.
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (201081 => 201082)
--- trunk/Source/WebInspectorUI/ChangeLog 2016-05-18 16:30:30 UTC (rev 201081)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-05-18 16:33:19 UTC (rev 201082)
@@ -1,3 +1,18 @@
+2016-05-18 Matt Baker <mattba...@apple.com>
+
+ Web Inspector: REGRESSION(r197488): Incorrect start time in Rendering Frames timeline grid
+ https://bugs.webkit.org/show_bug.cgi?id=157840
+ <rdar://problem/26344937>
+
+ Reviewed by Brian Burg.
+
+ * UserInterface/Views/TimelineRecordingContentView.js:
+ (WebInspector.TimelineRecordingContentView.prototype._updateTimes):
+ The Rendering Frames timeline view needs a valid zero time.
+ (WebInspector.TimelineRecordingContentView.prototype._timeRangeSelectionChanged):
+ Adjust ruler selection path component values by the zero time unless
+ the current view is the Rendering Frames timeline view.
+
2016-05-17 Matt Baker <mattba...@apple.com>
Web Inspector: NavigationSidebarPanel should coordinate item selection between its tree outlines
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js (201081 => 201082)
--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js 2016-05-18 16:30:30 UTC (rev 201081)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js 2016-05-18 16:33:19 UTC (rev 201082)
@@ -375,12 +375,8 @@
if (this._startTimeNeedsReset && !isNaN(startTime)) {
this._timelineOverview.startTime = startTime;
this._overviewTimelineView.zeroTime = startTime;
- for (var timelineView of this._timelineViewMap.values()) {
- if (timelineView.representedObject.type === WebInspector.TimelineRecord.Type.RenderingFrame)
- continue;
-
+ for (let timelineView of this._timelineViewMap.values())
timelineView.zeroTime = startTime;
- }
this._startTimeNeedsReset = false;
}
@@ -615,9 +611,14 @@
selectedPathComponent = this._entireRecordingPathComponent;
else {
let timelineRange = this._timelineSelectionPathComponent.representedObject;
- timelineRange.startValue = this.currentTimelineView.startTime - this.currentTimelineView.zeroTime;
- timelineRange.endValue = this.currentTimelineView.endTime - this.currentTimelineView.zeroTime;
+ timelineRange.startValue = this.currentTimelineView.startTime;
+ timelineRange.endValue = this.currentTimelineView.endTime;
+ if (!(this.currentTimelineView instanceof WebInspector.RenderingFrameTimelineView)) {
+ timelineRange.startValue -= this.currentTimelineView.zeroTime;
+ timelineRange.endValue -= this.currentTimelineView.zeroTime;
+ }
+
this._updateTimeRangePathComponents();
selectedPathComponent = this._timelineSelectionPathComponent;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
