[Devtools] Lazily build reverse mappings

third_party/WebKit/Source/devtools/front_end/sdk/SourceMap.js

Index: third_party/WebKit/Source/devtools/front_end/sdk/SourceMap.js
diff --git a/third_party/WebKit/Source/devtools/front_end/sdk/SourceMap.js b/third_party/WebKit/Source/devtools/front_end/sdk/SourceMap.js
index 58c6def49e424619adb62bfab9bcaacf1a62423e..ad920b2d2d6be50420d4feda154266721e206c80 100644
--- a/third_party/WebKit/Source/devtools/front_end/sdk/SourceMap.js
+++ b/third_party/WebKit/Source/devtools/front_end/sdk/SourceMap.js
@@ -80,6 +80,16 @@ WebInspector.SourceMapEntry = function(lineNumber, columnNumber, sourceURL, sour
 }
 
 /**
+ * @constructor
+ * @param {?string} content
+ * @param {?Array<!WebInspector.SourceMapEntry>} reverseMappings
+ */
+WebInspector.SourceURLInfo = function(content, reverseMappings) {

[lushnikov, 2016/09/29 16:29:52]

WebInspector.SourceMap.SourceInfo?

[eostroukhov, 2016/09/30 19:14:41]

Done, made it TextSourceMap implementation detail.

+    this.content = content;
+    this.reverseMappings = reverseMappings;
+}
+
+/**
  * @interface
  */
 WebInspector.SourceMap = function() { }
@@ -172,13 +182,14 @@ WebInspector.TextSourceMap = function(compiledURL, sourceMappingURL, payload)
             WebInspector.TextSourceMap.prototype._base64Map[base64Digits.charAt(i)] = i;
     }
 
+    this._json = payload;
     this._compiledURL = compiledURL;
     this._sourceMappingURL = sourceMappingURL;
-    this._reverseMappingsBySourceURL = new Map();
-    this._mappings = [];
-    this._sources = {};
-    this._sourceContentByURL = {};
-    this._parseMappingPayload(payload);
+    /** @type {?Array<!WebInspector.SourceMapEntry>} */
+    this._mappings = null;
+    /** @type {!Map<string, !WebInspector.SourceURLInfo>} */
+    this._sourceURLInfos = new Map();
+    this._eachSection(this._parseSources.bind(this));
 }
 
 /**
@@ -211,7 +222,6 @@ WebInspector.TextSourceMap.load = function(sourceMapURL, compiledURL)
         try {
             var payload = /** @type {!SourceMapV3} */ (JSON.parse(content));
             var baseURL = sourceMapURL.startsWith("data:") ? compiledURL : sourceMapURL;
