Title: [205626] releases/WebKitGTK/webkit-2.14/Source/WebInspectorUI
- Revision
- 205626
- Author
- [email protected]
- Date
- 2016-09-08 04:22:59 -0700 (Thu, 08 Sep 2016)
Log Message
Merge r205320 - Web Inspector: Value checks of secondsPerPixel cause errors
https://bugs.webkit.org/show_bug.cgi?id=161304
<rdar://problem/28050070>
Reviewed by Brian Burg.
* UserInterface/Views/NetworkTimelineView.js:
(WebInspector.NetworkTimelineView.prototype.reset):
Clear resource node map, which is used to determine which nodes
to refresh during layout.
(WebInspector.NetworkTimelineView.prototype.layout):
Like OverviewTimelineView, only refresh node graphs when times change.
This prevents refreshing nodes when (endTime - startTime) === 0.
* UserInterface/Views/TimelineRecordingContentView.js:
(WebInspector.TimelineRecordingContentView.prototype._recordingReset):
TimelineViews must be cleared before calling _updateTimes to avoid
doing layouts in timeline views containing stale data.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.14/Source/WebInspectorUI/ChangeLog (205625 => 205626)
--- releases/WebKitGTK/webkit-2.14/Source/WebInspectorUI/ChangeLog 2016-09-08 11:19:41 UTC (rev 205625)
+++ releases/WebKitGTK/webkit-2.14/Source/WebInspectorUI/ChangeLog 2016-09-08 11:22:59 UTC (rev 205626)
@@ -1,3 +1,25 @@
+2016-09-01 Matt Baker <[email protected]>
+
+ Web Inspector: Value checks of secondsPerPixel cause errors
+ https://bugs.webkit.org/show_bug.cgi?id=161304
+ <rdar://problem/28050070>
+
+ Reviewed by Brian Burg.
+
+ * UserInterface/Views/NetworkTimelineView.js:
+ (WebInspector.NetworkTimelineView.prototype.reset):
+ Clear resource node map, which is used to determine which nodes
+ to refresh during layout.
+
+ (WebInspector.NetworkTimelineView.prototype.layout):
+ Like OverviewTimelineView, only refresh node graphs when times change.
+ This prevents refreshing nodes when (endTime - startTime) === 0.
+
+ * UserInterface/Views/TimelineRecordingContentView.js:
+ (WebInspector.TimelineRecordingContentView.prototype._recordingReset):
+ TimelineViews must be cleared before calling _updateTimes to avoid
+ doing layouts in timeline views containing stale data.
+
2016-09-01 Nikita Vasilyev <[email protected]>
REGRESSION (r201454): Web Inspector: Text caret isn't visible when editing an attribute
Modified: releases/WebKitGTK/webkit-2.14/Source/WebInspectorUI/UserInterface/Views/NetworkTimelineView.js (205625 => 205626)
--- releases/WebKitGTK/webkit-2.14/Source/WebInspectorUI/UserInterface/Views/NetworkTimelineView.js 2016-09-08 11:19:41 UTC (rev 205625)
+++ releases/WebKitGTK/webkit-2.14/Source/WebInspectorUI/UserInterface/Views/NetworkTimelineView.js 2016-09-08 11:22:59 UTC (rev 205626)
@@ -158,6 +158,7 @@
this._dataGrid.reset();
this._pendingRecords = [];
+ this._resourceDataGridNodeMap.clear();
}
// TimelineDataGrid sort delegate
@@ -209,12 +210,19 @@
{
this.endTime = Math.min(this.endTime, this.currentTime);
+ let oldZeroTime = this._timelineRuler.zeroTime;
+ let oldStartTime = this._timelineRuler.startTime;
+ let oldEndTime = this._timelineRuler.endTime;
+
this._timelineRuler.zeroTime = this.zeroTime;
this._timelineRuler.startTime = this.startTime;
this._timelineRuler.endTime = this.endTime;
- for (let dataGridNode of this._resourceDataGridNodeMap.values())
- dataGridNode.refreshGraph();
+ // We only need to refresh the graphs when the any of the times change.
+ if (this.zeroTime !== oldZeroTime || this.startTime !== oldStartTime || this.endTime !== oldEndTime) {
+ for (let dataGridNode of this._resourceDataGridNodeMap.values())
+ dataGridNode.refreshGraph();
+ }
this._processPendingRecords();
}
Modified: releases/WebKitGTK/webkit-2.14/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js (205625 => 205626)
--- releases/WebKitGTK/webkit-2.14/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js 2016-09-08 11:19:41 UTC (rev 205625)
+++ releases/WebKitGTK/webkit-2.14/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js 2016-09-08 11:22:59 UTC (rev 205626)
@@ -618,6 +618,9 @@
_recordingReset(event)
{
+ for (let timelineView of this._timelineViewMap.values())
+ timelineView.reset();
+
this._currentTime = NaN;
this._discontinuityStartTime = NaN;
@@ -635,8 +638,6 @@
this._timelineOverview.reset();
this._overviewTimelineView.reset();
- for (var timelineView of this._timelineViewMap.values())
- timelineView.reset();
this._clearTimelineNavigationItem.enabled = false;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
