CSSValue Immediates: Add move operators to CSSPrimitiveValue

Source/core/animation/ListStyleInterpolationTest.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/animation/ListStyleInterpolation.h"
 
 #include "core/animation/LengthStyleInterpolation.h"
 #include "core/animation/ShadowStyleInterpolation.h"
 
@@ skipping 27 matching lines @@
 
     static CSSValue shadowRoundTrip(CSSValue value)
     {
         Vector<bool> nonInterpolableData;
         return ListStyleInterpolationImpl<ShadowStyleInterpolation, bool>::interpolableValueToList(
             ListStyleInterpolationImpl<ShadowStyleInterpolation, bool>::listToInterpolableValue(toCSSValueList(value), &nonInterpolableData).get(), nonInterpolableData);
     }
 
     static RefPtrWillBeRawPtr<CSSShadowValue> createShadowValue()
     {
-        RefPtrWillBeRawPtr<CSSPrimitiveValue> color = CSSPrimitiveValue::createColor(makeRGBA(112, 123, 175, 255));
-        RefPtrWillBeRawPtr<CSSPrimitiveValue> x = CSSPrimitiveValue::create(10, CSSPrimitiveValue::CSS_PX);
-        RefPtrWillBeRawPtr<CSSPrimitiveValue> y = CSSPrimitiveValue::create(20, CSSPrimitiveValue::CSS_PX);
-        RefPtrWillBeRawPtr<CSSPrimitiveValue> blur = CSSPrimitiveValue::create(30, CSSPrimitiveValue::CSS_PX);
-        RefPtrWillBeRawPtr<CSSPrimitiveValue> spread = CSSPrimitiveValue::create(40, CSSPrimitiveValue::CSS_PX);
+        CSSPrimitiveValue color = CSSPrimitiveValue::createColor(makeRGBA(112, 123, 175, 255));
+        CSSPrimitiveValue x = CSSPrimitiveValue::create(10, CSSPrimitiveValue::CSS_PX);
+        CSSPrimitiveValue y = CSSPrimitiveValue::create(20, CSSPrimitiveValue::CSS_PX);
+        CSSPrimitiveValue blur = CSSPrimitiveValue::create(30, CSSPrimitiveValue::CSS_PX);
+        CSSPrimitiveValue spread = CSSPrimitiveValue::create(40, CSSPrimitiveValue::CSS_PX);
 
         return CSSShadowValue::create(x, y, blur, spread, CSSPrimitiveValue::createIdentifier(CSSValueNone), color);
 
     }
 
     static void compareShadowList(RefPtrWillBeRawPtr<CSSValueList> expectedList, CSSValue actualList)
     {
         ASSERT(actualList.isValueList());
 
         for (size_t i = 0; i < 10; i++) {
 
             CSSShadowValue& expectedShadow = toCSSShadowValue(expectedList->item(i));
             CSSShadowValue& actualShadow = toCSSShadowValue(toCSSValueList(actualList).item(i));
 
-            EXPECT_EQ(expectedShadow.x->getDoubleValue(), actualShadow.x->getDoubleValue());
-            EXPECT_EQ(expectedShadow.y->getDoubleValue(), actualShadow.y->getDoubleValue());
-            EXPECT_EQ(expectedShadow.blur->getDoubleValue(), actualShadow.blur->getDoubleValue());
-            EXPECT_EQ(expectedShadow.spread->getDoubleValue(), actualShadow.spread->getDoubleValue());
-            EXPECT_EQ(expectedShadow.color->getRGBA32Value(), actualShadow.color->getRGBA32Value());
+            EXPECT_EQ(toCSSPrimitiveValue(expectedShadow.x).getDoubleValue(), toCSSPrimitiveValue(actualShadow.x).getDoubleValue());
+            EXPECT_EQ(toCSSPrimitiveValue(expectedShadow.y).getDoubleValue(), toCSSPrimitiveValue(actualShadow.y).getDoubleValue());
+            EXPECT_EQ(toCSSPrimitiveValue(expectedShadow.blur).getDoubleValue(), toCSSPrimitiveValue(actualShadow.blur).getDoubleValue());
+            EXPECT_EQ(toCSSPrimitiveValue(expectedShadow.spread).getDoubleValue(), toCSSPrimitiveValue(actualShadow.spread).getDoubleValue());
+            EXPECT_EQ(toCSSPrimitiveValue(expectedShadow.color).getRGBA32Value(), toCSSPrimitiveValue(actualShadow.color).getRGBA32Value());
 
-            EXPECT_EQ(expectedShadow.style->getValueID(), actualShadow.style->getValueID());
+            EXPECT_EQ(toCSSPrimitiveValue(expectedShadow.style).getValueID(), toCSSPrimitiveValue(actualShadow.style).getValueID());
         }
     }
 };
 
 TEST_F(ListStyleInterpolationTest, LengthListMultipleValuesTest)
 {
     RefPtrWillBeRawPtr<CSSValueList> expectedList = CSSValueList::createCommaSeparated();
     for (size_t i = 0; i < 10; i++) {
-        RefPtrWillBeRawPtr<CSSPrimitiveValue> lengthValue = CSSPrimitiveValue::create(static_cast<double>(i), CSSPrimitiveValue::CSS_PX);
+        CSSPrimitiveValue lengthValue = CSSPrimitiveValue::create(static_cast<double>(i), CSSPrimitiveValue::CSS_PX);
         expectedList->append(lengthValue);
     }
 
     compareLengthLists(expectedList, lengthRoundTrip(expectedList, RangeNonNegative));
 }
 
 TEST_F(ListStyleInterpolationTest, ShadowListMultipleValuesTest)
 {
     RefPtrWillBeRawPtr<CSSValueList> expectedList = CSSValueList::createCommaSeparated();
     RefPtrWillBeRawPtr<CSSShadowValue> shadowValue = createShadowValue();
     for (size_t i = 0; i < 10; i++) {
         expectedList->append(shadowValue);
     }
 
     compareShadowList(expectedList, shadowRoundTrip(expectedList));
 }
 
 } // namespace blink