| Index: Source/core/animation/animatable/AnimatableLengthTest.cpp
|
| diff --git a/Source/core/animation/animatable/AnimatableLengthTest.cpp b/Source/core/animation/animatable/AnimatableLengthTest.cpp
|
| index e5ef607a55c092f877a29c92850ae6e30251403c..39edb0ff55da6420092e5f9fd82bb872b6dfea11 100644
|
| --- a/Source/core/animation/animatable/AnimatableLengthTest.cpp
|
| +++ b/Source/core/animation/animatable/AnimatableLengthTest.cpp
|
| @@ -14,7 +14,7 @@ namespace blink {
|
|
|
| namespace {
|
|
|
| - PassRefPtrWillBeRawPtr<AnimatableLength> create(const Length& length, double zoom = 1)
|
| + AnimatableLength* create(const Length& length, double zoom = 1)
|
| {
|
| return AnimatableLength::create(length, zoom);
|
| }
|
| @@ -54,21 +54,21 @@ TEST(AnimationAnimatableLengthTest, Zoom)
|
|
|
| TEST(AnimationAnimatableLengthTest, Equals)
|
| {
|
| - EXPECT_TRUE(create(Length(10, Fixed))->equals(create(Length(10, Fixed)).get()));
|
| - EXPECT_TRUE(create(Length(20, Percent))->equals(create(Length(20, Percent)).get()));
|
| - EXPECT_FALSE(create(Length(10, Fixed))->equals(create(Length(10, Percent)).get()));
|
| - EXPECT_FALSE(create(Length(0, Percent))->equals(create(Length(0, Fixed)).get()));
|
| + EXPECT_TRUE(create(Length(10, Fixed))->equals(create(Length(10, Fixed))));
|
| + EXPECT_TRUE(create(Length(20, Percent))->equals(create(Length(20, Percent))));
|
| + EXPECT_FALSE(create(Length(10, Fixed))->equals(create(Length(10, Percent))));
|
| + EXPECT_FALSE(create(Length(0, Percent))->equals(create(Length(0, Fixed))));
|
| Length calc = Length(CalculationValue::create(PixelsAndPercent(5, 10), ValueRangeAll));
|
| - EXPECT_TRUE(create(calc)->equals(create(calc).get()));
|
| - EXPECT_FALSE(create(calc)->equals(create(Length(10, Percent)).get()));
|
| + EXPECT_TRUE(create(calc)->equals(create(calc)));
|
| + EXPECT_FALSE(create(calc)->equals(create(Length(10, Percent))));
|
| }
|
|
|
| TEST(AnimationAnimatableLengthTest, Interpolate)
|
| {
|
| - EXPECT_TRUE(AnimatableValue::interpolate(create(Length(10, Fixed)).get(), create(Length(0, Fixed)).get(), 0.2)->equals(create(Length(8, Fixed)).get()));
|
| - EXPECT_TRUE(AnimatableValue::interpolate(create(Length(4, Percent)).get(), create(Length(12, Percent)).get(), 0.25)->equals(create(Length(6, Percent)).get()));
|
| + EXPECT_TRUE(AnimatableValue::interpolate(create(Length(10, Fixed)), create(Length(0, Fixed)), 0.2)->equals(create(Length(8, Fixed))));
|
| + EXPECT_TRUE(AnimatableValue::interpolate(create(Length(4, Percent)), create(Length(12, Percent)), 0.25)->equals(create(Length(6, Percent))));
|
| Length calc = Length(CalculationValue::create(PixelsAndPercent(12, 4), ValueRangeAll));
|
| - EXPECT_TRUE(AnimatableValue::interpolate(create(Length(20, Fixed)).get(), create(Length(10, Percent)).get(), 0.4)->equals(create(calc).get()));
|
| + EXPECT_TRUE(AnimatableValue::interpolate(create(Length(20, Fixed)), create(Length(10, Percent)), 0.4)->equals(create(calc)));
|
| }
|
|
|
| } // namespace blink
|
|
|