Devtools[LayoutEditor]: Rework layout-editor workflow

Source/web/InspectorOverlayImpl.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * 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
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 61 matching lines @@
     void setInspectModeEnabled(bool) override { }
     void hideHighlight() override { }
     void highlightNode(Node*, Node* eventTarget, const InspectorHighlightConfig&, bool omitTooltip) override { }
     void highlightQuad(PassOwnPtr<FloatQuad>, const InspectorHighlightConfig&) override { }
     void showAndHideViewSize(bool showGrid) override { }
     void setListener(InspectorOverlay::Listener* listener) override { }
     void suspendUpdates() override { }
     void resumeUpdates() override { }
     void clear() override { }
     void setLayoutEditor(PassOwnPtrWillBeRawPtr<LayoutEditor>) override { }
+    void showLayoutEditorForNode(Node*, const InspectorHighlightConfig&) override { };
 };
 
 DEFINE_TRACE(InspectorOverlayStub)
 {
     InspectorOverlay::trace(visitor);
 }
 
 } // anonymous namespace
 
 class InspectorOverlayImpl::InspectorPageOverlayDelegate final : public PageOverlay::Delegate {
@@ skipping 171 matching lines @@
 }
 
 void InspectorOverlayImpl::setInspectModeEnabled(bool enabled)
 {
     m_inspectModeEnabled = enabled;
     update();
 }
 
 void InspectorOverlayImpl::hideHighlight()
 {
-    if (m_layoutEditor)
-        m_layoutEditor->setNode(nullptr);
     m_highlightNode.clear();
     m_eventTargetNode.clear();
     m_highlightQuad.clear();
-    update();
+
+    if (m_layoutEditor && m_layoutEditor->node())
+        highlightNode(m_layoutEditor->node(), 0, m_layoutEditor->highlightConfig(), false);
+    else
+        update();
 }
 
 void InspectorOverlayImpl::highlightNode(Node* node, Node* eventTarget, const InspectorHighlightConfig& highlightConfig, bool omitTooltip)
 {
     m_nodeHighlightConfig = highlightConfig;
     m_highlightNode = node;
-    if (m_layoutEditor && highlightConfig.showLayoutEditor)
-        m_layoutEditor->setNode(node);
     m_eventTargetNode = eventTarget;
     m_omitTooltip = omitTooltip;
     update();
 }
 
 void InspectorOverlayImpl::highlightQuad(PassOwnPtr<FloatQuad> quad, const InspectorHighlightConfig& highlightConfig)
 {
     m_quadHighlightConfig = highlightConfig;
     m_highlightQuad = quad;
     m_omitTooltip = false;
@@ skipping 59 matching lines @@
     if (!m_highlightNode)
         return;
 
     bool appendElementInfo = m_highlightNode->isElementNode() && !m_omitTooltip && m_nodeHighlightConfig.showInfo && m_highlightNode->layoutObject() && m_highlightNode->document().frame();
     InspectorHighlight highlight(m_highlightNode.get(), m_nodeHighlightConfig, appendElementInfo);
     if (m_eventTargetNode)
         highlight.appendEventTargetQuads(m_eventTargetNode.get(), m_nodeHighlightConfig);
 
     RefPtr<JSONObject> highlightJSON = highlight.asJSONObject();
     evaluateInOverlay("drawHighlight", highlightJSON.release());
-    if (m_layoutEditor && m_nodeHighlightConfig.showLayoutEditor) {
+    if (m_layoutEditor && m_layoutEditor->node() == m_highlightNode) {
         RefPtr<JSONObject> layoutEditorInfo = m_layoutEditor->buildJSONInfo();
         if (layoutEditorInfo)
             evaluateInOverlay("showLayoutEditor", layoutEditorInfo.release());
     }
 }
 
 void InspectorOverlayImpl::drawQuadHighlight()
 {
     if (!m_highlightQuad)
         return;
@@ skipping 155 matching lines @@
 {
     --m_suspendCount;
 }
 
 void InspectorOverlayImpl::setLayoutEditor(PassOwnPtrWillBeRawPtr<LayoutEditor> layoutEditor)
 {
     m_layoutEditor = layoutEditor;
     m_overlayHost->setLayoutEditorListener(m_layoutEditor.get());
 }
 
+void InspectorOverlayImpl::showLayoutEditorForNode(Node* node, const InspectorHighlightConfig& highlightConfig)
+{
+    if (!m_layoutEditor)
+        return;
+
+    m_layoutEditor->setNode(node);
+    m_layoutEditor->setHighlightConfig(highlightConfig);
+}
+
+
 } // namespace blink