Devtools[LayoutEditor]: Rework layout-editor workflow

Source/devtools/front_end/elements/ElementsPanel.js

Index: Source/devtools/front_end/elements/ElementsPanel.js
diff --git a/Source/devtools/front_end/elements/ElementsPanel.js b/Source/devtools/front_end/elements/ElementsPanel.js
index dde173bfa2576aa126ad5c02248fac63bdf1e132..a6e18b81e3926aa1d92ba117aa7ec8d9f332ef37 100644
--- a/Source/devtools/front_end/elements/ElementsPanel.js
+++ b/Source/devtools/front_end/elements/ElementsPanel.js
@@ -884,16 +884,17 @@ WebInspector.ElementsPanel.prototype = {
      */
     revealAndSelectNode: function(node)
     {
-        if (WebInspector.inspectElementModeController && WebInspector.inspectElementModeController.enabled()) {
+        if (WebInspector.inspectElementModeController && WebInspector.inspectElementModeController.started()) {
             InspectorFrontendHost.bringToFront();
-            WebInspector.inspectElementModeController.disable();
+            WebInspector.inspectElementModeController.stop();
         }
 
         this._omitDefaultSelection = true;
-        WebInspector.inspectorView.setCurrentPanel(this);
+        WebInspector.inspectorView.setCurrentPanel(this, true);

[pfeldman, 2015/08/24 23:18:14]

Reveal node clearly needs to bring panel to front as any setCurrentPanel. You
need to suppress it for your action only.

[sergeyv, 2015/08/25 17:58:02]

Done.

         node = WebInspector.moduleSetting("showUAShadowDOM").get() ? node : this._leaveUserAgentShadowDOM(node);
+        var domModel = WebInspector.DOMModel.fromTarget(node.target());
         if (this._showLayoutEditor)
-            node.highlight();
+            node.highlightWithConfig({mode: "all", showLayoutEditor: true});
         else
             node.highlightForTwoSeconds();
 
@@ -1103,6 +1104,14 @@ WebInspector.ElementsPanel.prototype = {
         this._showLayoutEditor = !this._showLayoutEditor;
         this._layoutEditorButton.setToggled(this._showLayoutEditor);
         var targets = WebInspector.targetManager.targets();
+
+
+        if (this._showLayoutEditor)
+            WebInspector.inspectElementModeController.disable();
+        else {

[pfeldman, 2015/08/24 23:18:14]

drop {}

[sergeyv, 2015/08/25 17:58:02]

Done.

+            WebInspector.inspectElementModeController.enable();
+        }
+
         for (var target of targets) {
             var domModel = WebInspector.DOMModel.fromTarget(target);
             if (!domModel)
@@ -1114,9 +1123,7 @@ WebInspector.ElementsPanel.prototype = {
             else
                 domModel.setHighlighter(null);
 
-            // We need to correct (turn on/off layout editor) the config which is used by inspect element mode, so we re-enable it.
-            if (WebInspector.inspectElementModeController && WebInspector.inspectElementModeController.enabled())
-                domModel.setInspectModeEnabled(true, WebInspector.moduleSetting("showUAShadowDOM").get());
+            domModel.setInspectModeEnabled(this._showLayoutEditor, "showLayoutEditor");
         }
         WebInspector.DOMModel.hideDOMNodeHighlight();
     },
@@ -1323,33 +1330,13 @@ WebInspector.ElementsPanel.LayoutEditorNodeHighlighter.prototype = {
      */
     highlightDOMNode: function(node, config, backendNodeId, objectId)
     {
-        config.showLayoutEditor = config.showInfo;
         var selectedNode = this._treeOutline.selectedDOMNode();
-        if (objectId || node || backendNodeId || !selectedNode)
+        if (objectId || node || backendNodeId || !selectedNode) {
             WebInspector.DefaultDOMNodeHighlighter.prototype.highlightDOMNode.call(this, node, config, backendNodeId, objectId);
-        else
-            WebInspector.DefaultDOMNodeHighlighter.prototype.highlightDOMNode.call(this, selectedNode, config);
-    },
-
-    /**
-     * @override
-     * @param {boolean} enabled
-     * @param {boolean} inspectUAShadowDOM
-     * @param {!DOMAgent.HighlightConfig} config
-     * @param {function(?Protocol.Error)=} callback
-     */
-    setInspectModeEnabled: function(enabled, inspectUAShadowDOM, config, callback)
-    {
-        config.showLayoutEditor = config.showInfo;

[pfeldman, 2015/08/24 23:18:14]

Where did this code go?

[sergeyv, 2015/08/25 17:58:02]

To the backend

-        WebInspector.DefaultDOMNodeHighlighter.prototype.setInspectModeEnabled.call(this, enabled, inspectUAShadowDOM, config, callback);
-
-        if (enabled)
-            return;
-
-        var selectedNode = this._treeOutline.selectedDOMNode();
-        if (selectedNode)
+        } else {
+            config.showLayoutEditor = config.showInfo;

[pfeldman, 2015/08/24 23:18:14]

Why is showInfo being converted into showLayoutEditor (I can see that it was as
well, but why?)

[sergeyv, 2015/08/25 17:58:02]

Removed this

             WebInspector.DefaultDOMNodeHighlighter.prototype.highlightDOMNode.call(this, selectedNode, config);
+        }
     },
-
     __proto__: WebInspector.DefaultDOMNodeHighlighter.prototype
 }