Index: Source/core/animation/animatable/AnimatableUnknownTest.cpp |
diff --git a/Source/core/animation/animatable/AnimatableUnknownTest.cpp b/Source/core/animation/animatable/AnimatableUnknownTest.cpp |
index c2f3d40299e993d472adf0464bf80a0326e10194..71706f22abdeac7be9e4b3bb75dc5804da6d94ed 100644 |
--- a/Source/core/animation/animatable/AnimatableUnknownTest.cpp |
+++ b/Source/core/animation/animatable/AnimatableUnknownTest.cpp |
@@ -39,34 +39,34 @@ 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 |