CSSValue Immediates: Change CSSValue to an object instead of a pointer

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/css/CSSPrimitiveValue.h"
 #include "core/frame/FrameView.h"
 #include "core/inspector/InspectorCSSAgent.h"
 #include "core/layout/LayoutBox.h"
 #include "core/layout/LayoutInline.h"
 #include "core/layout/LayoutObject.h"
 #include "platform/JSONValues.h"
 
 namespace blink {
 
 namespace {
@@ skipping 106 matching lines @@
         anchors->pushObject(createAnchor(xLeft, yLeft, "padding-left", orthoLeft, paddingLeftDescription.release()));
 
     RefPtr<JSONObject> paddingRightDescription = createValueDescription("padding-right");
     if (paddingRightDescription)
         anchors->pushObject(createAnchor(xRight, yRight, "padding-right", orthoRight, paddingRightDescription.release()));
 
     object->setArray("anchors", anchors.release());
     return object.release();
 }
 
-RefPtrWillBeRawPtr<CSSPrimitiveValue> LayoutEditor::getPropertyCSSValue(CSSPropertyID property) const
+NullableCSSValue LayoutEditor::getPropertyCSSValue(CSSPropertyID property) const
 {
     RefPtrWillBeRawPtr<CSSComputedStyleDeclaration> computedStyleInfo = CSSComputedStyleDeclaration::create(m_node, true);
-    RefPtrWillBeRawPtr<CSSValue> cssValue = computedStyleInfo->getPropertyCSSValue(property);
-    if (!cssValue->isPrimitiveValue())
+    NullableCSSValue cssValue = computedStyleInfo->getPropertyCSSValue(property);
+    if (!cssValue || !cssValue->isPrimitiveValue())
         return nullptr;
 
-    return toCSSPrimitiveValue(cssValue.get());
+    return cssValue;
 }
 
 PassRefPtr<JSONObject> LayoutEditor::createValueDescription(const String& propertyName) const
 {
-    RefPtrWillBeRawPtr<CSSPrimitiveValue> cssValue = getPropertyCSSValue(cssPropertyID(propertyName));
+    NullableCSSValue cssValue = getPropertyCSSValue(cssPropertyID(propertyName));
     if (!cssValue)
         return nullptr;
 
     RefPtr<JSONObject> object = JSONObject::create();
-    object->setNumber("value", cssValue->getFloatValue());
+    object->setNumber("value", toCSSPrimitiveValue(cssValue)->getFloatValue());
     object->setString("unit", "px");
     return object.release();
 }
 
 void LayoutEditor::overlayStartedPropertyChange(const String& anchorName)
 {
     m_changingProperty = cssPropertyID(anchorName);
     if (!m_node || !m_changingProperty)
         return;
 
-    RefPtrWillBeRawPtr<CSSPrimitiveValue> cssValue = getPropertyCSSValue(m_changingProperty);
+    NullableCSSValue cssValue = getPropertyCSSValue(m_changingProperty);
     if (!cssValue) {
         m_changingProperty = CSSPropertyInvalid;
         return;
     }
 
-    m_propertyInitialValue = cssValue->getFloatValue();
+    m_propertyInitialValue = toCSSPrimitiveValue(cssValue)->getFloatValue();
 }
 
 void LayoutEditor::overlayPropertyChanged(float cssDelta)
 {
     if (m_changingProperty && m_node->isElementNode()) {
         String errorString;
         m_cssAgent->setCSSPropertyValue(&errorString, toElement(m_node.get()), m_changingProperty, String::number(cssDelta + m_propertyInitialValue) + "px");
     }
 }
 
 void LayoutEditor::overlayEndedPropertyChange()
 {
     m_changingProperty = CSSPropertyInvalid;
     m_propertyInitialValue = 0;
 }
 
 } // namespace blink