Changed CSSColorValue to return a Color

third_party/WebKit/Source/core/animation/ShadowStyleInterpolationTest.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/ShadowStyleInterpolation.h"
 
 #include "core/css/CSSColorValue.h"
 #include "core/css/CSSPrimitiveValue.h"
 #include "core/css/CSSShadowValue.h"
@@ skipping 18 matching lines @@
     {
         return ShadowStyleInterpolation::interpolableValueToShadow(*value, styleFlag);
     }
 
     static PassRefPtrWillBeRawPtr<CSSValue> roundTrip(PassRefPtrWillBeRawPtr<CSSValue> value, bool styleFlag)
     {
         return interpolableValueToShadow(shadowToInterpolableValue(*value, styleFlag).get(), styleFlag);
     }
 
     static void testPrimitiveValues(RefPtrWillBeRawPtr<CSSValue> value, double xExpected, double yExpected, double blurExpected, double spreadExpected,
-        RGBA32 colorExpected, RefPtrWillBeRawPtr<CSSPrimitiveValue> idExpected, CSSPrimitiveValue::UnitType unitType)
+        Color colorExpected, RefPtrWillBeRawPtr<CSSPrimitiveValue> idExpected, CSSPrimitiveValue::UnitType unitType)
     {
         EXPECT_TRUE(value->isShadowValue());
 
         CSSShadowValue& shadowValue = toCSSShadowValue(*value);
 
         EXPECT_EQ(xExpected, shadowValue.x->getDoubleValue());
         EXPECT_EQ(yExpected, shadowValue.y->getDoubleValue());
         EXPECT_EQ(blurExpected, shadowValue.blur->getDoubleValue());
         EXPECT_EQ(spreadExpected, shadowValue.spread->getDoubleValue());
         EXPECT_EQ(colorExpected, toCSSColorValue(*shadowValue.color).value());
 
         EXPECT_EQ(idExpected->getValueID(), shadowValue.style->getValueID());
 
         EXPECT_EQ(shadowValue.x->typeWithCalcResolved(), unitType);
         EXPECT_EQ(shadowValue.y->typeWithCalcResolved(), unitType);
         EXPECT_EQ(shadowValue.blur->typeWithCalcResolved(), unitType);
         EXPECT_EQ(shadowValue.spread->typeWithCalcResolved(), unitType);
     }
 
 };
 
 TEST_F(AnimationShadowStyleInterpolationTest, ZeroTest)
 {
-    RefPtrWillBeRawPtr<CSSColorValue> color = CSSColorValue::create(makeRGBA(0, 0, 0, 0));
+    RefPtrWillBeRawPtr<CSSColorValue> color = CSSColorValue::create(Color(0, 0, 0, 0));
     RefPtrWillBeRawPtr<CSSPrimitiveValue> x = CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Pixels);
     RefPtrWillBeRawPtr<CSSPrimitiveValue> y = CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Pixels);
     RefPtrWillBeRawPtr<CSSPrimitiveValue> blur = CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Pixels);
     RefPtrWillBeRawPtr<CSSPrimitiveValue> spread = CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Pixels);
 
     RefPtrWillBeRawPtr<CSSShadowValue> shadowValue = CSSShadowValue::create(x, y, blur, spread, CSSPrimitiveValue::createIdentifier(CSSValueNone), color);
 
     RefPtrWillBeRawPtr<CSSValue> value = roundTrip(shadowValue.release(), false);
 
-    testPrimitiveValues(value, 0, 0, 0, 0, makeRGBA(0, 0, 0, 0), CSSPrimitiveValue::createIdentifier(CSSValueNone), CSSPrimitiveValue::UnitType::Pixels);
+    testPrimitiveValues(value, 0, 0, 0, 0, Color(0, 0, 0, 0), CSSPrimitiveValue::createIdentifier(CSSValueNone), CSSPrimitiveValue::UnitType::Pixels);
 }
 
 TEST_F(AnimationShadowStyleInterpolationTest, MultipleValueNonPixelTest)
 {
-    RefPtrWillBeRawPtr<CSSColorValue> color = CSSColorValue::create(makeRGBA(112, 123, 175, 255));
+    RefPtrWillBeRawPtr<CSSColorValue> color = CSSColorValue::create(Color(112, 123, 175, 255));
     RefPtrWillBeRawPtr<CSSPrimitiveValue> x = CSSPrimitiveValue::create(10, CSSPrimitiveValue::UnitType::Ems);
     RefPtrWillBeRawPtr<CSSPrimitiveValue> y = CSSPrimitiveValue::create(20, CSSPrimitiveValue::UnitType::Ems);
     RefPtrWillBeRawPtr<CSSPrimitiveValue> blur = CSSPrimitiveValue::create(30, CSSPrimitiveValue::UnitType::Ems);
     RefPtrWillBeRawPtr<CSSPrimitiveValue> spread = CSSPrimitiveValue::create(40, CSSPrimitiveValue::UnitType::Ems);
 
     RefPtrWillBeRawPtr<CSSShadowValue> shadowValue = CSSShadowValue::create(x, y, blur, spread, CSSPrimitiveValue::createIdentifier(CSSValueNone), color);
 
     RefPtrWillBeRawPtr<CSSValue> value = roundTrip(shadowValue.release(), false);
 
-    testPrimitiveValues(value, 10, 20, 30, 40, makeRGBA(112, 123, 175, 255), CSSPrimitiveValue::createIdentifier(CSSValueNone), CSSPrimitiveValue::UnitType::Ems);
+    testPrimitiveValues(value, 10, 20, 30, 40, Color(112, 123, 175, 255), CSSPrimitiveValue::createIdentifier(CSSValueNone), CSSPrimitiveValue::UnitType::Ems);
 }
 
 TEST_F(AnimationShadowStyleInterpolationTest, InsetShadowTest)
 {
-    RefPtrWillBeRawPtr<CSSColorValue> color = CSSColorValue::create(makeRGBA(54, 48, 214, 64));
+    RefPtrWillBeRawPtr<CSSColorValue> color = CSSColorValue::create(Color(54, 48, 214, 64));
     RefPtrWillBeRawPtr<CSSPrimitiveValue> x = CSSPrimitiveValue::create(10, CSSPrimitiveValue::UnitType::Pixels);
     RefPtrWillBeRawPtr<CSSPrimitiveValue> y = CSSPrimitiveValue::create(20, CSSPrimitiveValue::UnitType::Pixels);
     RefPtrWillBeRawPtr<CSSPrimitiveValue> blur = CSSPrimitiveValue::create(30, CSSPrimitiveValue::UnitType::Pixels);
     RefPtrWillBeRawPtr<CSSPrimitiveValue> spread = CSSPrimitiveValue::create(40, CSSPrimitiveValue::UnitType::Pixels);
 
     RefPtrWillBeRawPtr<CSSShadowValue> shadowValue = CSSShadowValue::create(x, y, blur, spread, CSSPrimitiveValue::createIdentifier(CSSValueInset), color);
 
     RefPtrWillBeRawPtr<CSSValue> value = roundTrip(shadowValue.release(), true);
 
-    testPrimitiveValues(value, 10, 20, 30, 40, makeRGBA(54, 48, 214, 64), CSSPrimitiveValue::createIdentifier(CSSValueInset), CSSPrimitiveValue::UnitType::Pixels);
+    testPrimitiveValues(value, 10, 20, 30, 40, Color(54, 48, 214, 64), CSSPrimitiveValue::createIdentifier(CSSValueInset), CSSPrimitiveValue::UnitType::Pixels);
 }
 
 }