[DevTools] Simplify getting back to default network order.

Source/devtools/front_end/network/NetworkTimeCalculator.js

 /*
  * Copyright (C) 2007, 2008 Apple Inc.  All rights reserved.
  * Copyright (C) 2008, 2009 Anthony Ricaud <rik@webkit.org>
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
@@ skipping 37 matching lines @@
     {
         return (this.minimum === other.minimum) && (this.maximum === other.maximum);
     }
 }
 
 /**
  * @constructor
  * @extends {WebInspector.Object}
  * @implements {WebInspector.TimelineGrid.Calculator}
  */
-WebInspector.NetworkTimeCalculator = function(startAtZero)
+WebInspector.NetworkTimeCalculator = function()
 {
-    this.startAtZero = startAtZero;
     this._boundryChangedEventThrottler = new WebInspector.Throttler(0);
     /** @type {?WebInspector.NetworkTimeBoundary} */
     this._window = null;
 }
 
 /** @enum {string} */
 WebInspector.NetworkTimeCalculator.Events = {
     BoundariesChanged: "BoundariesChanged"
 }
 
@@ skipping 48 matching lines @@
     },
 
     /**
      * @override
      * @param {number} value
      * @param {number=} precision
      * @return {string}
      */
     formatTime: function(value, precision)
     {
-        return Number.secondsToString(value);
+        return Number.secondsToString(value - this.zeroTime());
     },
 
     /**
      * @override
      * @return {number}
      */
     minimumBoundary: function()
     {
         return this._window ? this._window.minimum : this._minimumBoundary;
     },
