[Devtools] New network canvas timeline now properly shows initiators

third_party/WebKit/Source/devtools/front_end/network/NetworkLogView.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 333 matching lines @@
         this._dataGrid.element.addEventListener("mousemove", this._dataGridMouseMove.bind(this), true);
         this._dataGrid.element.addEventListener("mouseleave", this._dataGridMouseLeave.bind(this), true);
     },
 
     /**
      * @param {!Event} event
      */
     _dataGridMouseMove: function(event)
     {
         var node = this._dataGrid.dataGridNodeFromNode(event.target);
-        this._setHoveredNode(node);
-        this._highlightInitiatorChain((event.shiftKey && node) ? node.request() : null);
+        var highlightInitiatorChain = event.shiftKey;
+        this._setHoveredNode(node, highlightInitiatorChain);
+        this._highlightInitiatorChain((highlightInitiatorChain && node) ? node.request() : null);
     },
 
     _dataGridMouseLeave: function()
     {
         this._setHoveredNode(null);
         this._highlightInitiatorChain(null);
     },
 
     /**
      * @param {?WebInspector.NetworkRequest} request
+     * @param {boolean} highlightInitiatorChain
      */
-    setHoveredRequest: function(request)
+    setHoveredRequest: function(request, highlightInitiatorChain)
     {
-        this._setHoveredNode(request ? this._nodesByRequestId.get(request.requestId) : null);
+        this._setHoveredNode(request ? this._nodesByRequestId.get(request.requestId) : null, highlightInitiatorChain);
+        this._highlightInitiatorChain((request && highlightInitiatorChain) ? request : null);
     },
 
     /**
      * @param {?WebInspector.NetworkDataGridNode} node
+     * @param {boolean=} highlightInitiatorChain
      */
-    _setHoveredNode: function(node)
+    _setHoveredNode: function(node, highlightInitiatorChain)
     {
         if (this._hoveredNode)
             this._hoveredNode.element().classList.remove("hover");
         this._hoveredNode = node;
         if (this._hoveredNode)
             this._hoveredNode.element().classList.add("hover");
-        this._columns.setHoveredRequest(this._hoveredNode ? this._hoveredNode.request() : null);
+        this._columns.setHoveredRequest(this._hoveredNode ? this._hoveredNode.request() : null, !!highlightInitiatorChain);
     },
 
     /**
      * @param {!Event} event
      */
     _dataGridMouseDown: function(event)
     {
         if ((!this._dataGrid.selectedNode && event.button) || event.target.enclosingNodeOrSelfWithNodeName("a"))
             event.consume();
     },
 
     /**
      * @param {?WebInspector.NetworkRequest} request
      */
     _highlightInitiatorChain: function(request)
     {
         if (this._requestWithHighlightedInitiators === request)
             return;
         this._requestWithHighlightedInitiators = request;
 
         if (!request) {
             for (var node of this._nodesByRequestId.values()) {
                 if (!node.dataGrid)
                     continue;
                 node.element().classList.remove("network-node-on-initiator-path", "network-node-on-initiated-path");
             }
             return;
         }
 
-        var initiators = request.initiatorChain();
-        var initiated = new Set();
+        var initiatorGraph = request.initiatorGraph();
         for (var node of this._nodesByRequestId.values()) {
             if (!node.dataGrid)
                 continue;
-            var localInitiators = node.request().initiatorChain();
-            if (localInitiators.has(request))
-                initiated.add(node.request());
-        }
-
-        for (var node of this._nodesByRequestId.values()) {
-            if (!node.dataGrid)
-                continue;
-            node.element().classList.toggle("network-node-on-initiator-path", node.request() !== request && initiators.has(node.request()));
-            node.element().classList.toggle("network-node-on-initiated-path", node.request() !== request && initiated.has(node.request()));
+            node.element().classList.toggle("network-node-on-initiator-path", node.request() !== request && initiatorGraph.initiators.has(node.request()));
+            node.element().classList.toggle("network-node-on-initiated-path", node.request() !== request && initiatorGraph.initiated.has(node.request()));
         }
     },
 
     _updateSummaryBar: function()
     {
         var requestsNumber = this._nodesByRequestId.size;
 
         if (!requestsNumber) {
             this._showRecordingHint();
             return;
@@ skipping 1333 matching lines @@
  * @return {boolean}
  */
 WebInspector.NetworkLogView._requestTimeFilter = function(windowStart, windowEnd, request)
 {
     if (request.issueTime() > windowEnd)
         return false;
     if (request.endTime !== -1 && request.endTime < windowStart)
         return false;
     return true;
 };