| Index: third_party/WebKit/Source/devtools/front_end/network/NetworkOverview.js
|
| diff --git a/third_party/WebKit/Source/devtools/front_end/network/NetworkOverview.js b/third_party/WebKit/Source/devtools/front_end/network/NetworkOverview.js
|
| index 017d02cc886a6cfce713965fb58f8181a3bb6f33..5b53515b8c6b9347eeb186a62bc141e9437a5513 100644
|
| --- a/third_party/WebKit/Source/devtools/front_end/network/NetworkOverview.js
|
| +++ b/third_party/WebKit/Source/devtools/front_end/network/NetworkOverview.js
|
| @@ -19,10 +19,6 @@ Network.NetworkOverview = class extends UI.TimelineOverviewBase {
|
| this._restoringWindow = false;
|
| /** @type {boolean} */
|
| this._updateScheduled = false;
|
| - /** @type {number} */
|
| - this._canvasWidth = 0;
|
| - /** @type {number} */
|
| - this._canvasHeight = 0;
|
|
|
| SDK.targetManager.addModelListener(
|
| SDK.ResourceTreeModel, SDK.ResourceTreeModel.Events.Load, this._loadEventFired, this);
|
| @@ -111,7 +107,7 @@ Network.NetworkOverview = class extends UI.TimelineOverviewBase {
|
| onResize() {
|
| var width = this.element.offsetWidth;
|
| var height = this.element.offsetHeight;
|
| - this._calculator.setDisplayWindow(width);
|
| + this.calculator().setDisplayWindow(width);
|
| this.resetCanvas();
|
| var numBands = (((height - 1) / Network.NetworkOverview._bandHeight) - 1) | 0;
|
| this._numBands = (numBands > 0) ? numBands : 1;
|
| @@ -164,27 +160,26 @@ Network.NetworkOverview = class extends UI.TimelineOverviewBase {
|
| update() {
|
| this._updateScheduled = false;
|
|
|
| - var newBoundary =
|
| - new Network.NetworkTimeBoundary(this._calculator.minimumBoundary(), this._calculator.maximumBoundary());
|
| + var calculator = this.calculator();
|
| +
|
| + var newBoundary = new Network.NetworkTimeBoundary(calculator.minimumBoundary(), calculator.maximumBoundary());
|
| if (!this._lastBoundary || !newBoundary.equals(this._lastBoundary)) {
|
| - var span = this._calculator.boundarySpan();
|
| + var span = calculator.boundarySpan();
|
| while (this._span < span)
|
| this._span *= 1.25;
|
| - this._calculator.setBounds(this._calculator.minimumBoundary(), this._calculator.minimumBoundary() + this._span);
|
| - this._lastBoundary =
|
| - new Network.NetworkTimeBoundary(this._calculator.minimumBoundary(), this._calculator.maximumBoundary());
|
| + calculator.setBounds(calculator.minimumBoundary(), calculator.minimumBoundary() + this._span);
|
| + this._lastBoundary = new Network.NetworkTimeBoundary(calculator.minimumBoundary(), calculator.maximumBoundary());
|
| if (this._windowStart || this._windowEnd) {
|
| this._restoringWindow = true;
|
| - var startTime = this._calculator.minimumBoundary();
|
| - var totalTime = this._calculator.boundarySpan();
|
| + var startTime = calculator.minimumBoundary();
|
| + var totalTime = calculator.boundarySpan();
|
| var left = (this._windowStart - startTime) / totalTime;
|
| var right = (this._windowEnd - startTime) / totalTime;
|
| this._restoringWindow = false;
|
| }
|
| }
|
|
|
| - var context = this._canvas.getContext('2d');
|
| - var calculator = this._calculator;
|
| + var context = this.context();
|
| var linesByType = {};
|
| var paddingTop = 2;
|
|
|
| @@ -233,7 +228,7 @@ Network.NetworkOverview = class extends UI.TimelineOverviewBase {
|
| var band = this._bandId(request.connectionId);
|
| var y = (band === -1) ? 0 : (band % this._numBands + 1);
|
| var timeRanges =
|
| - Network.RequestTimingView.calculateRequestTimeRanges(request, this._calculator.minimumBoundary());
|
| + Network.RequestTimingView.calculateRequestTimeRanges(request, this.calculator().minimumBoundary());
|
| for (var j = 0; j < timeRanges.length; ++j) {
|
| var type = timeRanges[j].name;
|
| if (band !== -1 || type === Network.RequestTimeRangeNames.Total)
|
| @@ -241,7 +236,7 @@ Network.NetworkOverview = class extends UI.TimelineOverviewBase {
|
| }
|
| }
|
|
|
| - context.clearRect(0, 0, this._canvas.width, this._canvas.height);
|
| + context.clearRect(0, 0, this.width(), this.height());
|
| context.save();
|
| context.scale(window.devicePixelRatio, window.devicePixelRatio);
|
| context.lineWidth = 2;
|
|
|