| Index: third_party/WebKit/Source/core/animation/TimingCalculationsTest.cpp
|
| diff --git a/third_party/WebKit/Source/core/animation/TimingCalculationsTest.cpp b/third_party/WebKit/Source/core/animation/TimingCalculationsTest.cpp
|
| index f92e87aa6084e4318e683e2fa9b18cd28d947689..5dfd59ae18f6bff6623e75e83846af0ab9ab158b 100644
|
| --- a/third_party/WebKit/Source/core/animation/TimingCalculationsTest.cpp
|
| +++ b/third_party/WebKit/Source/core/animation/TimingCalculationsTest.cpp
|
| @@ -123,9 +123,10 @@ TEST(AnimationTimingCalculationsTest, ScaledActiveTime) {
|
|
|
| // infinte activeTime
|
| timing.playbackRate = 0;
|
| - EXPECT_EQ(0, calculateScaledActiveTime(
|
| - std::numeric_limits<double>::infinity(),
|
| - std::numeric_limits<double>::infinity(), 0, timing));
|
| + EXPECT_EQ(0,
|
| + calculateScaledActiveTime(std::numeric_limits<double>::infinity(),
|
| + std::numeric_limits<double>::infinity(),
|
| + 0, timing));
|
| timing.playbackRate = 1;
|
| EXPECT_EQ(std::numeric_limits<double>::infinity(),
|
| calculateScaledActiveTime(std::numeric_limits<double>::infinity(),
|
| @@ -150,22 +151,22 @@ TEST(AnimationTimingCalculationsTest, IterationTime) {
|
| 1, 1, nullValue(), 1, AnimationEffectReadOnly::PhaseActive, timing)));
|
|
|
| // if (complex-conditions)...
|
| - EXPECT_EQ(
|
| - 12, calculateIterationTime(12, 12, 12, 0,
|
| - AnimationEffectReadOnly::PhaseActive, timing));
|
| + EXPECT_EQ(12,
|
| + calculateIterationTime(
|
| + 12, 12, 12, 0, AnimationEffectReadOnly::PhaseActive, timing));
|
|
|
| // otherwise
|
| timing.iterationCount = 10;
|
| - EXPECT_EQ(
|
| - 5, calculateIterationTime(10, 100, 25, 4,
|
| - AnimationEffectReadOnly::PhaseActive, timing));
|
| - EXPECT_EQ(
|
| - 7, calculateIterationTime(11, 110, 29, 1,
|
| - AnimationEffectReadOnly::PhaseActive, timing));
|
| + EXPECT_EQ(5,
|
| + calculateIterationTime(
|
| + 10, 100, 25, 4, AnimationEffectReadOnly::PhaseActive, timing));
|
| + EXPECT_EQ(7,
|
| + calculateIterationTime(
|
| + 11, 110, 29, 1, AnimationEffectReadOnly::PhaseActive, timing));
|
| timing.iterationStart = 1.1;
|
| - EXPECT_EQ(
|
| - 8, calculateIterationTime(12, 120, 20, 7,
|
| - AnimationEffectReadOnly::PhaseActive, timing));
|
| + EXPECT_EQ(8,
|
| + calculateIterationTime(
|
| + 12, 120, 20, 7, AnimationEffectReadOnly::PhaseActive, timing));
|
| }
|
|
|
| TEST(AnimationTimingCalculationsTest, CurrentIteration) {
|
| @@ -256,10 +257,12 @@ TEST(AnimationTimingCalculationsTest, TransformedTime) {
|
|
|
| // Timing function when iterationDuration is infinity
|
| timing.direction = Timing::PlaybackDirection::NORMAL;
|
| - EXPECT_EQ(0, calculateTransformedTime(
|
| - 0, std::numeric_limits<double>::infinity(), 0, timing));
|
| - EXPECT_EQ(1, calculateTransformedTime(
|
| - 0, std::numeric_limits<double>::infinity(), 1, timing));
|
| + EXPECT_EQ(0,
|
| + calculateTransformedTime(0, std::numeric_limits<double>::infinity(),
|
| + 0, timing));
|
| + EXPECT_EQ(1,
|
| + calculateTransformedTime(0, std::numeric_limits<double>::infinity(),
|
| + 1, timing));
|
| timing.direction = Timing::PlaybackDirection::REVERSE;
|
| EXPECT_EQ(std::numeric_limits<double>::infinity(),
|
| calculateTransformedTime(0, std::numeric_limits<double>::infinity(),
|
|
|