summaryrefslogtreecommitdiff
path: root/chromium/third_party/blink/renderer/core/animation/animation_effect_test.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2019-08-30 10:22:43 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-08-30 12:36:28 +0000
commit271a6c3487a14599023a9106329505597638d793 (patch)
treee040d58ffc86c1480b79ca8528020ca9ec919bf8 /chromium/third_party/blink/renderer/core/animation/animation_effect_test.cc
parent7b2ffa587235a47d4094787d72f38102089f402a (diff)
downloadqtwebengine-chromium-271a6c3487a14599023a9106329505597638d793.tar.gz
BASELINE: Update Chromium to 77.0.3865.59
Change-Id: I1e89a5f3b009a9519a6705102ad65c92fe736f21 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/third_party/blink/renderer/core/animation/animation_effect_test.cc')
-rw-r--r--chromium/third_party/blink/renderer/core/animation/animation_effect_test.cc64
1 files changed, 32 insertions, 32 deletions
diff --git a/chromium/third_party/blink/renderer/core/animation/animation_effect_test.cc b/chromium/third_party/blink/renderer/core/animation/animation_effect_test.cc
index 37203016513..d29b93837d7 100644
--- a/chromium/third_party/blink/renderer/core/animation/animation_effect_test.cc
+++ b/chromium/third_party/blink/renderer/core/animation/animation_effect_test.cc
@@ -130,42 +130,42 @@ TEST(AnimationAnimationEffectTest, Sanity) {
animation_node->UpdateInheritedTime(0);
- EXPECT_EQ(AnimationEffect::kPhaseActive, animation_node->GetPhase());
+ EXPECT_EQ(Timing::kPhaseActive, animation_node->GetPhase());
EXPECT_TRUE(animation_node->IsInPlay());
EXPECT_TRUE(animation_node->IsCurrent());
EXPECT_TRUE(animation_node->IsInEffect());
EXPECT_EQ(0, animation_node->CurrentIteration());
- EXPECT_EQ(2, animation_node->RepeatedDuration());
+ EXPECT_EQ(2, animation_node->SpecifiedTiming().ActiveDuration());
EXPECT_EQ(0, animation_node->Progress());
animation_node->UpdateInheritedTime(1);
- EXPECT_EQ(AnimationEffect::kPhaseActive, animation_node->GetPhase());
+ EXPECT_EQ(Timing::kPhaseActive, animation_node->GetPhase());
EXPECT_TRUE(animation_node->IsInPlay());
EXPECT_TRUE(animation_node->IsCurrent());
EXPECT_TRUE(animation_node->IsInEffect());
EXPECT_EQ(0, animation_node->CurrentIteration());
- EXPECT_EQ(2, animation_node->RepeatedDuration());
+ EXPECT_EQ(2, animation_node->SpecifiedTiming().ActiveDuration());
EXPECT_EQ(0.5, animation_node->Progress());
animation_node->UpdateInheritedTime(2);
- EXPECT_EQ(AnimationEffect::kPhaseAfter, animation_node->GetPhase());
+ EXPECT_EQ(Timing::kPhaseAfter, animation_node->GetPhase());
EXPECT_FALSE(animation_node->IsInPlay());
EXPECT_FALSE(animation_node->IsCurrent());
EXPECT_TRUE(animation_node->IsInEffect());
EXPECT_EQ(0, animation_node->CurrentIteration());
- EXPECT_EQ(2, animation_node->RepeatedDuration());
+ EXPECT_EQ(2, animation_node->SpecifiedTiming().ActiveDuration());
EXPECT_EQ(1, animation_node->Progress());
animation_node->UpdateInheritedTime(3);
- EXPECT_EQ(AnimationEffect::kPhaseAfter, animation_node->GetPhase());
+ EXPECT_EQ(Timing::kPhaseAfter, animation_node->GetPhase());
EXPECT_FALSE(animation_node->IsInPlay());
EXPECT_FALSE(animation_node->IsCurrent());
EXPECT_TRUE(animation_node->IsInEffect());
EXPECT_EQ(0, animation_node->CurrentIteration());
- EXPECT_EQ(2, animation_node->RepeatedDuration());
+ EXPECT_EQ(2, animation_node->SpecifiedTiming().ActiveDuration());
EXPECT_EQ(1, animation_node->Progress());
}
@@ -245,12 +245,12 @@ TEST(AnimationAnimationEffectTest, ZeroIteration) {
auto* animation_node = MakeGarbageCollected<TestAnimationEffect>(timing);
animation_node->UpdateInheritedTime(-1);
- EXPECT_EQ(0, animation_node->RepeatedDuration());
+ EXPECT_EQ(0, animation_node->SpecifiedTiming().ActiveDuration());
EXPECT_TRUE(IsNull(animation_node->CurrentIteration()));
EXPECT_FALSE(animation_node->Progress());
animation_node->UpdateInheritedTime(0);
- EXPECT_EQ(0, animation_node->RepeatedDuration());
+ EXPECT_EQ(0, animation_node->SpecifiedTiming().ActiveDuration());
EXPECT_EQ(0, animation_node->CurrentIteration());
EXPECT_EQ(0, animation_node->Progress());
}
@@ -267,7 +267,7 @@ TEST(AnimationAnimationEffectTest, InfiniteIteration) {
EXPECT_FALSE(animation_node->Progress());
EXPECT_EQ(std::numeric_limits<double>::infinity(),
- animation_node->RepeatedDuration());
+ animation_node->SpecifiedTiming().ActiveDuration());
animation_node->UpdateInheritedTime(0);
EXPECT_EQ(0, animation_node->CurrentIteration());
@@ -368,22 +368,22 @@ TEST(AnimationAnimationEffectTest, ZeroDurationSanity) {
animation_node->UpdateInheritedTime(0);
- EXPECT_EQ(AnimationEffect::kPhaseAfter, animation_node->GetPhase());
+ EXPECT_EQ(Timing::kPhaseAfter, animation_node->GetPhase());
EXPECT_FALSE(animation_node->IsInPlay());
EXPECT_FALSE(animation_node->IsCurrent());
EXPECT_TRUE(animation_node->IsInEffect());
EXPECT_EQ(0, animation_node->CurrentIteration());
- EXPECT_EQ(0, animation_node->RepeatedDuration());
+ EXPECT_EQ(0, animation_node->SpecifiedTiming().ActiveDuration());
EXPECT_EQ(1, animation_node->Progress());
animation_node->UpdateInheritedTime(1);
- EXPECT_EQ(AnimationEffect::kPhaseAfter, animation_node->GetPhase());
+ EXPECT_EQ(Timing::kPhaseAfter, animation_node->GetPhase());
EXPECT_FALSE(animation_node->IsInPlay());
EXPECT_FALSE(animation_node->IsCurrent());
EXPECT_TRUE(animation_node->IsInEffect());
EXPECT_EQ(0, animation_node->CurrentIteration());
- EXPECT_EQ(0, animation_node->RepeatedDuration());
+ EXPECT_EQ(0, animation_node->SpecifiedTiming().ActiveDuration());
EXPECT_EQ(1, animation_node->Progress());
}
@@ -474,12 +474,12 @@ TEST(AnimationAnimationEffectTest, ZeroDurationInfiniteIteration) {
auto* animation_node = MakeGarbageCollected<TestAnimationEffect>(timing);
animation_node->UpdateInheritedTime(-1);
- EXPECT_EQ(0, animation_node->RepeatedDuration());
+ EXPECT_EQ(0, animation_node->SpecifiedTiming().ActiveDuration());
EXPECT_TRUE(IsNull(animation_node->CurrentIteration()));
EXPECT_FALSE(animation_node->Progress());
animation_node->UpdateInheritedTime(0);
- EXPECT_EQ(0, animation_node->RepeatedDuration());
+ EXPECT_EQ(0, animation_node->SpecifiedTiming().ActiveDuration());
EXPECT_EQ(std::numeric_limits<double>::infinity(),
animation_node->CurrentIteration());
EXPECT_EQ(1, animation_node->Progress());
@@ -573,8 +573,8 @@ TEST(AnimationAnimationEffectTest, InfiniteDurationSanity) {
animation_node->UpdateInheritedTime(0);
EXPECT_EQ(std::numeric_limits<double>::infinity(),
- animation_node->RepeatedDuration());
- EXPECT_EQ(AnimationEffect::kPhaseActive, animation_node->GetPhase());
+ animation_node->SpecifiedTiming().ActiveDuration());
+ EXPECT_EQ(Timing::kPhaseActive, animation_node->GetPhase());
EXPECT_TRUE(animation_node->IsInPlay());
EXPECT_TRUE(animation_node->IsCurrent());
EXPECT_TRUE(animation_node->IsInEffect());
@@ -584,8 +584,8 @@ TEST(AnimationAnimationEffectTest, InfiniteDurationSanity) {
animation_node->UpdateInheritedTime(1);
EXPECT_EQ(std::numeric_limits<double>::infinity(),
- animation_node->RepeatedDuration());
- EXPECT_EQ(AnimationEffect::kPhaseActive, animation_node->GetPhase());
+ animation_node->SpecifiedTiming().ActiveDuration());
+ EXPECT_EQ(Timing::kPhaseActive, animation_node->GetPhase());
EXPECT_TRUE(animation_node->IsInPlay());
EXPECT_TRUE(animation_node->IsCurrent());
EXPECT_TRUE(animation_node->IsInEffect());
@@ -602,8 +602,8 @@ TEST(AnimationAnimationEffectTest, InfiniteDurationZeroIterations) {
animation_node->UpdateInheritedTime(0);
- EXPECT_EQ(0, animation_node->RepeatedDuration());
- EXPECT_EQ(AnimationEffect::kPhaseAfter, animation_node->GetPhase());
+ EXPECT_EQ(0, animation_node->SpecifiedTiming().ActiveDuration());
+ EXPECT_EQ(Timing::kPhaseAfter, animation_node->GetPhase());
EXPECT_FALSE(animation_node->IsInPlay());
EXPECT_FALSE(animation_node->IsCurrent());
EXPECT_TRUE(animation_node->IsInEffect());
@@ -612,8 +612,8 @@ TEST(AnimationAnimationEffectTest, InfiniteDurationZeroIterations) {
animation_node->UpdateInheritedTime(1);
- EXPECT_EQ(AnimationEffect::kPhaseAfter, animation_node->GetPhase());
- EXPECT_EQ(AnimationEffect::kPhaseAfter, animation_node->GetPhase());
+ EXPECT_EQ(Timing::kPhaseAfter, animation_node->GetPhase());
+ EXPECT_EQ(Timing::kPhaseAfter, animation_node->GetPhase());
EXPECT_FALSE(animation_node->IsInPlay());
EXPECT_FALSE(animation_node->IsCurrent());
EXPECT_TRUE(animation_node->IsInEffect());
@@ -630,8 +630,8 @@ TEST(AnimationAnimationEffectTest, InfiniteDurationInfiniteIterations) {
animation_node->UpdateInheritedTime(0);
EXPECT_EQ(std::numeric_limits<double>::infinity(),
- animation_node->RepeatedDuration());
- EXPECT_EQ(AnimationEffect::kPhaseActive, animation_node->GetPhase());
+ animation_node->SpecifiedTiming().ActiveDuration());
+ EXPECT_EQ(Timing::kPhaseActive, animation_node->GetPhase());
EXPECT_TRUE(animation_node->IsInPlay());
EXPECT_TRUE(animation_node->IsCurrent());
EXPECT_TRUE(animation_node->IsInEffect());
@@ -641,8 +641,8 @@ TEST(AnimationAnimationEffectTest, InfiniteDurationInfiniteIterations) {
animation_node->UpdateInheritedTime(1);
EXPECT_EQ(std::numeric_limits<double>::infinity(),
- animation_node->RepeatedDuration());
- EXPECT_EQ(AnimationEffect::kPhaseActive, animation_node->GetPhase());
+ animation_node->SpecifiedTiming().ActiveDuration());
+ EXPECT_EQ(Timing::kPhaseActive, animation_node->GetPhase());
EXPECT_TRUE(animation_node->IsInPlay());
EXPECT_TRUE(animation_node->IsCurrent());
EXPECT_TRUE(animation_node->IsInEffect());
@@ -657,7 +657,7 @@ TEST(AnimationAnimationEffectTest, EndTime) {
timing.iteration_duration = AnimationTimeDelta::FromSecondsD(4);
timing.iteration_count = 2;
auto* animation_node = MakeGarbageCollected<TestAnimationEffect>(timing);
- EXPECT_EQ(11, animation_node->EndTimeInternal());
+ EXPECT_EQ(11, animation_node->SpecifiedTiming().EndTimeInternal());
}
TEST(AnimationAnimationEffectTest, Events) {
@@ -709,13 +709,13 @@ TEST(AnimationAnimationEffectTest, TimeToEffectChange) {
// Item ends before iteration finishes.
animation_node->UpdateInheritedTime(3.4);
- EXPECT_EQ(AnimationEffect::kPhaseActive, animation_node->GetPhase());
+ EXPECT_EQ(Timing::kPhaseActive, animation_node->GetPhase());
EXPECT_EQ(3.4, animation_node->TakeLocalTime());
EXPECT_TRUE(std::isinf(animation_node->TakeTimeToNextIteration()));
// Item has finished.
animation_node->UpdateInheritedTime(3.5);
- EXPECT_EQ(AnimationEffect::kPhaseAfter, animation_node->GetPhase());
+ EXPECT_EQ(Timing::kPhaseAfter, animation_node->GetPhase());
EXPECT_EQ(3.5, animation_node->TakeLocalTime());
EXPECT_TRUE(std::isinf(animation_node->TakeTimeToNextIteration()));
}