DevTools: group by frame, not product in the network panel.

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

Index: third_party/WebKit/Source/devtools/front_end/network/NetworkLogViewColumns.js
diff --git a/third_party/WebKit/Source/devtools/front_end/network/NetworkLogViewColumns.js b/third_party/WebKit/Source/devtools/front_end/network/NetworkLogViewColumns.js
index d1fab849ab28dfbf7166d9dfe1003d1171dd5802..b7cf34c2cd1069e2951ba6a2df029974ac6cfeeb 100644
--- a/third_party/WebKit/Source/devtools/front_end/network/NetworkLogViewColumns.js
+++ b/third_party/WebKit/Source/devtools/front_end/network/NetworkLogViewColumns.js
@@ -32,9 +32,6 @@ Network.NetworkLogViewColumns = class {
     this._waterfallRequestsAreStale = false;
     this._waterfallScrollerWidthIsStale = true;
 
-    /** @type {?ProductRegistry.Registry} */
-    this._productRegistryInstance = null;
-
     /** @type {!Components.Linkifier} */
     this._popupLinkifier = new Components.Linkifier();
 
@@ -79,14 +76,6 @@ Network.NetworkLogViewColumns = class {
   _setupDataGrid() {
     var defaultColumns = Network.NetworkLogViewColumns._defaultColumns;
 
-    if (Runtime.experiments.isEnabled('networkGroupingRequests')) {
-      defaultColumns.splice(1, 0, /** @type {!Network.NetworkLogViewColumns.Descriptor} */ ({
-                              id: 'product',
-                              title: Common.UIString('Product'),
-                              visible: true
-                            }));
-    }
-
     var defaultColumnConfig = Network.NetworkLogViewColumns._defaultColumnConfig;
 
     this._columns = /** @type {!Array<!Network.NetworkLogViewColumns.Descriptor>} */ ([]);
@@ -288,17 +277,6 @@ Network.NetworkLogViewColumns = class {
       this._dataGrid.sortNodes(sortFunction, !this._dataGrid.isSortOrderAscending());
       this._networkLogView.dataGridSorted();
       return;
-    } else if (columnId === 'product' && !this._productRegistryInstance) {
-      ProductRegistry.instance().then(productRegistry => {
-        this._productRegistryInstance = productRegistry;
-        var columnConfig = this._columns.find(columnConfig => columnConfig.id === columnId);
-        if (!columnConfig)
-          return;
-        columnConfig.sortingFunction = Network.NetworkRequestNode.ProductComparator.bind(null, productRegistry);
-        if (this._dataGrid.sortColumnId() === 'product')
-          this._sortHandler();
-      });
-      return;
     }
     this._waterfallColumnSortIcon.setIconType('');
 
@@ -373,7 +351,7 @@ Network.NetworkLogViewColumns = class {
       var setting = savedSettings[columnId];
       var columnConfig = this._columns.find(columnConfig => columnConfig.id === columnId);
       if (!columnConfig)
-        columnConfig = this._addCustomHeader(setting.title, columnId);

[allada, 2017/05/11 23:58:36]

This should still be needed.

[pfeldman, 2017/05/12 23:16:20]

What does it do? I noticed that it only breaks things, never fixes anything.

+        continue;
       if (columnConfig.hideable && typeof setting.visible === 'boolean')
         columnConfig.visible = !!setting.visible;
       if (typeof setting.title === 'string')
@@ -554,16 +532,12 @@ Network.NetworkLogViewColumns = class {
     if (!hoveredNode)
       return null;
 
-    var anchor = event.target.enclosingNodeOrSelfWithClass('product-column');
-    if (anchor) {
-      return {
-        box: anchor.boxInWindow(),
-        show: hoveredNode.handleProductPopover.bind(hoveredNode),
-        hide: this._popupLinkifier.reset.bind(this._popupLinkifier)
-      };
+    if (hoveredNode instanceof Network.FrameGroupNode) {

[allada, 2017/05/11 23:58:36]

Lets only have the popover for the name column.

[allada, 2017/05/11 23:58:36]

Also, can we add a TODO to not use instanceof and instead expose a better api
for this?

[pfeldman, 2017/05/12 23:16:20]

I'll have a new patch for the rest...

+      var frameNode = /** @type {!Network.FrameGroupNode} */ (hoveredNode);
+      return {box: event.target.boxInWindow(), show: frameNode.handleProductPopover.bind(frameNode)};
     }
 
-    anchor = event.target.enclosingNodeOrSelfWithClass('network-script-initiated');
+    var anchor = event.target.enclosingNodeOrSelfWithClass('network-script-initiated');
     if (!anchor)
       return null;
     var request = hoveredNode.request();
@@ -629,8 +603,6 @@ Network.NetworkLogViewColumns = class {
 };
 
 Network.NetworkLogViewColumns._initialSortColumn = 'waterfall';
-/** @type {?ProductRegistry.Registry} */
-Network.NetworkRequestNode._productRegistryInstance = null;
 
 /**
  * @typedef {{