| 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 698e5671d1a5e96f63e77c3f8e0ba40ad0a0fc5f..86d4f1810f559dee16ccf59795b66aad03f137ee 100644
|
| --- a/third_party/WebKit/Source/core/animation/TimingCalculationsTest.cpp
|
| +++ b/third_party/WebKit/Source/core/animation/TimingCalculationsTest.cpp
|
| @@ -101,20 +101,20 @@ TEST(AnimationTimingCalculationsTest, IterationTime)
|
| {
|
| Timing timing;
|
|
|
| - // calculateIterationTime(iterationDuration, repeatedDuration, scaledActiveTime, startOffset, timing)
|
| + // calculateIterationTime(iterationDuration, repeatedDuration, scaledActiveTime, startOffset, phase, timing)
|
|
|
| // if the scaled active time is null
|
| - EXPECT_TRUE(isNull(calculateIterationTime(1, 1, nullValue(), 1, timing)));
|
| + EXPECT_TRUE(isNull(calculateIterationTime(1, 1, nullValue(), 1, AnimationEffect::PhaseActive, timing)));
|
|
|
| // if (complex-conditions)...
|
| - EXPECT_EQ(12, calculateIterationTime(12, 12, 12, 0, timing));
|
| + EXPECT_EQ(12, calculateIterationTime(12, 12, 12, 0, AnimationEffect::PhaseActive, timing));
|
|
|
| // otherwise
|
| timing.iterationCount = 10;
|
| - EXPECT_EQ(5, calculateIterationTime(10, 100, 25, 4, timing));
|
| - EXPECT_EQ(7, calculateIterationTime(11, 110, 29, 1, timing));
|
| + EXPECT_EQ(5, calculateIterationTime(10, 100, 25, 4, AnimationEffect::PhaseActive, timing));
|
| + EXPECT_EQ(7, calculateIterationTime(11, 110, 29, 1, AnimationEffect::PhaseActive, timing));
|
| timing.iterationStart = 1.1;
|
| - EXPECT_EQ(8, calculateIterationTime(12, 120, 20, 7, timing));
|
| + EXPECT_EQ(8, calculateIterationTime(12, 120, 20, 7, AnimationEffect::PhaseActive, timing));
|
| }
|
|
|
| TEST(AnimationTimingCalculationsTest, CurrentIteration)
|
|
|