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

third_party/WebKit/Source/devtools/front_end/network/NetworkDataGridNode.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 31 matching lines @@
     this._isProduct = false;
     this._showingInitiatorChain = false;
     /** @type {?SDK.NetworkRequest} */
     this._requestOrFirstKnownChildRequest = null;
   }
 
   /**
    * @param {!Network.NetworkNode._ProductEntryInfo} entryInfo
    */
   static buildReportLinkElement(entryInfo) {
-    var shadowRoot = UI.createShadowRootWithCoreStyles(createElement('div'), 'network/networkReportProductEntry.css');
+    var element = createElement('div');
+    var shadowRoot = UI.createShadowRootWithCoreStyles(element, 'network/networkReportProductEntry.css');
     var content = shadowRoot.createChild('div', 'network-product-popover');
 
     var domainElement = content.createChild('div', 'network-product-domain');
     domainElement.textContent = entryInfo.matchedURL.domain();
 
     var entryNameElement = content.createChild('div', 'network-product-entry-name');
     entryNameElement.textContent = entryInfo.entry.name;
 
     var matchedURL = entryInfo.matchedURL;
     var reportLink =
         'https://docs.google.com/forms/d/e/1FAIpQLSchz2FdcQ-rRllzl8BbhWaTRRY-12BpPjW6Hr9e1-BpCA083w/viewform' +
         '?entry_1425918171=' + encodeURIComponent((matchedURL.domain() + matchedURL.path).substr(0, 100));
     content.appendChild(UI.createExternalLink(reportLink, 'Report mismatch', 'network-report-product-link'));
-    return shadowRoot;
+    return element;
   }
 
   /**
    * @return {!Network.NetworkNode._SupportedBackgroundColors}
    */
   static _themedBackgroundColors() {
     if (Network.NetworkNode._themedBackgroundColorsCache)
       return Network.NetworkNode._themedBackgroundColorsCache;
     var themedColors = {};
     for (var name in Network.NetworkNode._backgroundColors) {
@@ skipping 21 matching lines @@
       parsedURL = new Common.ParsedURL(callFrame.url);
       entry = productRegistry.entryForUrl(parsedURL);
       return !!entry;
     });
     if (!entry)
       return null;
     return {entry: entry, matchedURL: parsedURL};
   }
 
   /**
-   * @protected
-   * @return {!Promise<?Network.NetworkNode._ProductEntryInfo>}
-   */
-  productEntry() {
-    return Promise.resolve(/** @type {?Network.NetworkNode._ProductEntryInfo} */ (null));
-  }
-
-  /**
-   * @param {!UI.PopoverRequest} popover
-   * @return {!Promise<boolean>}
-   */
-  handleProductPopover(popover) {
-    return this.productEntry().then(entryInfo => {
-      if (!entryInfo)
-        return false;
-      popover.setAnchorBehavior(UI.GlassPane.AnchorBehavior.PreferBottom);
-      popover.contentElement.appendChild(Network.NetworkNode.buildReportLinkElement(entryInfo));
-      return true;
-    });
-  }
-
-  /**
    * @return {string}
    */
   displayName() {
     return '';
   }
 
   /**
    * @return {boolean}
    */
   isFromFrame() {
@@ skipping 22 matching lines @@
   /**
    * @return {string}
    */
   backgroundColor() {
     var bgColors = Network.NetworkNode._themedBackgroundColors();
     var color = this.isStriped() ? bgColors.Stripe : bgColors.Default;
     if (this.isNavigationRequest())
       color = color.blendWith(bgColors.Navigation);
     if (this.hovered())
       color = color.blendWith(bgColors.Hovered);
-    if (this.isFromFrame())
-      color = color.blendWith(bgColors.FromFrame);
-    else if (this._isProduct)
-      color = color.blendWith(bgColors.IsProduct);
     if (this.isOnInitiatorPath())
       color = color.blendWith(bgColors.InitiatorPath);
     if (this.isOnInitiatedPath())
       color = color.blendWith(bgColors.InitiatedPath);
     if (this.selected)
       color = color.blendWith(bgColors.Selected);
 
     return /** @type {string} */ (color.asString(Common.Color.Format.HEX));
   }
 
   _updateBackgroundColor() {
     var element = this.existingElement();
     if (!element)
       return;
+
+    element.classList.toggle('network-row-from-frame', this.isFromFrame());
+    element.classList.toggle('network-row-with-product', !this.isFromFrame() && this._isProduct);
     element.style.backgroundColor = this.backgroundColor();
     this._parentView.stylesChanged();
   }
 
   /**
    * @override
    * @param {boolean} isStriped
    */
   setStriped(isStriped) {
     super.setStriped(isStriped);
@@ skipping 601 matching lines @@
   /**
    * @override
    * @param {!Element} cell
    * @param {string} columnId
    */
   renderCell(cell, columnId) {
     switch (columnId) {
       case 'name':
         this._renderNameCell(cell);
         break;
-      case 'product':
-        if (!Runtime.experiments.isEnabled('networkGroupingRequests')) {
-          this._setTextAndTitle(cell, this._request.responseHeaderValue(columnId) || '');
-          break;
-        }
-        this.productEntry().then(entryInfo => {
-          if (entryInfo)
-            cell.textContent = entryInfo.entry.name;
-        });
-        break;
       case 'method':
         this._setTextAndTitle(cell, this._request.requestMethod);
         break;
       case 'status':
         this._renderStatusCell(cell);
         break;
       case 'protocol':
         this._setTextAndTitle(cell, this._request.protocol);
         break;
       case 'scheme':
@@ skipping 126 matching lines @@
     }
     iconElement.classList.add(this._request.resourceType().name());
 
     cell.appendChild(iconElement);
     cell.createTextChild(this._request.networkManager().target().decorateLabel(this._request.name()));
     this._appendSubtitle(cell, this._request.path());
     cell.title = this._request.url();
   }
 
   /**
-   * @override
-   * @return {!Promise<?Network.NetworkNode._ProductEntryInfo>}
-   */
-  productEntry() {
-    return ProductRegistry.instance().then(productRegistry => {
-      var frame = SDK.ResourceTreeModel.frameForRequest(this._request);
-      var entry = /** @type {?ProductRegistry.Registry.ProductEntry} */ (null);
-      if (frame && frame.isMainFrame())
-        frame = null;
-      var entryInfo = frame ? Network.NetworkNode.productEntryInfoForFrame(productRegistry, frame) : null;
-      if (entryInfo)
-        return entryInfo;
-      entry = productRegistry.entryForUrl(this._request.parsedURL);
-      return entry ? {entry: entry, matchedURL: this._request.parsedURL} : null;
-    });
-  }
-
-  /**
    * @param {!Element} cell
    */
   _renderStatusCell(cell) {
     cell.classList.toggle(
         'network-dim-cell', !this._isFailed() && (this._request.cached() || !this._request.statusCode));
 
     if (this._request.failed && !this._request.canceled && !this._request.wasBlocked()) {
       var failText = Common.UIString('(failed)');
       if (this._request.localizedFailDescription) {
         cell.createTextChild(failText);
@@ skipping 161 matching lines @@
    * @param {boolean=} supressSelectedEvent
    */
   select(supressSelectedEvent) {
     if (this.expanded) {
       this.collapse();
       return;
     }
     this.expand();
   }
 };