| Index: Source/core/animation/animatable/AnimatableUnknownTest.cpp
|
| diff --git a/Source/core/animation/animatable/AnimatableUnknownTest.cpp b/Source/core/animation/animatable/AnimatableUnknownTest.cpp
|
| index d4c2c0f0b0ebdbfbe42e47443d9ca0ec86502fbb..75ac637cc840023c635bbf4c29e01183aee11d30 100644
|
| --- a/Source/core/animation/animatable/AnimatableUnknownTest.cpp
|
| +++ b/Source/core/animation/animatable/AnimatableUnknownTest.cpp
|
| @@ -49,9 +49,9 @@ protected:
|
| }
|
|
|
| RefPtrWillBePersistent<CSSValue> cssValue;
|
| - RefPtrWillBePersistent<AnimatableValue> animatableUnknown;
|
| + Persistent<AnimatableValue> animatableUnknown;
|
| RefPtrWillBePersistent<CSSValue> otherCSSValue;
|
| - RefPtrWillBePersistent<AnimatableValue> otherAnimatableUnknown;
|
| + Persistent<AnimatableValue> otherAnimatableUnknown;
|
| };
|
|
|
| TEST_F(AnimationAnimatableUnknownTest, Create)
|
| @@ -66,17 +66,17 @@ TEST_F(AnimationAnimatableUnknownTest, ToCSSValue)
|
|
|
| TEST_F(AnimationAnimatableUnknownTest, Interpolate)
|
| {
|
| - 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, toAnimatableUnknown(AnimatableValue::interpolate(animatableUnknown.get(), otherAnimatableUnknown.get(), 0))->toCSSValue());
|
| + EXPECT_EQ(cssValue, toAnimatableUnknown(AnimatableValue::interpolate(animatableUnknown.get(), otherAnimatableUnknown.get(), 0.4))->toCSSValue());
|
| + EXPECT_EQ(otherCSSValue, toAnimatableUnknown(AnimatableValue::interpolate(animatableUnknown.get(), otherAnimatableUnknown.get(), 0.5))->toCSSValue());
|
| + EXPECT_EQ(otherCSSValue, toAnimatableUnknown(AnimatableValue::interpolate(animatableUnknown.get(), otherAnimatableUnknown.get(), 0.6))->toCSSValue());
|
| + EXPECT_EQ(otherCSSValue, toAnimatableUnknown(AnimatableValue::interpolate(animatableUnknown.get(), otherAnimatableUnknown.get(), 1))->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(otherCSSValue, toAnimatableUnknown(AnimatableValue::interpolate(otherAnimatableUnknown.get(), animatableUnknown.get(), 0))->toCSSValue());
|
| + EXPECT_EQ(otherCSSValue, toAnimatableUnknown(AnimatableValue::interpolate(otherAnimatableUnknown.get(), animatableUnknown.get(), 0.4))->toCSSValue());
|
| + EXPECT_EQ(cssValue, toAnimatableUnknown(AnimatableValue::interpolate(otherAnimatableUnknown.get(), animatableUnknown.get(), 0.5))->toCSSValue());
|
| + EXPECT_EQ(cssValue, toAnimatableUnknown(AnimatableValue::interpolate(otherAnimatableUnknown.get(), animatableUnknown.get(), 0.6))->toCSSValue());
|
| + EXPECT_EQ(cssValue, toAnimatableUnknown(AnimatableValue::interpolate(otherAnimatableUnknown.get(), animatableUnknown.get(), 1))->toCSSValue());
|
| }
|
|
|
| } // namespace blink
|
|
|