@@ skipping 55 matching lines @@
     {
         this._workingArea = clientWidth;
     },
 
     /**
      * @param {!WebInspector.NetworkRequest} request
      * @return {!{start: number, middle: number, end: number}}
      */
     computeBarGraphPercentages: function(request)
     {
-        if (request.startTime !== -1)
-            var start = ((request.startTime - this.minimumBoundary()) / this.boundarySpan()) * 100;
-        else
-            var start = 0;
-
-        if (request.responseReceivedTime !== -1)
-            var middle = ((request.responseReceivedTime - this.minimumBoundary()) / this.boundarySpan()) * 100;
-        else
-            var middle = (this.startAtZero ? start : 100);
-
-        if (request.endTime !== -1)
-            var end = ((request.endTime - this.minimumBoundary()) / this.boundarySpan()) * 100;
-        else
-            var end = (this.startAtZero ? middle : 100);
-
-        if (this.startAtZero) {
-            end -= start;
-            middle -= start;
-            start = 0;
-        }
-
+        var start = (request.startTime === -1) ? 0 : ((request.startTime - this.minimumBoundary()) / this.boundarySpan()) * 100;
+        var middle = (request.responseReceivedTime === -1) ? 100 :((request.responseReceivedTime - this.minimumBoundary()) / this.boundarySpan()) * 100;
+        var end = (request.endTime !== -1) ?  100 : ((request.endTime - this.minimumBoundary()) / this.boundarySpan()) * 100;
         return {start: start, middle: middle, end: end};
     },
 
     /**
      * @param {number} eventTime
      * @return {number}
      */
     computePercentageFromEventTime: function(eventTime)
     {
-        // This function computes a percentage in terms of the total loading time
-        // of a specific event. If startAtZero is set, then this is useless, and we
-        // want to return 0.
-        if (eventTime !== -1 && !this.startAtZero)
-            return ((eventTime - this.minimumBoundary()) / this.boundarySpan()) * 100;
-
-        return 0;
+        return (eventTime === -1) ? 0 : ((eventTime - this.minimumBoundary()) / this.boundarySpan()) * 100;
     },
 
     /**
      * @param {number} percentage
      * @return {number}
      */
     percentageToTime: function(percentage)
     {
         return percentage * this.boundarySpan() / 100 + this.minimumBoundary();
     },
 
     _boundaryChanged: function()
     {
         this._boundryChangedEventThrottler.schedule(this.dispatchEventToListeners.bind(this, WebInspector.NetworkTimeCalculator.Events.BoundariesChanged));
     },
 
     /**
      * @param {number} eventTime
      */
     updateBoundariesForEventTime: function(eventTime)
     {
-        if (eventTime === -1 || this.startAtZero)
+        if (eventTime === -1)
             return;
 
         if (this._maximumBoundary === undefined || eventTime > this._maximumBoundary) {
             this._maximumBoundary = eventTime;
             this._boundaryChanged();
         }
     },
 
     /**
      * @param {!WebInspector.NetworkRequest} request
@@ skipping 28 matching lines @@
         else if (request.cached())
             tooltip = WebInspector.NetworkTimeCalculator._fromCacheFormat.format(tooltip);
         return {left: leftLabel, right: rightLabel, tooltip: tooltip};
     },
 
     /**
      * @param {!WebInspector.NetworkRequest} request
      */
     updateBoundaries: function(request)
     {
-        var lowerBound;
-        if (this.startAtZero)
-            lowerBound = 0;
-        else
-            lowerBound = this._lowerBound(request);
+        var lowerBound = this._lowerBound(request);
 
         if (lowerBound !== -1 && (typeof this._minimumBoundary === "undefined" || lowerBound < this._minimumBoundary)) {
             this._minimumBoundary = lowerBound;
             this._boundaryChanged();
         }
 
         var upperBound = this._upperBound(request);
         if (upperBound !== -1 && (typeof this._maximumBoundary === "undefined" || upperBound > this._maximumBoundary)) {
             this._maximumBoundary = upperBound;
             this._boundaryChanged();
         }
     },
 
     /**
      * @param {!WebInspector.NetworkRequest} request
      * @return {number}
      */
     _lowerBound: function(request)
     {
-        return 0;
-    },
-
-    /**
-     * @param {!WebInspector.NetworkRequest} request
-     * @return {number}
-     */
-    _upperBound: function(request)
-    {
-        return 0;
-    },
-
-    __proto__: WebInspector.Object.prototype
-}
-
-/**
- * @constructor
- * @extends {WebInspector.NetworkTimeCalculator}
- */
-WebInspector.NetworkTransferTimeCalculator = function()
-{
-    WebInspector.NetworkTimeCalculator.call(this, false);
-}
-
-WebInspector.NetworkTransferTimeCalculator.prototype = {
-    /**
-     * @override
-     * @param {number} value
-     * @param {number=} precision
-     * @return {string}
-     */
-    formatTime: function(value, precision)
-    {
-        return Number.secondsToString(value - this.zeroTime());
-    },
-
-    /**
-     * @override
-     * @param {!WebInspector.NetworkRequest} request
-     * @return {number}
-     */
-    _lowerBound: function(request)
-    {
         return request.startTime;
     },
 
     /**
-     * @override
      * @param {!WebInspector.NetworkRequest} request
      * @return {number}
      */
     _upperBound: function(request)
     {
         return request.endTime;
     },
 
-    __proto__: WebInspector.NetworkTimeCalculator.prototype
+    __proto__: WebInspector.Object.prototype
 }
-
-/**
- * @constructor
- * @extends {WebInspector.NetworkTimeCalculator}
- */
-WebInspector.NetworkTransferDurationCalculator = function()
-{
-    WebInspector.NetworkTimeCalculator.call(this, true);
-}
-
-WebInspector.NetworkTransferDurationCalculator.prototype = {
-    /**
-     * @override
-     * @param {number} value
-     * @param {number=} precision
-     * @return {string}
-     */
-    formatTime: function(value, precision)
-    {
-        return Number.secondsToString(value);
-    },
-
-    /**
-     * @override
-     * @param {!WebInspector.NetworkRequest} request
-     * @return {number}
-     */
-    _upperBound: function(request)
-    {
-        return request.duration;
-    },
-
-    __proto__: WebInspector.NetworkTimeCalculator.prototype
-}