CSSValue Immediates: Make CSSPrimitiveValue a container

Source/core/animation/animatable/AnimatableUnknownTest.cpp

 /*
  * Copyright (c) 2013, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 21 matching lines @@
 #include "core/animation/animatable/AnimatableUnknown.h"
 
 #include "core/animation/animatable/AnimatableNeutral.h"
 #include "core/css/CSSValuePool.h"
 #include <gtest/gtest.h>
 
 namespace blink {
 
 TEST(AnimationAnimatableUnknownTest, Create)
 {
-    CSSValue cssValue = cssValuePool().createIdentifierValue(CSSValueYellow);
+    CSSPrimitiveValue cssValue = cssValuePool().createIdentifierValue(CSSValueYellow);
     EXPECT_TRUE(AnimatableUnknown::create(cssValue));
 }
 
 TEST(AnimationAnimatableUnknownTest, ToCSSValue)
 {
-    CSSValue cssValue = cssValuePool().createIdentifierValue(CSSValueYellow);
-    EXPECT_EQ(cssValue, AnimatableUnknown::create(cssValue)->toCSSValue());
+    CSSPrimitiveValue cssValue = cssValuePool().createIdentifierValue(CSSValueYellow);
+    EXPECT_EQ(CSSValue(cssValue), CSSValue(AnimatableUnknown::create(cssValue)->toCSSValue()));
 }
 
 TEST(AnimationAnimatableUnknownTest, Interpolate)
 {
-    CSSValue cssValue = cssValuePool().createIdentifierValue(CSSValueYellow);
-    CSSValue otherCSSValue = cssValuePool().createIdentifierValue(CSSValueOrange);
+    CSSPrimitiveValue cssValue = cssValuePool().createIdentifierValue(CSSValueYellow);
+    CSSPrimitiveValue otherCSSValue = cssValuePool().createIdentifierValue(CSSValueOrange);
     RefPtrWillBePersistent<AnimatableValue> animatableUnknown = AnimatableUnknown::create(cssValue);
     RefPtrWillBePersistent<AnimatableValue> otherAnimatableUnknown = AnimatableUnknown::create(otherCSSValue);
 
-    EXPECT_EQ(cssValue, toAnimatableUnknown(AnimatableValue::interpolate(animatableUnknown.get(), otherAnimatableUnknown.get(), 0).get())->toCSSValue());
-    EXPECT_EQ(cssValue, toAnimatableUnknown(AnimatableValue::interpolate(animatableUnknown.get(), otherAnimatableUnknown.get(), 0.4).get())->toCSSValue());
-    EXPECT_EQ(otherCSSValue, toAnimatableUnknown(AnimatableValue::interpolate(animatableUnknown.get(), otherAnimatableUnknown.get(), 0.5).get())->toCSSValue());
-    EXPECT_EQ(otherCSSValue, toAnimatableUnknown(AnimatableValue::interpolate(animatableUnknown.get(), otherAnimatableUnknown.get(), 0.6).get())->toCSSValue());
-    EXPECT_EQ(otherCSSValue, toAnimatableUnknown(AnimatableValue::interpolate(animatableUnknown.get(), otherAnimatableUnknown.get(), 1).get())->toCSSValue());
+    EXPECT_EQ(CSSValue(cssValue), CSSValue(toAnimatableUnknown(AnimatableValue::interpolate(animatableUnknown.get(), otherAnimatableUnknown.get(), 0).get())->toCSSValue()));
+    EXPECT_EQ(CSSValue(cssValue), CSSValue(toAnimatableUnknown(AnimatableValue::interpolate(animatableUnknown.get(), otherAnimatableUnknown.get(), 0.4).get())->toCSSValue()));
+    EXPECT_EQ(CSSValue(otherCSSValue), CSSValue(toAnimatableUnknown(AnimatableValue::interpolate(animatableUnknown.get(), otherAnimatableUnknown.get(), 0.5).get())->toCSSValue()));
+    EXPECT_EQ(CSSValue(otherCSSValue), CSSValue(toAnimatableUnknown(AnimatableValue::interpolate(animatableUnknown.get(), otherAnimatableUnknown.get(), 0.6).get())->toCSSValue()));
+    EXPECT_EQ(CSSValue(otherCSSValue), CSSValue(toAnimatableUnknown(AnimatableValue::interpolate(animatableUnknown.get(), otherAnimatableUnknown.get(), 1).get())->toCSSValue()));
 
-    EXPECT_EQ(otherCSSValue, toAnimatableUnknown(AnimatableValue::interpolate(otherAnimatableUnknown.get(), animatableUnknown.get(), 0).get())->toCSSValue());
-    EXPECT_EQ(otherCSSValue, toAnimatableUnknown(AnimatableValue::interpolate(otherAnimatableUnknown.get(), animatableUnknown.get(), 0.4).get())->toCSSValue());
-    EXPECT_EQ(cssValue, toAnimatableUnknown(AnimatableValue::interpolate(otherAnimatableUnknown.get(), animatableUnknown.get(), 0.5).get())->toCSSValue());
-    EXPECT_EQ(cssValue, toAnimatableUnknown(AnimatableValue::interpolate(otherAnimatableUnknown.get(), animatableUnknown.get(), 0.6).get())->toCSSValue());
-    EXPECT_EQ(cssValue, toAnimatableUnknown(AnimatableValue::interpolate(otherAnimatableUnknown.get(), animatableUnknown.get(), 1).get())->toCSSValue());
+    EXPECT_EQ(CSSValue(otherCSSValue), CSSValue(toAnimatableUnknown(AnimatableValue::interpolate(otherAnimatableUnknown.get(), animatableUnknown.get(), 0).get())->toCSSValue()));
+    EXPECT_EQ(CSSValue(otherCSSValue), CSSValue(toAnimatableUnknown(AnimatableValue::interpolate(otherAnimatableUnknown.get(), animatableUnknown.get(), 0.4).get())->toCSSValue()));
+    EXPECT_EQ(CSSValue(cssValue), CSSValue(toAnimatableUnknown(AnimatableValue::interpolate(otherAnimatableUnknown.get(), animatableUnknown.get(), 0.5).get())->toCSSValue()));
+    EXPECT_EQ(CSSValue(cssValue), CSSValue(toAnimatableUnknown(AnimatableValue::interpolate(otherAnimatableUnknown.get(), animatableUnknown.get(), 0.6).get())->toCSSValue()));
+    EXPECT_EQ(CSSValue(cssValue), CSSValue(toAnimatableUnknown(AnimatableValue::interpolate(otherAnimatableUnknown.get(), animatableUnknown.get(), 1).get())->toCSSValue()));
 }
 
 } // namespace blink