-
             callback(new WebInspector.TextSourceMap(compiledURL, baseURL, payload));
         } catch (e) {
             console.error(e);
@@ -246,7 +256,7 @@ WebInspector.TextSourceMap.prototype = {
      */
     sourceURLs: function()
     {
-        return Object.keys(this._sources);
+        return this._sourceURLInfos.keysArray();
     },
 
     /**
@@ -257,9 +267,9 @@ WebInspector.TextSourceMap.prototype = {
      */
     sourceContentProvider: function(sourceURL, contentType)
     {
-        var sourceContent = this._sourceContentByURL[sourceURL];
-        if (sourceContent)
-            return WebInspector.StaticContentProvider.fromString(sourceURL, contentType, sourceContent);
+        var info = this._sourceURLInfos.get(sourceURL);
+        if (info.content)
+            return WebInspector.StaticContentProvider.fromString(sourceURL, contentType, info.content);
         return new WebInspector.CompilerSourceMappingContentProvider(sourceURL, contentType);
     },
 
@@ -284,28 +294,6 @@ WebInspector.TextSourceMap.prototype = {
     },
 
     /**
-     * @param {!SourceMapV3} mappingPayload
-     */
-    _parseMappingPayload: function(mappingPayload)
-    {
-        if (mappingPayload.sections)
-            this._parseSections(mappingPayload.sections);
-        else
-            this._parseMap(mappingPayload, 0, 0);
-    },
-
-    /**
-     * @param {!Array.<!SourceMapV3.Section>} sections
-     */
-    _parseSections: function(sections)
-    {
-        for (var i = 0; i < sections.length; ++i) {
-            var section = sections[i];
-            this._parseMap(section.map, section.offset.line, section.offset.column);
-        }
-    },
-
-    /**
      * @override
      * @param {number} lineNumber in compiled resource
      * @param {number} columnNumber in compiled resource
@@ -314,11 +302,12 @@ WebInspector.TextSourceMap.prototype = {
     findEntry: function(lineNumber, columnNumber)
     {
         var first = 0;
-        var count = this._mappings.length;
+        var mappings = this.mappings();
+        var count = mappings.length;
         while (count > 1) {
             var step = count >> 1;
             var middle = first + step;
-            var mapping = this._mappings[middle];
+            var mapping = mappings[middle];
             if (lineNumber < mapping.lineNumber || (lineNumber === mapping.lineNumber && columnNumber < mapping.columnNumber)) {
                 count = step;
             } else {
@@ -326,7 +315,7 @@ WebInspector.TextSourceMap.prototype = {
                 count -= step;
             }
         }
-        var entry = this._mappings[first];
+        var entry = mappings[first];
         if (!first && entry && (lineNumber < entry.lineNumber || (lineNumber === entry.lineNumber && columnNumber < entry.columnNumber)))
             return null;
         return entry;
@@ -361,7 +350,12 @@ WebInspector.TextSourceMap.prototype = {
      */
     mappings: function()
     {
-        return this._mappings;
+        if (this._mappings === null) {
+            this._mappings = [];
+            this._eachSection(this._parseMap.bind(this));
+            this._json = null;
+        }
+        return /** @type {!Array<!WebInspector.SourceMapEntry>} */ (this._mappings);
     },
 
     /**
@@ -370,14 +364,13 @@ WebInspector.TextSourceMap.prototype = {
      */
     _reversedMappings: function(sourceURL)
     {
-        var mappings = this._reverseMappingsBySourceURL.get(sourceURL);
-        if (!mappings)
+        if (this._sourceURLInfos && !this._sourceURLInfos.has(sourceURL))

[lushnikov, 2016/09/29 16:29:52]

how could this._sourceURLInfos be null?

[eostroukhov, 2016/09/30 19:14:41]

It can't. Thanks for pointing out.

             return [];
-        if (!mappings._sorted) {
-            mappings.sort(sourceMappingComparator);
-            mappings._sorted = true;
-        }
-        return mappings;
+        var mappings = this.mappings();
+        var info = this._sourceURLInfos.get(sourceURL);
+        if (info.reverseMappings === null)
+            info.reverseMappings = mappings.filter((mapping) => mapping.sourceURL === sourceURL).sort(sourceMappingComparator);
+        return info.reverseMappings;
 
         /**
          * @param {!WebInspector.SourceMapEntry} a
@@ -399,6 +392,44 @@ WebInspector.TextSourceMap.prototype = {
     },
 
     /**
+     * @param {function(!SourceMapV3, number, number)} callback
+     */
+    _eachSection: function(callback) {
+        if (!this._json.sections) {
+            callback(this._json, 0, 0);
+            return;
+        }
+        for (var section of this._json.sections)
+            callback(section.map, section.offset.line, section.offset.column);
+    },
+
+    /**
+     * @param {!SourceMapV3} sourceMap
+     * @param {function(string, ?string)} callback
+     */
+    _visitSourceURLs: function(sourceMap, callback) {
+        var sourceRoot = sourceMap.sourceRoot || "";
+        if (sourceRoot && !sourceRoot.endsWith("/"))
+            sourceRoot += "/";
+        for (var i = 0; i < sourceMap.sources.length; ++i) {
+            var href = sourceRoot + sourceMap.sources[i];
+            var url = WebInspector.ParsedURL.completeURL(this._sourceMappingURL, href) || href;
+            var source = sourceMap.sourcesContent && sourceMap.sourcesContent[i];
+            if (url === this._compiledURL && source)
+                url += WebInspector.UIString(" [sm]");
+            callback(url, source);
+        }
+    },
+
+    /**
+     * @param {!SourceMapV3} sourceMap
+     */
+    _parseSources: function(sourceMap) {

[lushnikov, 2016/09/29 16:29:53]

yeah, callback is unfortunate

Let's do the following:

_parseSources: function(sourceMap)
{
    var sources = getSourcesForSourceMap(sourceMap);
    this._sourceURLInfos.addAll(sources);
    sourceMap[sourcesSymbol] = sources;
}

and later, in the _parseMap, we can just get sources for the SourceMap:

   ...
   var sources = sourceMap[sourcesSymbol];
   ...

[eostroukhov, 2016/09/30 19:14:41]

Done.

+        this._visitSourceURLs(sourceMap,
+            (url, source) => this._sourceURLInfos.set(url, new WebInspector.SourceURLInfo(source, null)));
+    },
+
+    /**
      * @param {!SourceMapV3} map
      * @param {number} lineNumber
      * @param {number} columnNumber
@@ -409,26 +440,10 @@ WebInspector.TextSourceMap.prototype = {
         var sourceLineNumber = 0;
         var sourceColumnNumber = 0;
         var nameIndex = 0;
-
         var sources = [];
         var names = map.names || [];
-        var sourceRoot = map.sourceRoot || "";
-        if (sourceRoot && !sourceRoot.endsWith("/"))
-            sourceRoot += "/";
-        for (var i = 0; i < map.sources.length; ++i) {
-            var href = sourceRoot + map.sources[i];
-            var url = WebInspector.ParsedURL.completeURL(this._sourceMappingURL, href) || href;
-            var hasSource = map.sourcesContent && map.sourcesContent[i];
-            if (url === this._compiledURL && hasSource)
-                url += WebInspector.UIString(" [sm]");
-            sources.push(url);
-            this._sources[url] = true;
-
-            if (hasSource)
-                this._sourceContentByURL[url] = map.sourcesContent[i];
-        }
-
         var stringCharIterator = new WebInspector.TextSourceMap.StringCharIterator(map.mappings);
+        this._visitSourceURLs(map, (url) => sources.push(url));
         var sourceURL = sources[sourceIndex];
 
         while (true) {
@@ -466,17 +481,6 @@ WebInspector.TextSourceMap.prototype = {
             nameIndex += this._decodeVLQ(stringCharIterator);
             this._mappings.push(new WebInspector.SourceMapEntry(lineNumber, columnNumber, sourceURL, sourceLineNumber, sourceColumnNumber, names[nameIndex]));
         }
-
-        for (var i = 0; i < this._mappings.length; ++i) {
-            var mapping = this._mappings[i];
-            var url = mapping.sourceURL;
-            if (!url)
-                continue;
-            if (!this._reverseMappingsBySourceURL.has(url))
-                this._reverseMappingsBySourceURL.set(url, []);
-            var reverseMappings = this._reverseMappingsBySourceURL.get(url);
-            reverseMappings.push(mapping);
-        }
     },
 
     /**