CSSValue Immediates: Make CSSPrimitiveValue a container

Source/core/animation/LengthStyleInterpolation.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/LengthStyleInterpolation.h"
 
 #include "core/animation/css/CSSAnimatableValueFactory.h"
 #include "core/css/CSSCalculationValue.h"
 #include "core/css/resolver/StyleBuilder.h"
@@ skipping 36 matching lines @@
     default:
         return false;
     }
 }
 
 } // namespace
 
 bool LengthStyleInterpolation::canCreateFrom(const CSSValue value, CSSPropertyID property)
 {
     if (value.isPrimitiveValue()) {
-        const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
+        const CSSPrimitiveValue primitiveValue = toCSSPrimitiveValue(value);
         if (primitiveValue.cssCalcValue())
             return true;
 
         if (primitiveValue.isValueID()) {
             CSSValueID valueID = primitiveValue.getValueID();
             double pixels;
             return pixelsForKeyword(property, valueID, pixels);
         }
 
         CSSPrimitiveValue::LengthUnitType type;
         // Only returns true if the type is a primitive length unit.
         return CSSPrimitiveValue::unitTypeToLengthUnitType(primitiveValue.primitiveType(), type);
     }
     return value.isCalcValue();
 }
 
 PassOwnPtrWillBeRawPtr<InterpolableValue> LengthStyleInterpolation::toInterpolableValue(const CSSValue value, CSSPropertyID id)
 {
     ASSERT(canCreateFrom(value, id));
     OwnPtrWillBeRawPtr<InterpolableList> listOfValuesAndTypes = InterpolableList::create(2);
     OwnPtrWillBeRawPtr<InterpolableList> listOfValues = InterpolableList::create(CSSPrimitiveValue::LengthUnitTypeCount);
     OwnPtrWillBeRawPtr<InterpolableList> listOfTypes = InterpolableList::create(CSSPrimitiveValue::LengthUnitTypeCount);
 
-    const CSSPrimitiveValue& primitive = toCSSPrimitiveValue(value);
+    const CSSPrimitiveValue primitive = toCSSPrimitiveValue(value);
 
     CSSLengthArray arrayOfValues;
     CSSPrimitiveValue::CSSLengthTypeArray arrayOfTypes;
     for (size_t i = 0; i < CSSPrimitiveValue::LengthUnitTypeCount; i++)
         arrayOfValues.append(0);
 
     arrayOfTypes.ensureSize(CSSPrimitiveValue::LengthUnitTypeCount);
     if (primitive.isValueID()) {
         CSSValueID valueID = primitive.getValueID();
         double pixels;
@@ skipping 179 matching lines @@
     if (hasPixels)
         return Length(CSSPrimitiveValue::clampToCSSLengthRange(clampToRange(pixelsAndPercent.pixels, range)), Fixed);
     if (hasPercent)
         return Length(clampToRange(pixelsAndPercent.percent, range), Percent);
     ASSERT_NOT_REACHED();
     return Length(0, Fixed);
 }
 
 }
 
-PassRefPtrWillBeRawPtr<CSSPrimitiveValue> LengthStyleInterpolation::fromInterpolableValue(const InterpolableValue& value, InterpolationRange range)
+CSSPrimitiveValue LengthStyleInterpolation::fromInterpolableValue(const InterpolableValue& value, InterpolationRange range)
 {
     const InterpolableList* listOfValuesAndTypes = toInterpolableList(&value);
     const InterpolableList* listOfValues = toInterpolableList(listOfValuesAndTypes->get(0));
     const InterpolableList* listOfTypes = toInterpolableList(listOfValuesAndTypes->get(1));
     unsigned unitTypeCount = 0;
     for (size_t i = 0; i < CSSPrimitiveValue::LengthUnitTypeCount; i++) {
         const InterpolableNumber* subType = toInterpolableNumber(listOfTypes->get(i));
         if (subType->value()) {
             unitTypeCount++;
         }
@@ skipping 34 matching lines @@
         StyleBuilder::applyProperty(m_id, state, fromInterpolableValue(*m_cachedValue, m_range));
     }
 }
 
 DEFINE_TRACE(LengthStyleInterpolation)
 {
     StyleInterpolation::trace(visitor);
 }
 
 }