Devtools[LayoutEditor]: Rework layout-editor workflow

Source/core/inspector/LayoutEditor.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/inspector/LayoutEditor.h"
 
 #include "core/css/CSSComputedStyleDeclaration.h"
 #include "core/dom/NodeComputedStyle.h"
 #include "core/frame/FrameView.h"
 #include "core/inspector/InspectorCSSAgent.h"
+#include "core/inspector/InspectorDOMAgent.h"
 #include "core/inspector/InspectorHighlight.h"
 #include "core/layout/LayoutBox.h"
 #include "core/layout/LayoutInline.h"
 #include "core/layout/LayoutObject.h"
 #include "core/style/ComputedStyle.h"
 #include "platform/JSONValues.h"
 
 namespace blink {
 
 namespace {
@@ skipping 111 matching lines @@
 
 float toValidValue(CSSPropertyID propertyId, float newValue)
 {
     if (CSSPropertyPaddingBottom <= propertyId && propertyId <= CSSPropertyPaddingTop)
         return newValue >= 0 ? newValue : 0;
 
     return newValue;
 }
 } // namespace
 
-LayoutEditor::LayoutEditor(InspectorCSSAgent* cssAgent)
+LayoutEditor::LayoutEditor(InspectorCSSAgent* cssAgent, InspectorDOMAgent* domAgent)
     : m_element(nullptr)
     , m_cssAgent(cssAgent)
+    , m_domAgent(domAgent)
     , m_changingProperty(CSSPropertyInvalid)
     , m_propertyInitialValue(0)
+    , m_isDirty(false)
 {
 }
 
 DEFINE_TRACE(LayoutEditor)
 {
     visitor->trace(m_element);
     visitor->trace(m_cssAgent);
+    visitor->trace(m_domAgent);
 }
 
 void LayoutEditor::setNode(Node* node)
 {
-    m_element = node && node->isElementNode() ? toElement(node) : nullptr;
+    Element* element = node && node->isElementNode() ? toElement(node) : nullptr;
+    if (element == m_element)
+        return;
+
+    m_element = element;
     m_changingProperty = CSSPropertyInvalid;
     m_propertyInitialValue = 0;
+    m_isDirty = false;

[dgozman, 2015/09/02 01:17:22]

ASSERT(!m_isDirty)

[sergeyv, 2015/09/02 01:49:16]

Done.

 }
 
 PassRefPtr<JSONObject> LayoutEditor::buildJSONInfo() const
 {
     if (!m_element)
         return nullptr;
 
     FloatQuad content, padding, border, margin;
     InspectorHighlight::buildNodeQuads(m_element.get(), &content, &padding, &border, &margin);
     FloatQuad orthogonals = orthogonalVectors(padding);
@@ skipping 84 matching lines @@
     }
     m_propertyInitialValue = cssValue ? cssValue->getFloatValue() : 0;
 }
 
 void LayoutEditor::overlayPropertyChanged(float cssDelta)
 {
     if (m_changingProperty && m_factor) {
         String errorString;
         float newValue = toValidValue(m_changingProperty, cssDelta / m_factor + m_propertyInitialValue);
         m_cssAgent->setCSSPropertyValue(&errorString, m_element.get(), m_changingProperty, truncateZeroes(String::format("%.2f", newValue)) + CSSPrimitiveValue::unitTypeToString(m_valueUnitType));
+        m_isDirty = true;

[dgozman, 2015/09/02 01:17:22]

if (!errorString)
    m_isDirty = true;

[sergeyv, 2015/09/02 01:49:16]

Done.

     }
 }
 
 void LayoutEditor::overlayEndedPropertyChange()
 {
     m_changingProperty = CSSPropertyInvalid;
     m_propertyInitialValue = 0;
     m_factor = 0;
     m_valueUnitType = CSSPrimitiveValue::UnitType::Unknown;
 }
 
+void LayoutEditor::clearSelection(bool commitChanges)
+{
+    ErrorString errorString;
+    if (commitChanges)
+        m_domAgent->markUndoableState(&errorString);
+    else if (m_isDirty)
+        m_domAgent->undo(&errorString);
+
+    m_element.clear();
+    m_isDirty = false;
+}
+
+
+
 } // namespace blink