[Devtools] Fixed new timeline simplified bars popover hover

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

Index: third_party/WebKit/Source/devtools/front_end/network/NetworkTimelineColumn.js
diff --git a/third_party/WebKit/Source/devtools/front_end/network/NetworkTimelineColumn.js b/third_party/WebKit/Source/devtools/front_end/network/NetworkTimelineColumn.js
index 8c9eef01db510da926dc2b7df77b7b0fe393a5a0..8d446afe51b4868f117f655bf50a5968b0b196c9 100644
--- a/third_party/WebKit/Source/devtools/front_end/network/NetworkTimelineColumn.js
+++ b/third_party/WebKit/Source/devtools/front_end/network/NetworkTimelineColumn.js
@@ -23,6 +23,8 @@ WebInspector.NetworkTimelineColumn = class extends WebInspector.VBox {
     this._leftPadding = 5;
     /** @const */
     this._fontSize = 10;
+    /** @const */
+    this._borderOffset = .5;

[dgozman, 2016/11/03 21:52:43]

I'm not sure what the styleguide says, but I prefer 0.5 :-)

[allada, 2016/11/03 22:31:22]

Done.

 
     this._rightPadding = 0;
 
@@ -85,11 +87,18 @@ WebInspector.NetworkTimelineColumn = class extends WebInspector.VBox {
   _getPopoverAnchor(element, event) {
     if (!this._hoveredRequest)
       return;
-
-    var range = WebInspector.RequestTimingView.calculateRequestTimeRanges(this._hoveredRequest, 0)
-                    .find(data => data.name === 'total');
-    var start = this._timeToPosition(range.start);
-    var end = this._timeToPosition(range.end);
+    var useTimingBars =
+        !WebInspector.moduleSetting('networkColorCodeResourceTypes').get() && !this._calculator.startAtZero;
+    if (useTimingBars) {
+      var range = WebInspector.RequestTimingView.calculateRequestTimeRanges(this._hoveredRequest, 0)
+                      .find(data => data.name === 'total');
+      var start = this._timeToPosition(range.start);
+      var end = this._timeToPosition(range.end);
+    } else {
+      var range = this._getSimplifiedBarRange(this._hoveredRequest);
+      var start = range.start;
+      var end = range.end;
+    }
 
     if (event.clientX < this._canvasPosition.left + start || event.clientX > this._canvasPosition.left + end)
       return;
@@ -386,21 +395,29 @@ WebInspector.NetworkTimelineColumn = class extends WebInspector.VBox {
   }
 
   /**
+   * @param {!WebInspector.NetworkRequest} request
+   * @return {!{start: number, mid: number, end: number}}
+   */
+  _getSimplifiedBarRange(request) {
+    var drawWidth = this._offsetWidth - this._leftPadding;
+    var percentages = this._calculator.computeBarGraphPercentages(request);
+    return {
+      start: this._leftPadding + Math.floor((percentages.start / 100) * drawWidth) + this._borderOffset,
+      mid: this._leftPadding + Math.floor((percentages.middle / 100) * drawWidth) + this._borderOffset,
+      end: this._leftPadding + Math.floor((percentages.end / 100) * drawWidth) + this._borderOffset
+    };
+  }
+
+  /**
    * @param {!CanvasRenderingContext2D} context
    * @param {!WebInspector.NetworkRequest} request
    * @param {number} y
    */
   _drawSimplifiedBars(context, request, y) {
-    /** @const */
-    var borderWidth = 1;
+    const borderWidth = 1;

[dgozman, 2016/11/03 21:52:43]

Should this be 2 * this._borderOffset?

[allada, 2016/11/03 22:31:22]

Done.

 
     context.save();
-    var percentages = this._calculator.computeBarGraphPercentages(request);
-    var drawWidth = this._offsetWidth - this._leftPadding;
-    var borderOffset = borderWidth % 2 === 0 ? 0 : .5;
-    var start = this._leftPadding + Math.floor((percentages.start / 100) * drawWidth) + borderOffset;
-    var mid = this._leftPadding + Math.floor((percentages.middle / 100) * drawWidth) + borderOffset;
-    var end = this._leftPadding + Math.floor((percentages.end / 100) * drawWidth) + borderOffset;
+    var ranges = this._getSimplifiedBarRange(request);
     var height = this._getBarHeight();
     y += Math.floor(this._rowHeight / 2 - height / 2 + borderWidth) - borderWidth / 2;
 
@@ -411,20 +428,20 @@ WebInspector.NetworkTimelineColumn = class extends WebInspector.VBox {
 
     context.beginPath();
     context.globalAlpha = .5;
-    context.rect(start, 0, mid - start, height - borderWidth);
+    context.rect(ranges.start, 0, ranges.mid - ranges.start, height - borderWidth);
     context.fill();
     context.stroke();
 
-    var barWidth = Math.max(2, end - mid);
+    var barWidth = Math.max(2, ranges.end - ranges.mid);
     context.beginPath();
     context.globalAlpha = 1;
-    context.rect(mid, 0, barWidth, height - borderWidth);
+    context.rect(ranges.mid, 0, barWidth, height - borderWidth);
     context.fill();
     context.stroke();
 
     if (request === this._hoveredRequest) {
       var labels = this._calculator.computeBarGraphLabels(request);
-      this._drawSimplifiedBarDetails(context, labels.left, labels.right, start, mid, mid + barWidth + borderOffset);
+      this._drawSimplifiedBarDetails(context, labels.left, labels.right, ranges.start, ranges.mid, ranges.mid + barWidth + this._borderOffset);
     }
 
     context.restore();