Resubmission of sashab's patch: Make CSSComputedStyledeclaration::getPropertyCSSValue return const

third_party/WebKit/Source/core/inspector/LayoutEditor.cpp

Index: third_party/WebKit/Source/core/inspector/LayoutEditor.cpp
diff --git a/third_party/WebKit/Source/core/inspector/LayoutEditor.cpp b/third_party/WebKit/Source/core/inspector/LayoutEditor.cpp
index afda780e205877604f7a09b8324cdf8261e07fa9..470f7d73f949edc19f14b081fa4ae6abd82e961d 100644
--- a/third_party/WebKit/Source/core/inspector/LayoutEditor.cpp
+++ b/third_party/WebKit/Source/core/inspector/LayoutEditor.cpp
@@ -187,20 +187,20 @@ void LayoutEditor::rebuild()
     editableSelectorUpdated(false);
 }
 
-CSSPrimitiveValue* LayoutEditor::getPropertyCSSValue(CSSPropertyID property) const
+const CSSPrimitiveValue* LayoutEditor::getPropertyCSSValue(CSSPropertyID property) const
 {
     CSSStyleDeclaration* style = m_cssAgent->findEffectiveDeclaration(property, m_matchedStyles);
     if (!style)
         return nullptr;
 
-    CSSValue* cssValue = style->getPropertyCSSValueInternal(property);
+    const CSSValue* cssValue = style->getPropertyCSSValueInternal(property);
     if (!cssValue || !cssValue->isPrimitiveValue())
         return nullptr;
 
     return toCSSPrimitiveValue(cssValue);
 }
 
-bool LayoutEditor::growInside(String propertyName, CSSPrimitiveValue* value)
+bool LayoutEditor::growInside(String propertyName, const CSSPrimitiveValue* value)
 {
     FloatQuad content1, padding1, border1, margin1;
     InspectorHighlight::buildNodeQuads(m_element.get(), &content1, &padding1, &border1, &margin1);
@@ -254,7 +254,7 @@ bool LayoutEditor::growInside(String propertyName, CSSPrimitiveValue* value)
 
 std::unique_ptr<protocol::DictionaryValue> LayoutEditor::createValueDescription(const String& propertyName)
 {
-    CSSPrimitiveValue* cssValue = getPropertyCSSValue(cssPropertyID(propertyName));
+    const CSSPrimitiveValue* cssValue = getPropertyCSSValue(cssPropertyID(propertyName));
     if (cssValue && !(cssValue->isLength() || cssValue->isPercentage()))
         return nullptr;
 
@@ -284,7 +284,7 @@ void LayoutEditor::overlayStartedPropertyChange(const String& anchorName)
     if (!m_changingProperty)
         return;
 
-    CSSPrimitiveValue* cssValue = getPropertyCSSValue(m_changingProperty);
+    const CSSPrimitiveValue* cssValue = getPropertyCSSValue(m_changingProperty);
     m_valueUnitType = cssValue ? cssValue->typeWithCalcResolved() : CSSPrimitiveValue::UnitType::Pixels;
     if (!isMutableUnitType(m_valueUnitType))
         return;