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

Source/core/animation/DoubleStyleInterpolation.cpp

 // Copyright 2014 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/animation/DoubleStyleInterpolation.h"
 
 #include "core/css/CSSCalculationValue.h"
 #include "core/css/resolver/StyleBuilder.h"
 
@@ skipping 35 matching lines @@
     case RangeGreaterThanOrEqualToOne:
         return clampTo<float>(value, 1);
     case RangeNonNegative:
         return clampTo<float>(value, 0);
     default:
         ASSERT_NOT_REACHED();
         return value;
     }
 }
 
-PassRefPtrWillBeRawPtr<CSSValue> DoubleStyleInterpolation::interpolableValueToDouble(const InterpolableValue* value, bool isNumber, InterpolationRange clamp)
+CSSValue DoubleStyleInterpolation::interpolableValueToDouble(const InterpolableValue* value, bool isNumber, InterpolationRange clamp)
 {
     ASSERT(value->isNumber());
     double doubleValue = clampToRange(toInterpolableNumber(value)->value(), clamp);
 
     if (isNumber)
         return CSSPrimitiveValue::create(doubleValue, CSSPrimitiveValue::CSS_NUMBER);
     return CSSPrimitiveValue::create(doubleValue, CSSPrimitiveValue::CSS_DEG);
 }
 
 void DoubleStyleInterpolation::apply(StyleResolverState& state) const
 {
     if (m_id != CSSPropertyMotionRotation) {
-        StyleBuilder::applyProperty(m_id, state, interpolableValueToDouble(m_cachedValue.get(), m_isNumber, m_clamp).get());
+        StyleBuilder::applyProperty(m_id, state, interpolableValueToDouble(m_cachedValue.get(), m_isNumber, m_clamp));
         return;
     }
 
-    StyleBuilder::applyProperty(m_id, state, interpolableValueToMotionRotation(m_cachedValue.get(), m_flag).get());
+    StyleBuilder::applyProperty(m_id, state, interpolableValueToMotionRotation(m_cachedValue.get(), m_flag));
 }
 
 DEFINE_TRACE(DoubleStyleInterpolation)
 {
     StyleInterpolation::trace(visitor);
 }
 
 PassOwnPtrWillBeRawPtr<InterpolableValue> DoubleStyleInterpolation::toInterpolableValue(const CSSValue& value, CSSPropertyID property)
 {
     ASSERT(canCreateFrom(value));
     return doubleToInterpolableValue(value);
 }
 
-PassRefPtrWillBeRawPtr<CSSValue> DoubleStyleInterpolation::fromInterpolableValue(const InterpolableValue& value, InterpolationRange range)
+CSSValue DoubleStyleInterpolation::fromInterpolableValue(const InterpolableValue& value, InterpolationRange range)
 {
     return interpolableValueToDouble(&value, true, range);
 }
 
 namespace {
 
 bool extractMotionRotation(const CSSValue& value, float* rotation, MotionRotationType* rotationType)
 {
     *rotation = 0;
     *rotationType = MotionRotationFixed;
 
     if (!value.isValueList())
         return false;
     const CSSValueList& list = toCSSValueList(value);
 
     int len = list.length();
     for (int i = 0; i < len; i++) {
-        const CSSValue* item = list.item(i);
-        if (!item->isPrimitiveValue())
+        const CSSValue item = list.item(i);
+        if (!item.isPrimitiveValue())
             return false;
-        const CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(item);
-        if (primitiveValue->getValueID() == CSSValueAuto) {
+        const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(item);
+        if (primitiveValue.getValueID() == CSSValueAuto) {
             *rotationType = MotionRotationAuto;
-        } else if (primitiveValue->getValueID() == CSSValueReverse) {
+        } else if (primitiveValue.getValueID() == CSSValueReverse) {
             *rotationType = MotionRotationAuto;
             *rotation += 180;
-        } else if (primitiveValue->isAngle()) {
-            *rotation += primitiveValue->computeDegrees();
+        } else if (primitiveValue.isAngle()) {
+            *rotation += primitiveValue.computeDegrees();
         } else {
             return false;
         }
     }
     return true;
 }
 
 } // namespace
 
-PassRefPtrWillBeRawPtr<CSSValue> DoubleStyleInterpolation::interpolableValueToMotionRotation(InterpolableValue* value, bool flag)
+CSSValue DoubleStyleInterpolation::interpolableValueToMotionRotation(InterpolableValue* value, bool flag)
 {
     RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
     if (flag)
         list->append(CSSPrimitiveValue::createIdentifier(CSSValueAuto));
     ASSERT(value->isNumber());
     list->append(CSSPrimitiveValue::create(toInterpolableNumber(value)->value(), CSSPrimitiveValue::CSS_DEG));
     return list.release();
 }
 
 PassOwnPtrWillBeRawPtr<InterpolableValue> DoubleStyleInterpolation::motionRotationToInterpolableValue(const CSSValue& value)
@@ skipping 15 matching lines @@
         || startRotationType != endRotationType)
         return nullptr;
 
     return adoptRefWillBeNoop(new DoubleStyleInterpolation(
         motionRotationToInterpolableValue(start),
         motionRotationToInterpolableValue(end),
         id, true, InterpolationRange::RangeAll, startRotationType == MotionRotationAuto));
 }
 
 }