Title: [205632] releases/WebKitGTK/webkit-2.14/Source/WebInspectorUI
- Revision
- 205632
- Author
- [email protected]
- Date
- 2016-09-08 05:31:07 -0700 (Thu, 08 Sep 2016)
Log Message
Merge r205349 - Web Inspector: NetworkTimelineOverviewGraph.MinimumBarPaddingTime is undefined
https://bugs.webkit.org/show_bug.cgi?id=161510
Patch by Johan K. Jensen <[email protected]> on 2016-09-02
Reviewed by Brian Burg.
* UserInterface/Views/NetworkTimelineOverviewGraph.js:
(WebInspector.NetworkTimelineOverviewGraph.prototype._networkTimelineRecordAdded):
(WebInspector.NetworkTimelineOverviewGraph):
Calculate the minimumBarPaddingTime in similar ways to TimelineRecordBar,
by using MinimumWidthPixel, MinimumMarginPixel and MinimumDurationPerPixel as the secondsPerPixel value.
* UserInterface/Views/TimelineOverview.js:
(WebInspector.TimelineOverview):
Make Minimum/MaximumDurationPerPixel public properties.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.14/Source/WebInspectorUI/ChangeLog (205631 => 205632)
--- releases/WebKitGTK/webkit-2.14/Source/WebInspectorUI/ChangeLog 2016-09-08 12:20:57 UTC (rev 205631)
+++ releases/WebKitGTK/webkit-2.14/Source/WebInspectorUI/ChangeLog 2016-09-08 12:31:07 UTC (rev 205632)
@@ -1,3 +1,20 @@
+2016-09-02 Johan K. Jensen <[email protected]>
+
+ Web Inspector: NetworkTimelineOverviewGraph.MinimumBarPaddingTime is undefined
+ https://bugs.webkit.org/show_bug.cgi?id=161510
+
+ Reviewed by Brian Burg.
+
+ * UserInterface/Views/NetworkTimelineOverviewGraph.js:
+ (WebInspector.NetworkTimelineOverviewGraph.prototype._networkTimelineRecordAdded):
+ (WebInspector.NetworkTimelineOverviewGraph):
+ Calculate the minimumBarPaddingTime in similar ways to TimelineRecordBar,
+ by using MinimumWidthPixel, MinimumMarginPixel and MinimumDurationPerPixel as the secondsPerPixel value.
+
+ * UserInterface/Views/TimelineOverview.js:
+ (WebInspector.TimelineOverview):
+ Make Minimum/MaximumDurationPerPixel public properties.
+
2016-09-01 Matt Baker <[email protected]>
Web Inspector: Value checks of secondsPerPixel cause errors
Modified: releases/WebKitGTK/webkit-2.14/Source/WebInspectorUI/UserInterface/Views/NetworkTimelineOverviewGraph.js (205631 => 205632)
--- releases/WebKitGTK/webkit-2.14/Source/WebInspectorUI/UserInterface/Views/NetworkTimelineOverviewGraph.js 2016-09-08 12:20:57 UTC (rev 205631)
+++ releases/WebKitGTK/webkit-2.14/Source/WebInspectorUI/UserInterface/Views/NetworkTimelineOverviewGraph.js 2016-09-08 12:31:07 UTC (rev 205632)
@@ -114,6 +114,8 @@
return a.startTime - b.startTime;
}
+ let minimumBarPaddingTime = WebInspector.TimelineOverview.MinimumDurationPerPixel * (WebInspector.TimelineRecordBar.MinimumWidthPixels + WebInspector.TimelineRecordBar.MinimumMarginPixels)
+
// Try to find a row that has room and does not overlap a previous record.
var foundRowForRecord = false;
for (var i = 0; i < this._timelineRecordGridRows.length; ++i) {
@@ -120,7 +122,7 @@
var rowRecords = this._timelineRecordGridRows[i];
var lastRecord = rowRecords.lastValue;
- if (!lastRecord || lastRecord.endTime + WebInspector.NetworkTimelineOverviewGraph.MinimumBarPaddingTime <= resourceTimelineRecord.startTime) {
+ if (!lastRecord || lastRecord.endTime + minimumBarPaddingTime <= resourceTimelineRecord.startTime) {
insertObjectIntoSortedArray(resourceTimelineRecord, rowRecords, compareByStartTime);
this._nextDumpRow = i + 1;
foundRowForRecord = true;
@@ -135,7 +137,7 @@
var lastRecord = rowRecords.lastValue;
console.assert(lastRecord);
- if (lastRecord.activeStartTime + WebInspector.NetworkTimelineOverviewGraph.MinimumBarPaddingTime <= resourceTimelineRecord.startTime) {
+ if (lastRecord.activeStartTime + minimumBarPaddingTime <= resourceTimelineRecord.startTime) {
insertObjectIntoSortedArray(resourceTimelineRecord, rowRecords, compareByStartTime);
this._nextDumpRow = i + 1;
foundRowForRecord = true;
Modified: releases/WebKitGTK/webkit-2.14/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js (205631 => 205632)
--- releases/WebKitGTK/webkit-2.14/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js 2016-09-08 12:20:57 UTC (rev 205631)
+++ releases/WebKitGTK/webkit-2.14/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js 2016-09-08 12:31:07 UTC (rev 205632)
@@ -31,7 +31,7 @@
console.assert(timelineRecording instanceof WebInspector.TimelineRecording);
- this._timelinesViewModeSettings = this._createViewModeSettings(WebInspector.TimelineOverview.ViewMode.Timelines, 0.0001, 60, 0.01, 0, 15);
+ this._timelinesViewModeSettings = this._createViewModeSettings(WebInspector.TimelineOverview.ViewMode.Timelines, WebInspector.TimelineOverview.MinimumDurationPerPixel, WebInspector.TimelineOverview.MaximumDurationPerPixel, 0.01, 0, 15);
this._instrumentTypes = WebInspector.TimelineManager.availableTimelineTypes();
if (WebInspector.FPSInstrument.supported()) {
@@ -995,6 +995,8 @@
WebInspector.TimelineOverview.ScrollDeltaDenominator = 500;
WebInspector.TimelineOverview.EditInstrumentsStyleClassName = "edit-instruments";
+WebInspector.TimelineOverview.MinimumDurationPerPixel = 0.0001;
+WebInspector.TimelineOverview.MaximumDurationPerPixel = 60;
WebInspector.TimelineOverview.ViewMode = {
Timelines: "timeline-overview-view-mode-timelines",
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
