[Devtools] Network group experiment is now grouped by connectionId

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 764 matching lines @@
       delete this._refreshRequestId;
     }
 
     this.removeAllNodeHighlights();
 
     this._timeCalculator.updateBoundariesForEventTime(this._mainRequestLoadTime);
     this._durationCalculator.updateBoundariesForEventTime(this._mainRequestLoadTime);
     this._timeCalculator.updateBoundariesForEventTime(this._mainRequestDOMContentLoadedTime);
     this._durationCalculator.updateBoundariesForEventTime(this._mainRequestDOMContentLoadedTime);
 
-    /** @type {!Array<!Network.NetworkRequestNode> } */
-    var nodesToInsert = [];
-    /** @type {!Array<!Network.NetworkRequestNode> } */
+    /** @type {!Map<!Network.NetworkNode, !Network.NetworkNode>} */
+    var nodesToInsert = new Map();
+    /** @type {!Array<!Network.NetworkNode>} */
     var nodesToRefresh = [];
     for (var requestId in this._staleRequestIds) {
       var node = this._nodesByRequestId.get(requestId);
       if (!node)
         continue;
       var isFilteredOut = !this._applyFilter(node);
       if (isFilteredOut && node === this._hoveredNode)
         this._setHoveredNode(null);
-      if (node[Network.NetworkLogView._isFilteredOutSymbol] !== isFilteredOut) {
-        if (!node[Network.NetworkLogView._isFilteredOutSymbol])
-          node.parent.removeChild(node);
 
-        node[Network.NetworkLogView._isFilteredOutSymbol] = isFilteredOut;
-
-        if (!node[Network.NetworkLogView._isFilteredOutSymbol])
-          nodesToInsert.push(node);
-      }
       if (!isFilteredOut)
         nodesToRefresh.push(node);
       var request = node.request();
       this._timeCalculator.updateBoundaries(request);
       this._durationCalculator.updateBoundaries(request);
+
+      if (node[Network.NetworkLogView._isFilteredOutSymbol] === isFilteredOut)
+        continue;
+
+      node[Network.NetworkLogView._isFilteredOutSymbol] = isFilteredOut;
+      var newParent = this._parentNodeForInsert(node);
+      var removeFromParent = node.parent && (isFilteredOut || node.parent !== newParent);
+      if (removeFromParent) {
+        var parent = node.parent;
+        parent.removeChild(node);
+        while (parent && !parent.hasChildren() && parent.dataGrid && parent.dataGrid.rootNode() !== parent) {
+          var grandparent = parent.parent;
+          grandparent.removeChild(parent);
+          parent = grandparent;
+        }
+      }
+
+      if (isFilteredOut)
+        continue;
+
+      if (!newParent.dataGrid && !nodesToInsert.has(newParent)) {
+        nodesToInsert.set(newParent, this._dataGrid.rootNode());
+        nodesToRefresh.push(newParent);
+      }
+      nodesToInsert.set(node, newParent);
     }
 
-    for (var i = 0; i < nodesToInsert.length; ++i) {
-      var node = nodesToInsert[i];
+    for (var node of nodesToInsert.keys()) {
+      var parent = nodesToInsert.get(node);
       var request = node.request();
-      node[Network.NetworkLogView._isMatchingSearchQuerySymbol] = this._matchRequest(request);
-      var parent = this._parentNodeForInsert(node);
+      if (request)
+        node[Network.NetworkLogView._isMatchingSearchQuerySymbol] = this._matchRequest(request);
       parent.appendChild(node);
     }
 
     for (var node of nodesToRefresh)
       node.refresh();
 
     this._highlightNthMatchedRequestForSearch(
         this._updateMatchCountAndFindMatchIndex(this._currentMatchedRequestNode), false);
 
     this._staleRequestIds = {};
     this._updateSummaryBar();
 
     this._columns.dataChanged();
   }
 
   /**
    * @param {!Network.NetworkRequestNode} node
    * @return {!Network.NetworkNode}
    */
   _parentNodeForInsert(node) {
     if (!Runtime.experiments.isEnabled('networkGroupingRequests'))
       return /** @type {!Network.NetworkNode} */ (this._dataGrid.rootNode());
 
     var request = node.request();
     // TODO(allada) Make this dynamic and allow multiple grouping types.
-    var groupKey = request.domain;
+    var groupKey = request.connectionId;
     var group = this._nodeGroups.get(groupKey);
     if (group)
       return group;
-    group = new Network.NetworkGroupNode(this, groupKey);
+    group = new Network.NetworkGroupNode(this, request.url().asParsedURL().host + ' - ' + groupKey);

[dgozman, 2017/01/20 00:22:40]

asParsedURL() can return null.

     this._nodeGroups.set(groupKey, group);
-    this._dataGrid.rootNode().appendChild(group);
     return group;
   }
 
   reset() {
     this._requestWithHighlightedInitiators = null;
     this.dispatchEventToListeners(Network.NetworkLogView.Events.RequestSelected, null);
 
     this._clearSearchMatchedList();
 
     this._setHoveredNode(null);
@@ skipping 868 matching lines @@
   Running: 'running',
   FromCache: 'from-cache'
 };
 
 /** @type {!Array<string>} */
 Network.NetworkLogView._searchKeys =
     Object.keys(Network.NetworkLogView.FilterType).map(key => Network.NetworkLogView.FilterType[key]);
 
 /** @typedef {function(!SDK.NetworkRequest): boolean} */
 Network.NetworkLogView.Filter;