[DevTools] Simplify getting back to default network order.

Source/devtools/front_end/network/NetworkTimeCalculator.js

Index: Source/devtools/front_end/network/NetworkTimeCalculator.js
diff --git a/Source/devtools/front_end/network/NetworkTimeCalculator.js b/Source/devtools/front_end/network/NetworkTimeCalculator.js
index 08546afe1a1c1f4b4e2f2f324f6f8d06f4cc9e95..6df0830af79cac6e7a930fc7ffcdc05c1a0e402b 100644
--- a/Source/devtools/front_end/network/NetworkTimeCalculator.js
+++ b/Source/devtools/front_end/network/NetworkTimeCalculator.js
@@ -55,9 +55,8 @@ WebInspector.NetworkTimeBoundary.prototype = {
  * @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;
@@ -126,7 +125,7 @@ WebInspector.NetworkTimeCalculator.prototype = {
      */
     formatTime: function(value, precision)
     {
-        return Number.secondsToString(value);
+        return Number.secondsToString(value - this.zeroTime());
     },
 
     /**
@@ -202,27 +201,9 @@ WebInspector.NetworkTimeCalculator.prototype = {
      */
     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};
     },
 
@@ -232,13 +213,7 @@ WebInspector.NetworkTimeCalculator.prototype = {
      */
     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;
     },
 
     /**
@@ -260,7 +235,7 @@ WebInspector.NetworkTimeCalculator.prototype = {
      */
     updateBoundariesForEventTime: function(eventTime)
     {
-        if (eventTime === -1 || this.startAtZero)
+        if (eventTime === -1)
             return;
 
         if (this._maximumBoundary === undefined || eventTime > this._maximumBoundary) {
@@ -309,11 +284,7 @@ WebInspector.NetworkTimeCalculator.prototype = {
      */
     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;
@@ -333,54 +304,10 @@ WebInspector.NetworkTimeCalculator.prototype = {
      */
     _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}
      */
@@ -389,39 +316,5 @@ WebInspector.NetworkTransferTimeCalculator.prototype = {
         return request.endTime;
     },
 
-    __proto__: WebInspector.NetworkTimeCalculator.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
+    __proto__: WebInspector.Object.prototype
 }