DevTools: merge coverage segments from different instances of same URL

third_party/WebKit/Source/devtools/front_end/coverage/CoverageListView.js

 // Copyright (c) 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 Coverage.CoverageListView = class extends UI.VBox {
   constructor() {
     super(true);
     this.registerRequiredCSS('coverage/coverageListView.css');
     var columns = [
       {id: 'url', title: Common.UIString('URL'), width: '300px', fixedWidth: false, sortable: true},
@@ skipping 21 matching lines @@
     this._dataGrid.element.classList.add('flex-auto');
     this._dataGrid.element.addEventListener('dblclick', this._onDoubleClick.bind(this), false);
     this._dataGrid.element.addEventListener('keydown', this._onKeyDown.bind(this), false);
     this._dataGrid.addEventListener(DataGrid.DataGrid.Events.SortingChanged, this._sortingChanged, this);
 
     var dataGridWidget = this._dataGrid.asWidget();
     dataGridWidget.show(this.contentElement);
   }
 
   /**
-   * @param {!Array<!Coverage.CoverageInfo>} coverageInfo
+   * @param {!Array<!Coverage.URLCoverageInfo>} coverageInfo
    */
   update(coverageInfo) {
-    var maxSize = coverageInfo.reduce((acc, entry) => Math.max(acc, entry.size), 0);
+    var maxSize = coverageInfo.reduce((acc, entry) => Math.max(acc, entry.size()), 0);
     var rootNode = this._dataGrid.rootNode();
     rootNode.removeChildren();
     for (var entry of coverageInfo)
       rootNode.appendChild(new Coverage.CoverageListView.GridNode(entry, maxSize));
     this._sortingChanged();
   }
 
   /**
    * @param {!Event} event
    */
@@ skipping 14 matching lines @@
     this._revealSourceForNode(this._dataGrid.selectedNode);
   }
 
   /**
    * @param {?DataGrid.DataGridNode} node
    */
   _revealSourceForNode(node) {
     if (!node)
       return;
     var coverageInfo = /** @type {!Coverage.CoverageListView.GridNode} */ (node)._coverageInfo;
-    var url = coverageInfo.contentProvider.contentURL();
-    var sourceCode = Workspace.workspace.uiSourceCodeForURL(url);
+    var sourceCode = Workspace.workspace.uiSourceCodeForURL(coverageInfo.url());
     if (!sourceCode)
       return;
     Common.Revealer.reveal(sourceCode);
   }
 
   _sortingChanged() {
     var columnId = this._dataGrid.sortColumnId();
     if (!columnId)
       return;
     var sortFunction;
@@ skipping 32 matching lines @@
     /**
      * @param {string} fieldName
      * @param {!DataGrid.DataGridNode} a
      * @param {!DataGrid.DataGridNode} b
      * @return {number}
      */
     function compareNumericField(fieldName, a, b) {
       var nodeA = /** @type {!Coverage.CoverageListView.GridNode} */ (a);
       var nodeB = /** @type {!Coverage.CoverageListView.GridNode} */ (b);
 
-      return nodeA._coverageInfo[fieldName] - nodeB._coverageInfo[fieldName];
+      return nodeA._coverageInfo[fieldName]() - nodeB._coverageInfo[fieldName]();
     }
   }
 
   /**
    * @param {!Coverage.CoverageType} type
    */
   static _typeToString(type) {
     var types = [];
     if (type & Coverage.CoverageType.CSS)
       types.push(Common.UIString('CSS'));
     if (type & Coverage.CoverageType.JavaScript)
       types.push(Common.UIString('JS'));
     return types.join('+');
   }
 };
 
 Coverage.CoverageListView.GridNode = class extends DataGrid.SortableDataGridNode {
   /**
-   * @param {!Coverage.CoverageInfo} coverageInfo
+   * @param {!Coverage.URLCoverageInfo} coverageInfo
    * @param {number} maxSize
    */
   constructor(coverageInfo, maxSize) {
     super();
     this._coverageInfo = coverageInfo;
-    this._url = coverageInfo.contentProvider.contentURL();
+    this._url = coverageInfo.url();
     this._displayURL = new Common.ParsedURL(this._url).displayName;
     this._maxSize = maxSize;
   }
 
   /**
    * @override
    * @param {string} columnId
    * @return {!Element}
    */
   createCell(columnId) {
     var cell = this.createTD(columnId);
     switch (columnId) {
       case 'url':
         cell.title = this._url;
         var outer = cell.createChild('div', 'url-outer');
         var prefix = outer.createChild('div', 'url-prefix');
         var suffix = outer.createChild('div', 'url-suffix');
         var splitURL = /^(.*)(\/[^/]*)$/.exec(this._url);
         prefix.textContent = splitURL ? splitURL[1] : this._url;
         suffix.textContent = splitURL ? splitURL[2] : '';
         break;
       case 'type':
-        cell.textContent = Coverage.CoverageListView._typeToString(this._coverageInfo.type);
+        cell.textContent = Coverage.CoverageListView._typeToString(this._coverageInfo.type());
         break;
       case 'size':
         cell.classList.add('numeric-column');
-        cell.textContent = Number.withThousandsSeparator(this._coverageInfo.size || 0);
+        cell.textContent = Number.withThousandsSeparator(this._coverageInfo.size() || 0);
         break;
       case 'unusedSize':
         cell.classList.add('numeric-column');
-        cell.textContent = Number.withThousandsSeparator(this._coverageInfo.unusedSize || 0);
-        if (this._coverageInfo.size)
-          cell.title = Math.round(100 * this._coverageInfo.unusedSize / this._coverageInfo.size) + '%';
+        cell.textContent = Number.withThousandsSeparator(this._coverageInfo.unusedSize() || 0);
+        if (this._coverageInfo.size())
+          cell.title = Math.round(100 * this._coverageInfo.unusedSize() / this._coverageInfo.size()) + '%';
         break;
       case 'bars':
         var barContainer = cell.createChild('div', 'bar-container');
         var unusedSizeBar = barContainer.createChild('div', 'bar bar-unused-size');
-        unusedSizeBar.style.width = Math.ceil(100 * this._coverageInfo.unusedSize / this._maxSize) + '%';
+        unusedSizeBar.style.width = Math.ceil(100 * this._coverageInfo.unusedSize() / this._maxSize) + '%';
         var usedSizeBar = barContainer.createChild('div', 'bar bar-used-size');
-        usedSizeBar.style.width = Math.ceil(100 * this._coverageInfo.usedSize / this._maxSize) + '%';
+        usedSizeBar.style.width = Math.ceil(100 * this._coverageInfo.usedSize() / this._maxSize) + '%';
         var sizeBar = barContainer.createChild('div', 'bar bar-slack-size');
-        var slackSize = this._coverageInfo.size - this._coverageInfo.unusedSize - this._coverageInfo.usedSize;
+        var slackSize = this._coverageInfo.size() - this._coverageInfo.unusedSize() - this._coverageInfo.usedSize();
         sizeBar.style.width = Math.ceil(100 * slackSize / this._maxSize) + '%';
     }
     return cell;
   }
 };