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 146 matching lines @@
 DEFINE_TRACE(InspectorOverlayImpl)
 {
     visitor->trace(m_highlightNode);
     visitor->trace(m_eventTargetNode);
     visitor->trace(m_overlayPage);
     visitor->trace(m_overlayChromeClient);
     visitor->trace(m_overlayHost);
     visitor->trace(m_layoutEditor);
 }
 
-void InspectorOverlayImpl::init(InspectorCSSAgent* cssAgent, InspectorDebuggerAgent* debuggerAgent)
+void InspectorOverlayImpl::init(InspectorCSSAgent* cssAgent, InspectorDebuggerAgent* debuggerAgent, InspectorDOMAgent* domAgent)
 {
-    m_layoutEditor = LayoutEditor::create(cssAgent);
+    m_layoutEditor = LayoutEditor::create(cssAgent, domAgent);
     m_debuggerAgent = debuggerAgent;
     m_overlayHost->setListener(this);
 }
 
 void InspectorOverlayImpl::invalidate()
 {
     if (!m_pageOverlay)
         m_pageOverlay = PageOverlay::create(m_webViewImpl, new InspectorPageOverlayDelegate(*this));
 
     m_pageOverlay->update();
@@ skipping 52 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 51 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 157 matching lines @@
 void InspectorOverlayImpl::overlayPropertyChanged(float value)
 {
     m_layoutEditor->overlayPropertyChanged(value);
 }
 
 void InspectorOverlayImpl::overlayEndedPropertyChange()
 {
     m_layoutEditor->overlayEndedPropertyChange();
 }
 
+void InspectorOverlayImpl::clearSelection(bool commitChanges)
+{
+    m_layoutEditor->clearSelection(commitChanges);
+}
+
 void InspectorOverlayImpl::profilingStarted()
 {
     if (!m_suspendCount++)
         clear();
 }
 
 void InspectorOverlayImpl::profilingStopped()
 {
     --m_suspendCount;
 }
 
 void InspectorOverlayImpl::pageLayoutInvalidated(bool resized)
 {
     if (resized && m_drawViewSize) {
         m_resizeTimerActive = true;
         m_timer.startOneShot(1, FROM_HERE);
     }
     update();
 }
 
 void InspectorOverlayImpl::setShowViewportSizeOnResize(bool show, bool showGrid)
 {
     m_drawViewSize = show;
     m_drawViewSizeWithGrid = showGrid;
 }
 
+void InspectorOverlayImpl::showLayoutEditorForNode(Node* node, const InspectorHighlightConfig& highlightConfig)
+{
+    if (!m_layoutEditor)
+        return;
+
+    m_layoutEditor->setNode(node);
+    m_layoutEditor->setHighlightConfig(highlightConfig);
+}
+
+
 } // namespace blink