Reland of DevTools: properly restore selected DOMNode in Elements panel.

third_party/WebKit/Source/devtools/front_end/elements/ElementsPanel.js

 /*
  * Copyright (C) 2007, 2008 Apple Inc.  All rights reserved.
  * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com>
  * Copyright (C) 2009 Joseph Pecoraro
  *
  * 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 305 matching lines @@
         if (WebInspector.moduleSetting("sidebarPosition").get() === "auto")
             this.element.window().requestAnimationFrame(this._updateSidebarPosition.bind(this));  // Do not force layout.
         this._updateTreeOutlineVisibleWidth();
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _selectedNodeChanged: function(event)
     {
-        var selectedNode = /** @type {?WebInspector.DOMNode} */ (event.data);
+        var selectedNode = /** @type {?WebInspector.DOMNode} */ (event.data.node);
+        var focus = /** @type {boolean} */ (event.data.focus);
         for (var i = 0; i < this._treeOutlines.length; ++i) {
             if (!selectedNode || selectedNode.domModel() !== this._treeOutlines[i].domModel())
                 this._treeOutlines[i].selectDOMNode(null);
         }
 
-        if (!selectedNode && this._lastValidSelectedNode)
-            this._selectedPathOnReset = this._lastValidSelectedNode.path();
-
         this._breadcrumbs.setSelectedNode(selectedNode);
 
         WebInspector.context.setFlavor(WebInspector.DOMNode, selectedNode);
 
         if (!selectedNode)
             return;
         selectedNode.setAsInspectedNode();
-        this._lastValidSelectedNode = selectedNode;
+        if (focus) {
+            this._selectedNodeOnReset = selectedNode;
+            this._hasNonDefaultSelectedNode = true;
+        }
 
         var executionContexts = selectedNode.target().runtimeModel.executionContexts();
         var nodeFrameId = selectedNode.frameId();
         for (var context of executionContexts) {
             if (context.frameId === nodeFrameId) {
                 WebInspector.context.setFlavor(WebInspector.ExecutionContext, context);
                 break;
             }
         }
     },
@@ skipping 22 matching lines @@
 
         var treeOutline = WebInspector.ElementsTreeOutline.forDOMModel(domModel);
         treeOutline.rootDOMNode = inspectedRootDocument;
 
         if (!inspectedRootDocument) {
             if (this.isShowing())
                 domModel.requestDocument();
             return;
         }
 
+        this._hasNonDefaultSelectedNode = false;
         WebInspector.domBreakpointsSidebarPane.restoreBreakpoints(inspectedRootDocument);
 
-        /**
-         * @this {WebInspector.ElementsPanel}
-         * @param {?WebInspector.DOMNode} candidateFocusNode
-         */
-        function selectNode(candidateFocusNode)
-        {
-            if (!candidateFocusNode)
-                candidateFocusNode = inspectedRootDocument.body || inspectedRootDocument.documentElement;
-
-            if (!candidateFocusNode)
-                return;
-
-            if (!this._pendingNodeReveal) {
-                this.selectDOMNode(candidateFocusNode);
-                if (treeOutline.selectedTreeElement)
-                    treeOutline.selectedTreeElement.expand();
-            }
-        }
-
-        /**
-         * @param {?DOMAgent.NodeId} nodeId
-         * @this {WebInspector.ElementsPanel}
-         */
-        function selectLastSelectedNode(nodeId)
-        {
-            if (this.selectedDOMNode()) {
-                // Focused node has been explicitly set while reaching out for the last selected node.
-                return;
-            }
-            var node = nodeId ? domModel.nodeForId(nodeId) : null;
-            selectNode.call(this, node);
-            this._lastSelectedNodeSelectedForTest();
-        }
-
         if (this._omitDefaultSelection)
             return;
 
-        if (this._selectedPathOnReset)
-            domModel.pushNodeByPathToFrontend(this._selectedPathOnReset, selectLastSelectedNode.bind(this));
-        else
-            selectNode.call(this, null);
-        delete this._selectedPathOnReset;
+        var savedSelectedNodeOnReset = this._selectedNodeOnReset;
+        restoreNode.call(this, domModel, this._selectedNodeOnReset);
+
+        /**
+         * @param {!WebInspector.DOMModel} domModel
+         * @param {?WebInspector.DOMNode} staleNode
+         * @this {WebInspector.ElementsPanel}
+         */
+        function restoreNode(domModel, staleNode)
+        {
+            var nodePath = staleNode ? staleNode.path() : null;
+            if (!nodePath) {
+                onNodeRestored.call(this, null);
+                return;
+            }
+            domModel.pushNodeByPathToFrontend(nodePath, onNodeRestored.bind(this));
+        }
+
+        /**
+         * @param {?DOMAgent.NodeId} restoredNodeId
+         * @this {WebInspector.ElementsPanel}
+         */
+        function onNodeRestored(restoredNodeId)
+        {
+            if (savedSelectedNodeOnReset !== this._selectedNodeOnReset)
+                return;
+            var node = restoredNodeId ? domModel.nodeForId(restoredNodeId) : null;
+            if (!node) {
+                var inspectedDocument = domModel.existingDocument();
+                node = inspectedDocument ? inspectedDocument.body || inspectedDocument.documentElement : null;
+            }
+            this._setDefaultSelectedNode(node);
+            this._lastSelectedNodeSelectedForTest();
+        }
     },
 
     _lastSelectedNodeSelectedForTest: function() { },
 
     /**
+     * @param {?WebInspector.DOMNode} node
+     */
+    _setDefaultSelectedNode: function(node)
+    {
+        if (!node || this._hasNonDefaultSelectedNode || this._pendingNodeReveal)
+            return;
+        var treeOutline = WebInspector.ElementsTreeOutline.forDOMModel(node.domModel());
+        if (!treeOutline)
+            return;
+        this.selectDOMNode(node);
+        if (treeOutline.selectedTreeElement)
+            treeOutline.selectedTreeElement.expand();
+    },
+
+    /**
      * @override
      */
     searchCanceled: function()
     {
         delete this._searchQuery;
         this._hideSearchHighlights();
 
         this._searchableView.updateSearchMatchesCount(0);
 
         delete this._currentSearchResultIndex;
@@ skipping 268 matching lines @@
                 treeOutline.domModel().redo();
                 event.handled = true;
             }
         }
 
         if (WebInspector.isEditing() && event.keyCode !== WebInspector.KeyboardShortcut.Keys.F2.code)
             return;
 
         var treeOutline = null;
         for (var i = 0; i < this._treeOutlines.length; ++i) {
-            if (this._treeOutlines[i].selectedDOMNode() === this._lastValidSelectedNode)
+            if (this._treeOutlines[i].selectedDOMNode())
                 treeOutline = this._treeOutlines[i];
         }
         if (!treeOutline)
             return;
 
         if (!treeOutline.editing()) {
             handleUndoRedo.call(null, treeOutline);
             if (event.handled) {
                 this._stylesWidget.forceUpdate();
                 return;
@@ skipping 375 matching lines @@
     /**
      * @override
      * @param {!WebInspector.DOMNode} node
      * @return {?{title: string, color: string}}
      */
     decorate: function(node)
     {
         return { color: "orange", title: WebInspector.UIString("Element state: %s", ":" + WebInspector.CSSModel.fromNode(node).pseudoState(node).join(", :")) };
     }
 };