Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Unified Diff: third_party/WebKit/Source/core/animation/TimingCalculationsTest.cpp

Issue 2236583003: Rename AnimationEffect to AnimationEffectReadOnly (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@deprecated-assert
Patch Set: Rebase Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 4b758181c3c40d83706236dc67531d19f093017b..1ef102215ae40bea9fb2acfe0403ed3e9d24b269 100644
--- a/third_party/WebKit/Source/core/animation/TimingCalculationsTest.cpp
+++ b/third_party/WebKit/Source/core/animation/TimingCalculationsTest.cpp
@@ -42,31 +42,31 @@ TEST(AnimationTimingCalculationsTest, ActiveTime)
// Before Phase
timing.startDelay = 10;
- EXPECT_TRUE(isNull(calculateActiveTime(20, Timing::FillMode::FORWARDS, 0, AnimationEffect::PhaseActive, AnimationEffect::PhaseBefore, timing)));
- EXPECT_TRUE(isNull(calculateActiveTime(20, Timing::FillMode::NONE, 0, AnimationEffect::PhaseActive, AnimationEffect::PhaseBefore, timing)));
- EXPECT_EQ(0, calculateActiveTime(20, Timing::FillMode::BACKWARDS, 0, AnimationEffect::PhaseActive, AnimationEffect::PhaseBefore, timing));
- EXPECT_EQ(0, calculateActiveTime(20, Timing::FillMode::BOTH, 0, AnimationEffect::PhaseActive, AnimationEffect::PhaseBefore, timing));
+ EXPECT_TRUE(isNull(calculateActiveTime(20, Timing::FillMode::FORWARDS, 0, AnimationEffectReadOnly::PhaseActive, AnimationEffectReadOnly::PhaseBefore, timing)));
+ EXPECT_TRUE(isNull(calculateActiveTime(20, Timing::FillMode::NONE, 0, AnimationEffectReadOnly::PhaseActive, AnimationEffectReadOnly::PhaseBefore, timing)));
+ EXPECT_EQ(0, calculateActiveTime(20, Timing::FillMode::BACKWARDS, 0, AnimationEffectReadOnly::PhaseActive, AnimationEffectReadOnly::PhaseBefore, timing));
+ EXPECT_EQ(0, calculateActiveTime(20, Timing::FillMode::BOTH, 0, AnimationEffectReadOnly::PhaseActive, AnimationEffectReadOnly::PhaseBefore, timing));
// Active Phase
timing.startDelay = 10;
// Active, and parent Before
- EXPECT_TRUE(isNull(calculateActiveTime(20, Timing::FillMode::NONE, 15, AnimationEffect::PhaseBefore, AnimationEffect::PhaseActive, timing)));
- EXPECT_TRUE(isNull(calculateActiveTime(20, Timing::FillMode::FORWARDS, 15, AnimationEffect::PhaseBefore, AnimationEffect::PhaseActive, timing)));
+ EXPECT_TRUE(isNull(calculateActiveTime(20, Timing::FillMode::NONE, 15, AnimationEffectReadOnly::PhaseBefore, AnimationEffectReadOnly::PhaseActive, timing)));
+ EXPECT_TRUE(isNull(calculateActiveTime(20, Timing::FillMode::FORWARDS, 15, AnimationEffectReadOnly::PhaseBefore, AnimationEffectReadOnly::PhaseActive, timing)));
// Active, and parent After
- EXPECT_TRUE(isNull(calculateActiveTime(20, Timing::FillMode::NONE, 15, AnimationEffect::PhaseAfter, AnimationEffect::PhaseActive, timing)));
- EXPECT_TRUE(isNull(calculateActiveTime(20, Timing::FillMode::BACKWARDS, 15, AnimationEffect::PhaseAfter, AnimationEffect::PhaseActive, timing)));
+ EXPECT_TRUE(isNull(calculateActiveTime(20, Timing::FillMode::NONE, 15, AnimationEffectReadOnly::PhaseAfter, AnimationEffectReadOnly::PhaseActive, timing)));
+ EXPECT_TRUE(isNull(calculateActiveTime(20, Timing::FillMode::BACKWARDS, 15, AnimationEffectReadOnly::PhaseAfter, AnimationEffectReadOnly::PhaseActive, timing)));
// Active, and parent Active
- EXPECT_EQ(5, calculateActiveTime(20, Timing::FillMode::FORWARDS, 15, AnimationEffect::PhaseActive, AnimationEffect::PhaseActive, timing));
+ EXPECT_EQ(5, calculateActiveTime(20, Timing::FillMode::FORWARDS, 15, AnimationEffectReadOnly::PhaseActive, AnimationEffectReadOnly::PhaseActive, timing));
// After Phase
timing.startDelay = 10;
- EXPECT_EQ(21, calculateActiveTime(21, Timing::FillMode::FORWARDS, 45, AnimationEffect::PhaseActive, AnimationEffect::PhaseAfter, timing));
- EXPECT_EQ(21, calculateActiveTime(21, Timing::FillMode::BOTH, 45, AnimationEffect::PhaseActive, AnimationEffect::PhaseAfter, timing));
- EXPECT_TRUE(isNull(calculateActiveTime(21, Timing::FillMode::BACKWARDS, 45, AnimationEffect::PhaseActive, AnimationEffect::PhaseAfter, timing)));
- EXPECT_TRUE(isNull(calculateActiveTime(21, Timing::FillMode::NONE, 45, AnimationEffect::PhaseActive, AnimationEffect::PhaseAfter, timing)));
+ EXPECT_EQ(21, calculateActiveTime(21, Timing::FillMode::FORWARDS, 45, AnimationEffectReadOnly::PhaseActive, AnimationEffectReadOnly::PhaseAfter, timing));
+ EXPECT_EQ(21, calculateActiveTime(21, Timing::FillMode::BOTH, 45, AnimationEffectReadOnly::PhaseActive, AnimationEffectReadOnly::PhaseAfter, timing));
+ EXPECT_TRUE(isNull(calculateActiveTime(21, Timing::FillMode::BACKWARDS, 45, AnimationEffectReadOnly::PhaseActive, AnimationEffectReadOnly::PhaseAfter, timing)));
+ EXPECT_TRUE(isNull(calculateActiveTime(21, Timing::FillMode::NONE, 45, AnimationEffectReadOnly::PhaseActive, AnimationEffectReadOnly::PhaseAfter, timing)));
// None
- EXPECT_TRUE(isNull(calculateActiveTime(32, Timing::FillMode::NONE, nullValue(), AnimationEffect::PhaseNone, AnimationEffect::PhaseNone, timing)));
+ EXPECT_TRUE(isNull(calculateActiveTime(32, Timing::FillMode::NONE, nullValue(), AnimationEffectReadOnly::PhaseNone, AnimationEffectReadOnly::PhaseNone, timing)));
}
TEST(AnimationTimingCalculationsTest, ScaledActiveTime)
@@ -104,17 +104,17 @@ TEST(AnimationTimingCalculationsTest, IterationTime)
// calculateIterationTime(iterationDuration, repeatedDuration, scaledActiveTime, startOffset, phase, timing)
// if the scaled active time is null
- EXPECT_TRUE(isNull(calculateIterationTime(1, 1, nullValue(), 1, AnimationEffect::PhaseActive, timing)));
+ EXPECT_TRUE(isNull(calculateIterationTime(1, 1, nullValue(), 1, AnimationEffectReadOnly::PhaseActive, timing)));
// if (complex-conditions)...
- EXPECT_EQ(12, calculateIterationTime(12, 12, 12, 0, AnimationEffect::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, AnimationEffect::PhaseActive, timing));
- EXPECT_EQ(7, calculateIterationTime(11, 110, 29, 1, AnimationEffect::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, AnimationEffect::PhaseActive, timing));
+ EXPECT_EQ(8, calculateIterationTime(12, 120, 20, 7, AnimationEffectReadOnly::PhaseActive, timing));
}
TEST(AnimationTimingCalculationsTest, CurrentIteration)

Powered by Google App Engine
This is Rietveld 408576698