Coverage: convert coverage ranges to disjoint segments before further processing

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

 // Copyright (c) 2016 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.CoverageView = class extends UI.VBox {
   constructor() {
     super(true);
 
     /** @type {?Coverage.CoverageModel} */
     this._model = null;
@@ skipping 95 matching lines @@
    */
   static async _updateGutter(coverageInfo) {
     var uiSourceCode = Workspace.workspace.uiSourceCodeForURL(coverageInfo.contentProvider.contentURL());
     if (!uiSourceCode)
       return;
     // FIXME: gutter should be set in terms of offsets and therefore should not require contents.
     var contents = await coverageInfo.contentProvider.requestContent();
     if (!contents)
       return;
     var text = new Common.Text(contents);
-    for (var range of coverageInfo.ranges) {
-      var startPosition = text.positionFromOffset(range.startOffset);
-      var endPosition = text.positionFromOffset(range.endOffset);
+    var lastOffset = 0;
+    var rangesByDepth = [];
+    for (var segment of coverageInfo.segments) {
+      if (typeof segment.count !== 'number') {
+        lastOffset = segment.end;
+        continue;
+      }
+      var startPosition = text.positionFromOffset(lastOffset);
+      var endPosition = text.positionFromOffset(segment.end);
       if (!startPosition.lineNumber)
         startPosition.columnNumber += coverageInfo.columnOffset;
       startPosition.lineNumber += coverageInfo.lineOffset;
       if (!endPosition.lineNumber)
         endPosition.columnNumber += coverageInfo.columnOffset;
       endPosition.lineNumber += coverageInfo.lineOffset;
 
-      var textRange = new Common.TextRange(
-          startPosition.lineNumber, startPosition.columnNumber, endPosition.lineNumber, endPosition.columnNumber);
-      uiSourceCode.addDecoration(textRange, Coverage.CoverageView.LineDecorator.type, range.count);
+      var ranges = rangesByDepth[segment.depth - 1];  // depth === 0 => count === undefined

[alph, 2017/03/10 02:05:09]

can you store depth-1 in segments?

+      if (!ranges) {
+        ranges = [];
+        rangesByDepth[segment.depth - 1] = ranges;
+      }
+      ranges.push({
+        count: segment.count,
+        range: new Common.TextRange(
+            startPosition.lineNumber, startPosition.columnNumber, endPosition.lineNumber, endPosition.columnNumber)
+      });
+      lastOffset = segment.end;
+    }
+    for (var ranges of rangesByDepth) {

[alph, 2017/03/10 02:05:09]

I didn't get why you need to iterate in the depth order?

+      for (var r of ranges)
+        uiSourceCode.addDecoration(r.range, Coverage.CoverageView.LineDecorator.type, r.count);
     }
   }
 };
 
 /**
  * @implements {SourceFrame.UISourceCodeFrame.LineDecorator}
  */
 Coverage.CoverageView.LineDecorator = class {
   /**
    * @override
@@ skipping 38 matching lines @@
    */
   handleAction(context, actionId) {
     var coverageViewId = 'coverage';
     UI.viewManager.showView(coverageViewId)
         .then(() => UI.viewManager.view(coverageViewId).widget())
         .then(widget => /** @type !Coverage.CoverageView} */ (widget)._toggleRecording());
 
     return true;
   }
 };