| Index: third_party/WebKit/Source/core/animation/animatable/AnimatableDoubleAndBoolTest.cpp
|
| diff --git a/third_party/WebKit/Source/core/animation/animatable/AnimatableDoubleAndBoolTest.cpp b/third_party/WebKit/Source/core/animation/animatable/AnimatableDoubleAndBoolTest.cpp
|
| index afb607c4a14e41aa4c34a96493c5597cefd9078d..54a3370d68edf8b08e94764a5bc7b87e53952e58 100644
|
| --- a/third_party/WebKit/Source/core/animation/animatable/AnimatableDoubleAndBoolTest.cpp
|
| +++ b/third_party/WebKit/Source/core/animation/animatable/AnimatableDoubleAndBoolTest.cpp
|
| @@ -48,33 +48,38 @@ TEST(AnimationAnimatableDoubleAndBoolTest, InterpolateFalse) {
|
| AnimatableValue::interpolate(from10.get(), to20.get(), -0.5).get())
|
| ->flag());
|
| EXPECT_EQ(
|
| - 5, toAnimatableDoubleAndBool(
|
| - AnimatableValue::interpolate(from10.get(), to20.get(), -0.5).get())
|
| - ->toDouble());
|
| + 5,
|
| + toAnimatableDoubleAndBool(
|
| + AnimatableValue::interpolate(from10.get(), to20.get(), -0.5).get())
|
| + ->toDouble());
|
| EXPECT_EQ(10,
|
| toAnimatableDoubleAndBool(
|
| AnimatableValue::interpolate(from10.get(), to20.get(), 0).get())
|
| ->toDouble());
|
| EXPECT_EQ(
|
| - 14, toAnimatableDoubleAndBool(
|
| - AnimatableValue::interpolate(from10.get(), to20.get(), 0.4).get())
|
| - ->toDouble());
|
| + 14,
|
| + toAnimatableDoubleAndBool(
|
| + AnimatableValue::interpolate(from10.get(), to20.get(), 0.4).get())
|
| + ->toDouble());
|
| EXPECT_EQ(
|
| - 15, toAnimatableDoubleAndBool(
|
| - AnimatableValue::interpolate(from10.get(), to20.get(), 0.5).get())
|
| - ->toDouble());
|
| + 15,
|
| + toAnimatableDoubleAndBool(
|
| + AnimatableValue::interpolate(from10.get(), to20.get(), 0.5).get())
|
| + ->toDouble());
|
| EXPECT_EQ(
|
| - 16, toAnimatableDoubleAndBool(
|
| - AnimatableValue::interpolate(from10.get(), to20.get(), 0.6).get())
|
| - ->toDouble());
|
| + 16,
|
| + toAnimatableDoubleAndBool(
|
| + AnimatableValue::interpolate(from10.get(), to20.get(), 0.6).get())
|
| + ->toDouble());
|
| EXPECT_EQ(20,
|
| toAnimatableDoubleAndBool(
|
| AnimatableValue::interpolate(from10.get(), to20.get(), 1).get())
|
| ->toDouble());
|
| EXPECT_EQ(
|
| - 25, toAnimatableDoubleAndBool(
|
| - AnimatableValue::interpolate(from10.get(), to20.get(), 1.5).get())
|
| - ->toDouble());
|
| + 25,
|
| + toAnimatableDoubleAndBool(
|
| + AnimatableValue::interpolate(from10.get(), to20.get(), 1.5).get())
|
| + ->toDouble());
|
| EXPECT_FALSE(
|
| toAnimatableDoubleAndBool(
|
| AnimatableValue::interpolate(from10.get(), to20.get(), 1.5).get())
|
| @@ -91,33 +96,38 @@ TEST(AnimationAnimatableDoubleAndBoolTest, InterpolateTrue) {
|
| AnimatableValue::interpolate(from10.get(), to20.get(), -0.5).get())
|
| ->flag());
|
| EXPECT_EQ(
|
| - 5, toAnimatableDoubleAndBool(
|
| - AnimatableValue::interpolate(from10.get(), to20.get(), -0.5).get())
|
| - ->toDouble());
|
| + 5,
|
| + toAnimatableDoubleAndBool(
|
| + AnimatableValue::interpolate(from10.get(), to20.get(), -0.5).get())
|
| + ->toDouble());
|
| EXPECT_EQ(10,
|
| toAnimatableDoubleAndBool(
|
| AnimatableValue::interpolate(from10.get(), to20.get(), 0).get())
|
| ->toDouble());
|
| EXPECT_EQ(
|
| - 14, toAnimatableDoubleAndBool(
|
| - AnimatableValue::interpolate(from10.get(), to20.get(), 0.4).get())
|
| - ->toDouble());
|
| + 14,
|
| + toAnimatableDoubleAndBool(
|
| + AnimatableValue::interpolate(from10.get(), to20.get(), 0.4).get())
|
| + ->toDouble());
|
| EXPECT_EQ(
|
| - 15, toAnimatableDoubleAndBool(
|
| - AnimatableValue::interpolate(from10.get(), to20.get(), 0.5).get())
|
| - ->toDouble());
|
| + 15,
|
| + toAnimatableDoubleAndBool(
|
| + AnimatableValue::interpolate(from10.get(), to20.get(), 0.5).get())
|
| + ->toDouble());
|
| EXPECT_EQ(
|
| - 16, toAnimatableDoubleAndBool(
|
| - AnimatableValue::interpolate(from10.get(), to20.get(), 0.6).get())
|
| - ->toDouble());
|
| + 16,
|
| + toAnimatableDoubleAndBool(
|
| + AnimatableValue::interpolate(from10.get(), to20.get(), 0.6).get())
|
| + ->toDouble());
|
| EXPECT_EQ(20,
|
| toAnimatableDoubleAndBool(
|
| AnimatableValue::interpolate(from10.get(), to20.get(), 1).get())
|
| ->toDouble());
|
| EXPECT_EQ(
|
| - 25, toAnimatableDoubleAndBool(
|
| - AnimatableValue::interpolate(from10.get(), to20.get(), 1.5).get())
|
| - ->toDouble());
|
| + 25,
|
| + toAnimatableDoubleAndBool(
|
| + AnimatableValue::interpolate(from10.get(), to20.get(), 1.5).get())
|
| + ->toDouble());
|
| EXPECT_TRUE(
|
| toAnimatableDoubleAndBool(
|
| AnimatableValue::interpolate(from10.get(), to20.get(), 1.5).get())
|
| @@ -143,9 +153,10 @@ TEST(AnimationAnimatableDoubleAndBoolTest, Step) {
|
| AnimatableValue::interpolate(from10.get(), to20.get(), 0).get())
|
| ->toDouble());
|
| EXPECT_EQ(
|
| - 10, toAnimatableDoubleAndBool(
|
| - AnimatableValue::interpolate(from10.get(), to20.get(), 0.4).get())
|
| - ->toDouble());
|
| + 10,
|
| + toAnimatableDoubleAndBool(
|
| + AnimatableValue::interpolate(from10.get(), to20.get(), 0.4).get())
|
| + ->toDouble());
|
| EXPECT_TRUE(
|
| toAnimatableDoubleAndBool(
|
| AnimatableValue::interpolate(from10.get(), to20.get(), 0.4).get())
|
| @@ -156,17 +167,19 @@ TEST(AnimationAnimatableDoubleAndBoolTest, Step) {
|
| AnimatableValue::interpolate(from10.get(), to20.get(), 0.6).get())
|
| ->flag());
|
| EXPECT_EQ(
|
| - 20, toAnimatableDoubleAndBool(
|
| - AnimatableValue::interpolate(from10.get(), to20.get(), 0.6).get())
|
| - ->toDouble());
|
| + 20,
|
| + toAnimatableDoubleAndBool(
|
| + AnimatableValue::interpolate(from10.get(), to20.get(), 0.6).get())
|
| + ->toDouble());
|
| EXPECT_EQ(20,
|
| toAnimatableDoubleAndBool(
|
| AnimatableValue::interpolate(from10.get(), to20.get(), 1).get())
|
| ->toDouble());
|
| EXPECT_EQ(
|
| - 20, toAnimatableDoubleAndBool(
|
| - AnimatableValue::interpolate(from10.get(), to20.get(), 1.5).get())
|
| - ->toDouble());
|
| + 20,
|
| + toAnimatableDoubleAndBool(
|
| + AnimatableValue::interpolate(from10.get(), to20.get(), 1.5).get())
|
| + ->toDouble());
|
| EXPECT_FALSE(
|
| toAnimatableDoubleAndBool(
|
| AnimatableValue::interpolate(from10.get(), to20.get(), 1.5).get())
|
|
|