squash 'resources/unpacked/devtools' changes from 61e53c7..ea1001a

ea1001a [DevTools] Support broken UMA metric from M49 frontend.
e42e78a Revert of [DevTools] Added keyboard search while in sources (patchset #7 id:120001 of https://codereview.chromium.org/1831903002/ )
b3fb203 DevTools: teach SourceMapNamesResolver to resolve "this" object
c0fed8a Revert of DevTools: extract CPU profile independent part of CPUProfileNode. (patchset #3 id:40001 of https://codereview.chromium.org/1873973002/ )
decf4d4 DevTools: improve identifier extraction in SourceMapNamesResolver
e2ca0ad Rename Heap to ThreadHeap
8228bda Revert of Rename Heap to ThreadHeap (patchset #13 id:240001 of https://codereview.chromium.org/1845543002/ )
2a81c34 DevTools: extract CPU profile independent part of CPUProfileNode.
53d311c Rename Heap to ThreadHeap
b095eff [DevTools] Fix autocomplete for iframe in top context
81abc28 DevTools: add -webkit-user-select and -webkit-user-modify completions
93a9291 DevTools: cleanup occurences of selection.getRangeAt to avoid NPE
bb4305f [DevTools] Fix console history for evaluated object literals
18c6c34 [DevTools] Fix condition in ElementsTreeElement.js
4264bde DevTools: workaround bug in Blink selection API
81e05cb DevTools: deprecate InspectorTest.runAfterPendingDispatches
2dda9ca [DevTools] Added keyboard search while in sources

git-subtree-dir: resources/unpacked/devtools
git-subtree-split: ea1001a

Author: darwin

front_end/Tests.js

@@ -578,7 +578,7 @@ TestSuite.prototype.testPauseInSharedWorkerInitialization1 = function()
     function callback()
     {
         var target = WebInspector.targetManager.targetsWithJSContext()[0];
-        target._connection.runAfterPendingDispatches(this.releaseControl.bind(this));
+        target._connection.deprecatedRunAfterPendingDispatches(this.releaseControl.bind(this));
     }
 };
 

front_end/common/Text.js

@@ -128,6 +128,16 @@ WebInspector.TextCursor.prototype = {
         return this._offset;
     },
 
+    /**
+     * @param {number} offset
+     */
+    resetTo: function(offset)
+    {
+        this._offset = offset;
+        this._lineNumber = this._lineEndings.lowerBound(offset);
+        this._columnNumber = this._lineNumber ? this._offset - this._lineEndings[this._lineNumber - 1] - 1 : this._offset;
+    },
+
     /**
      * @return {number}
      */

front_end/devtools.js

@@ -525,6 +525,9 @@ InspectorFrontendHostImpl.prototype = {
      */
     recordEnumeratedHistogram: function(actionName, actionCode, bucketSize)
     {
+        // Support for M49 frontend.
+        if (actionName === "DevTools.DrawerShown")
+            return;
         DevToolsAPI.sendMessageToEmbedder("recordEnumeratedHistogram", [actionName, actionCode, bucketSize], null);
     },
 

front_end/elements/ElementsTreeElement.js

@@ -1281,7 +1281,7 @@ WebInspector.ElementsTreeElement.prototype = {
             return anchor;
         }
 
-        if (node && name === "src" || name === "href") {
+        if (node && (name === "src" || name === "href")) {
             attrValueElement.appendChild(linkifyValue.call(this, value));
         } else if (node && node.nodeName().toLowerCase() === "img" && name === "srcset") {
             var sources = value.split(",");

front_end/es_tree/ESTreeWalker.js

@@ -5,14 +5,16 @@
 /**
  * @constructor
  * @param {function(!ESTree.Node)} beforeVisit
- * @param {function(!ESTree.Node)} afterVisit
+ * @param {function(!ESTree.Node)=} afterVisit
  */
 WebInspector.ESTreeWalker = function(beforeVisit, afterVisit)
 {
     this._beforeVisit = beforeVisit;
-    this._afterVisit = afterVisit;
+    this._afterVisit = afterVisit || new Function();
 }
 
+WebInspector.ESTreeWalker.SkipSubtree = {};
+
 WebInspector.ESTreeWalker.prototype = {
     /**
      * @param {!ESTree.Node} ast
@@ -32,7 +34,10 @@ WebInspector.ESTreeWalker.prototype = {
             return;
         node.parent = parent;
 
-        this._beforeVisit.call(null, node);
+        if (this._beforeVisit.call(null, node) === WebInspector.ESTreeWalker.SkipSubtree) {
+            this._afterVisit.call(null, node);
+            return;
+        }
 
         var walkOrder = WebInspector.ESTreeWalker._walkOrder[node.type];
         if (!walkOrder) {

front_end/externs.js

@@ -683,6 +683,8 @@ ESTree.Node = function()
     this.name;
     /** @type {(?ESTree.Node|undefined)} */
     this.id;
+    /** @type {(number|undefined)} */
+    this.length;
 }
 
 /**

front_end/formatter_worker/FormatterWorker.js

@@ -131,49 +131,49 @@ WebInspector.evaluatableJavaScriptSubstring = function(content)
  */
 WebInspector.javaScriptIdentifiers = function(content)
 {
-    var root = acorn.parse(content, {});
+    var root = acorn.parse(content, { ranges: false, ecmaVersion: 6 });
+
     /** @type {!Array<!ESTree.Node>} */
     var identifiers = [];
-    var functionDeclarationCounter = 0;
-    var walker = new WebInspector.ESTreeWalker(beforeVisit, afterVisit);
+    var walker = new WebInspector.ESTreeWalker(beforeVisit);
 
     /**
      * @param {!ESTree.Node} node
      * @return {boolean}
      */
     function isFunction(node)
     {
-        return node.type === "FunctionDeclaration" || node.type === "FunctionExpression";
+        return node.type === "FunctionDeclaration" || node.type === "FunctionExpression" || node.type === "ArrowFunctionExpression";
     }
 
     /**
      * @param {!ESTree.Node} node
      */
     function beforeVisit(node)
     {
-        if (isFunction(node))
-            functionDeclarationCounter++;
+        if (isFunction(node)) {
+            if (node.id)
+                identifiers.push(node.id);
+            return WebInspector.ESTreeWalker.SkipSubtree;
+        }
 
-        if (functionDeclarationCounter > 1)
+        if (node.type !== "Identifier")
             return;
 
-        if (isFunction(node) && node.params)
-            identifiers.pushAll(node.params);
-
-        if (node.type === "VariableDeclarator")
-            identifiers.push(/** @type {!ESTree.Node} */(node.id));
+        if (node.parent && node.parent.type === "MemberExpression" && node.parent.property === node && !node.parent.computed)
+            return;
+        identifiers.push(node);
     }
 
-    /**
-     * @param {!ESTree.Node} node
-     */
-    function afterVisit(node)
-    {
-        if (isFunction(node))
-            functionDeclarationCounter--;
+    if (!root || root.type !== "Program" || root.body.length !== 1 || !isFunction(root.body[0])) {
+        postMessage([]);
+        return;
     }
 
-    walker.walk(root);
+    var functionNode = root.body[0];
+    for (var param of functionNode.params)
+        walker.walk(param);
+    walker.walk(functionNode.body);
     var reduced = identifiers.map(id => ({name: id.name, offset: id.start}));
     postMessage(reduced);
 }

front_end/main/Main.js

@@ -592,7 +592,7 @@ WebInspector.Main.prototype = {
             }
         }
 
-        this._mainConnection.runAfterPendingDispatches(invokeMethod);
+        this._mainConnection.deprecatedRunAfterPendingDispatches(invokeMethod);
     }
 }
 

front_end/platform/DOMExtension.js

@@ -301,7 +301,8 @@ Node.prototype.isComponentSelectionCollapsed = function()
 {
     // FIXME: crbug.com/447523, use selection.isCollapsed when it is fixed for shadow dom.
     var selection = this.getComponentSelection();
-    return selection && selection.rangeCount ? selection.getRangeAt(0).collapsed : true;
+    var range = selection && selection.rangeCount ? selection.getRangeAt(0) : null;
+    return range ? range.collapsed : true;
 }
 
 /**
@@ -348,9 +349,10 @@ Element.prototype.removeChildren = function()
 Element.prototype.isInsertionCaretInside = function()
 {
     var selection = this.getComponentSelection();
-    if (!selection.rangeCount || !selection.isCollapsed)
+    // @see crbug.com/602541
+    var selectionRange = selection && selection.rangeCount ? selection.getRangeAt(0) : null;
+    if (!selectionRange || !selection.isCollapsed)
         return false;
-    var selectionRange = selection.getRangeAt(0);
     return selectionRange.startContainer.isSelfOrDescendant(this);
 }
 

front_end/platform/utilities.js

@@ -1280,6 +1280,19 @@ Map.prototype.keysArray = function()
     return Array.from(this.keys());
 }
 
+/**
+ * @return {!Multimap<!KEY, !VALUE>}
+ */
+Map.prototype.inverse = function()
+{
+    var result = new Multimap();
+    for (var key of this.keys()) {
+        var value = this.get(key);
+        result.set(value, key);
+    }
+    return result;
+}
+
 /**
  * @constructor
  * @template K, V