Devtools: Fix frontend part of LayoutEditor

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

Index: third_party/WebKit/Source/devtools/front_end/elements/ElementsPanel.js
diff --git a/third_party/WebKit/Source/devtools/front_end/elements/ElementsPanel.js b/third_party/WebKit/Source/devtools/front_end/elements/ElementsPanel.js
index 3bc557c848dc16323894a4ada3320b58d62c83a9..9f894f2b68ef36095d85db82bf4afa0d85804bef 100644
--- a/third_party/WebKit/Source/devtools/front_end/elements/ElementsPanel.js
+++ b/third_party/WebKit/Source/devtools/front_end/elements/ElementsPanel.js
@@ -50,7 +50,6 @@ WebInspector.ElementsPanel = function()
 
     this._contentElement = createElement("div");
     var crumbsContainer = createElement("div");
-    this._showLayoutEditor = false;
     if (Runtime.experiments.isEnabled("materialDesign"))
         this._initializeActionsToolbar();
     stackElement.appendChild(this._contentElement);
@@ -934,14 +933,15 @@ WebInspector.ElementsPanel.prototype = {
      */
     revealAndSelectNode: function(node)
     {
-        if (WebInspector.inspectElementModeController && WebInspector.inspectElementModeController.started())
-            WebInspector.inspectElementModeController.stop();
+        if (WebInspector.inspectElementModeController && WebInspector.inspectElementModeController.isInInspectElementMode())
+            WebInspector.inspectElementModeController.stopInspection();
 
         this._omitDefaultSelection = true;
 
-        WebInspector.inspectorView.setCurrentPanel(this, this._showLayoutEditor);
+        var showLayoutEditor = !!WebInspector.inspectElementModeController && WebInspector.inspectElementModeController.isInLayoutEditorMode();
+        WebInspector.inspectorView.setCurrentPanel(this, showLayoutEditor);
         node = WebInspector.moduleSetting("showUAShadowDOM").get() ? node : this._leaveUserAgentShadowDOM(node);
-        if (!this._showLayoutEditor)
+        if (!showLayoutEditor)
             node.highlightForTwoSeconds();
 
         this.selectDOMNode(node, true);