[Devtools] Inline _drawSimplifiedBarDetails in NetworkWaterfallColumn.js

third_party/WebKit/Source/devtools/front_end/network/NetworkWaterfallColumn.js

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 Network.NetworkWaterfallColumn = class extends UI.VBox {
   /**
    * @param {number} rowHeight
    * @param {!Network.NetworkTimeCalculator} calculator
    */
   constructor(rowHeight, calculator) {
     // TODO(allada) Make this a shadowDOM when the NetworkWaterfallColumn gets moved into NetworkLogViewColumns.
@@ skipping 459 matching lines @@
     context.beginPath();
     context.fillStyle = fillColor;
     context.rect(ranges.mid, 0, barWidth, height - borderWidth);
     context.fill();
     context.stroke();
 
     /** @type {?{left: string, right: string, tooltip: (string|undefined)}} */
     var labels = null;
     if (node.hovered()) {
       labels = this._calculator.computeBarGraphLabels(request);
-      this._drawSimplifiedBarDetails(
-          context, labels.left, labels.right, ranges.start, ranges.mid, ranges.mid + barWidth + borderOffset, y);
+
+      // TODO(allada) This will be inlined in an immidate next patch.
+      const leftText = labels.left;

[caseq, 2017/03/03 06:03:52]

please replaces with vars :(

[allada, 2017/03/03 19:46:56]

Done.

+      const rightText = labels.right;
+      const startX = ranges.start;
+      const midX = ranges.mid;
+      const endX = ranges.mid + barWidth + borderOffset;
+      const currentY = y;
+
+      const barDotLineLength = 10;
+      context.save();
+      var leftLabelWidth = context.measureText(leftText).width;
+      var rightLabelWidth = context.measureText(rightText).width;
+      context.fillStyle = UI.themeSupport.patchColor('#888', UI.ThemeSupport.ColorUsage.Foreground);
+      context.strokeStyle = UI.themeSupport.patchColor('#888', UI.ThemeSupport.ColorUsage.Foreground);
+      if (leftLabelWidth < midX - startX) {
+        const midBarX = startX + (midX - startX) / 2 - leftLabelWidth / 2;
+        this._textLayers.push({text: leftText, x: midBarX, y: currentY + this._fontSize});
+      } else if (barDotLineLength + leftLabelWidth + this._leftPadding < startX) {
+        this._textLayers.push(
+            {text: leftText, x: startX - leftLabelWidth - barDotLineLength - 1, y: currentY + this._fontSize});
+        context.beginPath();
+        context.arc(startX, Math.floor(height / 2), 2, 0, 2 * Math.PI);
+        context.fill();
+        context.beginPath();
+        context.lineWidth = 1;
+        context.moveTo(startX - barDotLineLength, Math.floor(height / 2));
+        context.lineTo(startX, Math.floor(height / 2));
+        context.stroke();
+      }
+
+      if (rightLabelWidth < endX - midX) {
+        var midBarX = midX + (endX - midX) / 2 - rightLabelWidth / 2;
+        this._textLayers.push({text: rightText, x: midBarX, y: currentY + this._fontSize});
+      } else if (endX + barDotLineLength + rightLabelWidth < this._offsetWidth - this._leftPadding) {
+        this._textLayers.push({text: rightText, x: endX + barDotLineLength + 1, y: currentY + this._fontSize});
+        context.beginPath();
+        context.arc(endX, Math.floor(height / 2), 2, 0, 2 * Math.PI);
+        context.fill();
+        context.beginPath();
+        context.lineWidth = 1;
+        context.moveTo(endX, Math.floor(height / 2));
+        context.lineTo(endX + barDotLineLength, Math.floor(height / 2));
+        context.stroke();
+      }
+      context.restore();
     }
 
     if (!this._calculator.startAtZero) {
       var queueingRange = Network.RequestTimingView.calculateRequestTimeRanges(request, 0)
                               .find(data => data.name === Network.RequestTimeRangeNames.Total);
       var leftLabelWidth = labels ? context.measureText(labels.left).width : 0;
       var leftTextPlacedInBar = leftLabelWidth < ranges.mid - ranges.start;
       const wiskerTextPadding = 13;
       var textOffset = (labels && !leftTextPlacedInBar) ? leftLabelWidth + wiskerTextPadding : 0;
       var queueingStart = this._timeToPosition(queueingRange.start);
       if (ranges.start - textOffset > queueingStart) {
         context.beginPath();
         context.globalAlpha = 1;
         context.strokeStyle = UI.themeSupport.patchColor('#a5a5a5', UI.ThemeSupport.ColorUsage.Foreground);
         context.moveTo(queueingStart, Math.floor(height / 2));
         context.lineTo(ranges.start - textOffset, Math.floor(height / 2));
 
         const wiskerHeight = height / 2;
         context.moveTo(queueingStart + borderOffset, wiskerHeight / 2);
         context.lineTo(queueingStart + borderOffset, height - wiskerHeight / 2 - 1);
         context.stroke();
       }
     }
 
     context.restore();
   }
 
   /**
    * @param {!CanvasRenderingContext2D} context
-   * @param {string} leftText
-   * @param {string} rightText
-   * @param {number} startX
-   * @param {number} midX
-   * @param {number} endX
-   * @param {number} currentY
-   */
-  _drawSimplifiedBarDetails(context, leftText, rightText, startX, midX, endX, currentY) {
-    /** @const */
-    var barDotLineLength = 10;
-
-    context.save();
-    var height = this._getBarHeight();
-    var leftLabelWidth = context.measureText(leftText).width;
-    var rightLabelWidth = context.measureText(rightText).width;
-    context.fillStyle = UI.themeSupport.patchColor('#888', UI.ThemeSupport.ColorUsage.Foreground);
-    context.strokeStyle = UI.themeSupport.patchColor('#888', UI.ThemeSupport.ColorUsage.Foreground);
-    if (leftLabelWidth < midX - startX) {
-      const midBarX = startX + (midX - startX) / 2 - leftLabelWidth / 2;
-      this._textLayers.push({text: leftText, x: midBarX, y: currentY + this._fontSize});
-    } else if (barDotLineLength + leftLabelWidth + this._leftPadding < startX) {
-      this._textLayers.push(
-          {text: leftText, x: startX - leftLabelWidth - barDotLineLength - 1, y: currentY + this._fontSize});
-      context.beginPath();
-      context.arc(startX, Math.floor(height / 2), 2, 0, 2 * Math.PI);
-      context.fill();
-      context.beginPath();
-      context.lineWidth = 1;
-      context.moveTo(startX - barDotLineLength, Math.floor(height / 2));
-      context.lineTo(startX, Math.floor(height / 2));
-      context.stroke();
-    }
-
-    if (rightLabelWidth < endX - midX) {
-      var midBarX = midX + (endX - midX) / 2 - rightLabelWidth / 2;
-      this._textLayers.push({text: rightText, x: midBarX, y: currentY + this._fontSize});
-    } else if (endX + barDotLineLength + rightLabelWidth < this._offsetWidth - this._leftPadding) {
-      this._textLayers.push({text: rightText, x: endX + barDotLineLength + 1, y: currentY + this._fontSize});
-      context.beginPath();
-      context.arc(endX, Math.floor(height / 2), 2, 0, 2 * Math.PI);
-      context.fill();
-      context.beginPath();
-      context.lineWidth = 1;
-      context.moveTo(endX, Math.floor(height / 2));
-      context.lineTo(endX + barDotLineLength, Math.floor(height / 2));
-      context.stroke();
-    }
-    context.restore();
-  }
-
-  /**
-   * @param {!CanvasRenderingContext2D} context
    * @param {!Network.NetworkNode} node
    * @param {number} y
    */
   _drawTimingBars(context, node, y) {
     var request = node.request();
     if (!request)
       return;
     context.save();
     var ranges = Network.RequestTimingView.calculateRequestTimeRanges(request, 0);
     for (var range of ranges) {
@@ skipping 76 matching lines @@
   script: 'hsl(31, 100%, 80%)',
   stylesheet: 'hsl(272, 64%, 80%)',
   texttrack: 'hsl(8, 100%, 80%)',
   websocket: 'hsl(0, 0%, 95%)',
   xhr: 'hsl(53, 100%, 80%)',
   other: 'hsl(0, 0%, 95%)'
 };
 
 /** @typedef {!{x: number, y: number, text: string}} */
 Network.NetworkWaterfallColumn._TextLayer;