diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-07-31 15:50:41 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-08-30 12:35:23 +0000 |
commit | 7b2ffa587235a47d4094787d72f38102089f402a (patch) | |
tree | 30e82af9cbab08a7fa028bb18f4f2987a3f74dfa /chromium/third_party/blink/renderer/core/animation/animation_effect_test.cc | |
parent | d94af01c90575348c4e81a418257f254b6f8d225 (diff) | |
download | qtwebengine-chromium-7b2ffa587235a47d4094787d72f38102089f402a.tar.gz |
BASELINE: Update Chromium to 76.0.3809.94
Change-Id: I321c3f5f929c105aec0f98c5091ef6108822e647
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.cc | 78 |
1 files changed, 38 insertions, 40 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 60805f61f30..37203016513 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 @@ -35,6 +35,7 @@ #include "third_party/blink/renderer/core/animation/animation_effect_owner.h" #include "third_party/blink/renderer/core/animation/computed_effect_timing.h" #include "third_party/blink/renderer/core/animation/optional_effect_timing.h" +#include "third_party/blink/renderer/platform/heap/heap.h" namespace blink { @@ -70,13 +71,10 @@ class TestAnimationEffectEventDelegate : public AnimationEffect::EventDelegate { class TestAnimationEffect : public AnimationEffect { public: - static TestAnimationEffect* Create(const Timing& specified) { - return MakeGarbageCollected<TestAnimationEffect>( - specified, MakeGarbageCollected<TestAnimationEffectEventDelegate>()); - } - - TestAnimationEffect(const Timing& specified, - TestAnimationEffectEventDelegate* event_delegate) + TestAnimationEffect( + const Timing& specified, + TestAnimationEffectEventDelegate* event_delegate = + MakeGarbageCollected<TestAnimationEffectEventDelegate>()) : AnimationEffect(specified, event_delegate), event_delegate_(event_delegate) {} @@ -128,7 +126,7 @@ class TestAnimationEffect : public AnimationEffect { TEST(AnimationAnimationEffectTest, Sanity) { Timing timing; timing.iteration_duration = AnimationTimeDelta::FromSecondsD(2); - TestAnimationEffect* animation_node = TestAnimationEffect::Create(timing); + auto* animation_node = MakeGarbageCollected<TestAnimationEffect>(timing); animation_node->UpdateInheritedTime(0); @@ -174,7 +172,7 @@ TEST(AnimationAnimationEffectTest, Sanity) { TEST(AnimationAnimationEffectTest, FillAuto) { Timing timing; timing.iteration_duration = AnimationTimeDelta::FromSecondsD(1); - TestAnimationEffect* animation_node = TestAnimationEffect::Create(timing); + auto* animation_node = MakeGarbageCollected<TestAnimationEffect>(timing); animation_node->UpdateInheritedTime(-1); EXPECT_EQ(0, animation_node->Progress()); @@ -187,7 +185,7 @@ TEST(AnimationAnimationEffectTest, FillForwards) { Timing timing; timing.iteration_duration = AnimationTimeDelta::FromSecondsD(1); timing.fill_mode = Timing::FillMode::FORWARDS; - TestAnimationEffect* animation_node = TestAnimationEffect::Create(timing); + auto* animation_node = MakeGarbageCollected<TestAnimationEffect>(timing); animation_node->UpdateInheritedTime(-1); EXPECT_FALSE(animation_node->Progress()); @@ -200,7 +198,7 @@ TEST(AnimationAnimationEffectTest, FillBackwards) { Timing timing; timing.iteration_duration = AnimationTimeDelta::FromSecondsD(1); timing.fill_mode = Timing::FillMode::BACKWARDS; - TestAnimationEffect* animation_node = TestAnimationEffect::Create(timing); + auto* animation_node = MakeGarbageCollected<TestAnimationEffect>(timing); animation_node->UpdateInheritedTime(-1); EXPECT_EQ(0, animation_node->Progress()); @@ -213,7 +211,7 @@ TEST(AnimationAnimationEffectTest, FillBoth) { Timing timing; timing.iteration_duration = AnimationTimeDelta::FromSecondsD(1); timing.fill_mode = Timing::FillMode::BOTH; - TestAnimationEffect* animation_node = TestAnimationEffect::Create(timing); + auto* animation_node = MakeGarbageCollected<TestAnimationEffect>(timing); animation_node->UpdateInheritedTime(-1); EXPECT_EQ(0, animation_node->Progress()); @@ -227,7 +225,7 @@ TEST(AnimationAnimationEffectTest, StartDelay) { timing.iteration_duration = AnimationTimeDelta::FromSecondsD(1); timing.fill_mode = Timing::FillMode::FORWARDS; timing.start_delay = 0.5; - TestAnimationEffect* animation_node = TestAnimationEffect::Create(timing); + auto* animation_node = MakeGarbageCollected<TestAnimationEffect>(timing); animation_node->UpdateInheritedTime(0); EXPECT_FALSE(animation_node->Progress()); @@ -244,7 +242,7 @@ TEST(AnimationAnimationEffectTest, ZeroIteration) { timing.iteration_duration = AnimationTimeDelta::FromSecondsD(1); timing.fill_mode = Timing::FillMode::FORWARDS; timing.iteration_count = 0; - TestAnimationEffect* animation_node = TestAnimationEffect::Create(timing); + auto* animation_node = MakeGarbageCollected<TestAnimationEffect>(timing); animation_node->UpdateInheritedTime(-1); EXPECT_EQ(0, animation_node->RepeatedDuration()); @@ -262,7 +260,7 @@ TEST(AnimationAnimationEffectTest, InfiniteIteration) { timing.iteration_duration = AnimationTimeDelta::FromSecondsD(1); timing.fill_mode = Timing::FillMode::FORWARDS; timing.iteration_count = std::numeric_limits<double>::infinity(); - TestAnimationEffect* animation_node = TestAnimationEffect::Create(timing); + auto* animation_node = MakeGarbageCollected<TestAnimationEffect>(timing); animation_node->UpdateInheritedTime(-1); EXPECT_TRUE(IsNull(animation_node->CurrentIteration())); @@ -280,7 +278,7 @@ TEST(AnimationAnimationEffectTest, Iteration) { Timing timing; timing.iteration_count = 2; timing.iteration_duration = AnimationTimeDelta::FromSecondsD(2); - TestAnimationEffect* animation_node = TestAnimationEffect::Create(timing); + auto* animation_node = MakeGarbageCollected<TestAnimationEffect>(timing); animation_node->UpdateInheritedTime(0); EXPECT_EQ(0, animation_node->CurrentIteration()); @@ -309,7 +307,7 @@ TEST(AnimationAnimationEffectTest, IterationStart) { timing.iteration_count = 2.2; timing.iteration_duration = AnimationTimeDelta::FromSecondsD(1); timing.fill_mode = Timing::FillMode::BOTH; - TestAnimationEffect* animation_node = TestAnimationEffect::Create(timing); + auto* animation_node = MakeGarbageCollected<TestAnimationEffect>(timing); animation_node->UpdateInheritedTime(-1); EXPECT_EQ(1, animation_node->CurrentIteration()); @@ -329,7 +327,7 @@ TEST(AnimationAnimationEffectTest, IterationAlternate) { timing.iteration_count = 10; timing.iteration_duration = AnimationTimeDelta::FromSecondsD(1); timing.direction = Timing::PlaybackDirection::ALTERNATE_NORMAL; - TestAnimationEffect* animation_node = TestAnimationEffect::Create(timing); + auto* animation_node = MakeGarbageCollected<TestAnimationEffect>(timing); animation_node->UpdateInheritedTime(0.75); EXPECT_EQ(0, animation_node->CurrentIteration()); @@ -349,7 +347,7 @@ TEST(AnimationAnimationEffectTest, IterationAlternateReverse) { timing.iteration_count = 10; timing.iteration_duration = AnimationTimeDelta::FromSecondsD(1); timing.direction = Timing::PlaybackDirection::ALTERNATE_REVERSE; - TestAnimationEffect* animation_node = TestAnimationEffect::Create(timing); + auto* animation_node = MakeGarbageCollected<TestAnimationEffect>(timing); animation_node->UpdateInheritedTime(0.75); EXPECT_EQ(0, animation_node->CurrentIteration()); @@ -366,7 +364,7 @@ TEST(AnimationAnimationEffectTest, IterationAlternateReverse) { TEST(AnimationAnimationEffectTest, ZeroDurationSanity) { Timing timing; - TestAnimationEffect* animation_node = TestAnimationEffect::Create(timing); + auto* animation_node = MakeGarbageCollected<TestAnimationEffect>(timing); animation_node->UpdateInheritedTime(0); @@ -392,7 +390,7 @@ TEST(AnimationAnimationEffectTest, ZeroDurationSanity) { TEST(AnimationAnimationEffectTest, ZeroDurationFillForwards) { Timing timing; timing.fill_mode = Timing::FillMode::FORWARDS; - TestAnimationEffect* animation_node = TestAnimationEffect::Create(timing); + auto* animation_node = MakeGarbageCollected<TestAnimationEffect>(timing); animation_node->UpdateInheritedTime(-1); EXPECT_FALSE(animation_node->Progress()); @@ -407,7 +405,7 @@ TEST(AnimationAnimationEffectTest, ZeroDurationFillForwards) { TEST(AnimationAnimationEffectTest, ZeroDurationFillBackwards) { Timing timing; timing.fill_mode = Timing::FillMode::BACKWARDS; - TestAnimationEffect* animation_node = TestAnimationEffect::Create(timing); + auto* animation_node = MakeGarbageCollected<TestAnimationEffect>(timing); animation_node->UpdateInheritedTime(-1); EXPECT_EQ(0, animation_node->Progress()); @@ -422,7 +420,7 @@ TEST(AnimationAnimationEffectTest, ZeroDurationFillBackwards) { TEST(AnimationAnimationEffectTest, ZeroDurationFillBoth) { Timing timing; timing.fill_mode = Timing::FillMode::BOTH; - TestAnimationEffect* animation_node = TestAnimationEffect::Create(timing); + auto* animation_node = MakeGarbageCollected<TestAnimationEffect>(timing); animation_node->UpdateInheritedTime(-1); EXPECT_EQ(0, animation_node->Progress()); @@ -438,7 +436,7 @@ TEST(AnimationAnimationEffectTest, ZeroDurationStartDelay) { Timing timing; timing.fill_mode = Timing::FillMode::FORWARDS; timing.start_delay = 0.5; - TestAnimationEffect* animation_node = TestAnimationEffect::Create(timing); + auto* animation_node = MakeGarbageCollected<TestAnimationEffect>(timing); animation_node->UpdateInheritedTime(0); EXPECT_FALSE(animation_node->Progress()); @@ -456,7 +454,7 @@ TEST(AnimationAnimationEffectTest, ZeroDurationIterationStartAndCount) { timing.iteration_count = 0.2; timing.fill_mode = Timing::FillMode::BOTH; timing.start_delay = 0.3; - TestAnimationEffect* animation_node = TestAnimationEffect::Create(timing); + auto* animation_node = MakeGarbageCollected<TestAnimationEffect>(timing); animation_node->UpdateInheritedTime(0); EXPECT_EQ(0.1, animation_node->Progress()); @@ -473,7 +471,7 @@ TEST(AnimationAnimationEffectTest, ZeroDurationInfiniteIteration) { Timing timing; timing.fill_mode = Timing::FillMode::FORWARDS; timing.iteration_count = std::numeric_limits<double>::infinity(); - TestAnimationEffect* animation_node = TestAnimationEffect::Create(timing); + auto* animation_node = MakeGarbageCollected<TestAnimationEffect>(timing); animation_node->UpdateInheritedTime(-1); EXPECT_EQ(0, animation_node->RepeatedDuration()); @@ -491,7 +489,7 @@ TEST(AnimationAnimationEffectTest, ZeroDurationIteration) { Timing timing; timing.fill_mode = Timing::FillMode::FORWARDS; timing.iteration_count = 2; - TestAnimationEffect* animation_node = TestAnimationEffect::Create(timing); + auto* animation_node = MakeGarbageCollected<TestAnimationEffect>(timing); animation_node->UpdateInheritedTime(-1); EXPECT_TRUE(IsNull(animation_node->CurrentIteration())); @@ -511,7 +509,7 @@ TEST(AnimationAnimationEffectTest, ZeroDurationIterationStart) { timing.iteration_start = 1.2; timing.iteration_count = 2.2; timing.fill_mode = Timing::FillMode::BOTH; - TestAnimationEffect* animation_node = TestAnimationEffect::Create(timing); + auto* animation_node = MakeGarbageCollected<TestAnimationEffect>(timing); animation_node->UpdateInheritedTime(-1); EXPECT_EQ(1, animation_node->CurrentIteration()); @@ -531,7 +529,7 @@ TEST(AnimationAnimationEffectTest, ZeroDurationIterationAlternate) { timing.fill_mode = Timing::FillMode::FORWARDS; timing.iteration_count = 2; timing.direction = Timing::PlaybackDirection::ALTERNATE_NORMAL; - TestAnimationEffect* animation_node = TestAnimationEffect::Create(timing); + auto* animation_node = MakeGarbageCollected<TestAnimationEffect>(timing); animation_node->UpdateInheritedTime(-1); EXPECT_TRUE(IsNull(animation_node->CurrentIteration())); @@ -551,7 +549,7 @@ TEST(AnimationAnimationEffectTest, ZeroDurationIterationAlternateReverse) { timing.fill_mode = Timing::FillMode::FORWARDS; timing.iteration_count = 2; timing.direction = Timing::PlaybackDirection::ALTERNATE_REVERSE; - TestAnimationEffect* animation_node = TestAnimationEffect::Create(timing); + auto* animation_node = MakeGarbageCollected<TestAnimationEffect>(timing); animation_node->UpdateInheritedTime(-1); EXPECT_TRUE(IsNull(animation_node->CurrentIteration())); @@ -570,7 +568,7 @@ TEST(AnimationAnimationEffectTest, InfiniteDurationSanity) { Timing timing; timing.iteration_duration = AnimationTimeDelta::Max(); timing.iteration_count = 1; - TestAnimationEffect* animation_node = TestAnimationEffect::Create(timing); + auto* animation_node = MakeGarbageCollected<TestAnimationEffect>(timing); animation_node->UpdateInheritedTime(0); @@ -600,7 +598,7 @@ TEST(AnimationAnimationEffectTest, InfiniteDurationZeroIterations) { Timing timing; timing.iteration_duration = AnimationTimeDelta::Max(); timing.iteration_count = 0; - TestAnimationEffect* animation_node = TestAnimationEffect::Create(timing); + auto* animation_node = MakeGarbageCollected<TestAnimationEffect>(timing); animation_node->UpdateInheritedTime(0); @@ -627,7 +625,7 @@ TEST(AnimationAnimationEffectTest, InfiniteDurationInfiniteIterations) { Timing timing; timing.iteration_duration = AnimationTimeDelta::Max(); timing.iteration_count = std::numeric_limits<double>::infinity(); - TestAnimationEffect* animation_node = TestAnimationEffect::Create(timing); + auto* animation_node = MakeGarbageCollected<TestAnimationEffect>(timing); animation_node->UpdateInheritedTime(0); @@ -658,7 +656,7 @@ TEST(AnimationAnimationEffectTest, EndTime) { timing.end_delay = 2; timing.iteration_duration = AnimationTimeDelta::FromSecondsD(4); timing.iteration_count = 2; - TestAnimationEffect* animation_node = TestAnimationEffect::Create(timing); + auto* animation_node = MakeGarbageCollected<TestAnimationEffect>(timing); EXPECT_EQ(11, animation_node->EndTimeInternal()); } @@ -668,7 +666,7 @@ TEST(AnimationAnimationEffectTest, Events) { timing.fill_mode = Timing::FillMode::FORWARDS; timing.iteration_count = 2; timing.start_delay = 1; - TestAnimationEffect* animation_node = TestAnimationEffect::Create(timing); + auto* animation_node = MakeGarbageCollected<TestAnimationEffect>(timing); animation_node->UpdateInheritedTime(0.0, kTimingUpdateOnDemand); EXPECT_FALSE(animation_node->EventDelegate()->EventTriggered()); @@ -691,7 +689,7 @@ TEST(AnimationAnimationEffectTest, TimeToEffectChange) { timing.iteration_count = 2.5; timing.start_delay = 1; timing.direction = Timing::PlaybackDirection::ALTERNATE_NORMAL; - TestAnimationEffect* animation_node = TestAnimationEffect::Create(timing); + auto* animation_node = MakeGarbageCollected<TestAnimationEffect>(timing); animation_node->UpdateInheritedTime(0); EXPECT_EQ(0, animation_node->TakeLocalTime()); @@ -724,7 +722,7 @@ TEST(AnimationAnimationEffectTest, TimeToEffectChange) { TEST(AnimationAnimationEffectTest, UpdateTiming) { Timing timing; - TestAnimationEffect* effect = TestAnimationEffect::Create(timing); + auto* effect = MakeGarbageCollected<TestAnimationEffect>(timing); EXPECT_EQ(0, effect->getTiming()->delay()); OptionalEffectTiming* effect_timing = OptionalEffectTiming::Create(); @@ -778,7 +776,7 @@ TEST(AnimationAnimationEffectTest, UpdateTiming) { TEST(AnimationAnimationEffectTest, UpdateTimingThrowsWhenExpected) { Timing timing; - TestAnimationEffect* effect = TestAnimationEffect::Create(timing); + auto* effect = MakeGarbageCollected<TestAnimationEffect>(timing); DummyExceptionStateForTesting exception_state; @@ -826,7 +824,7 @@ TEST(AnimationAnimationEffectTest, UpdateTimingThrowsWhenExpected) { TEST(AnimationAnimationEffectTest, UpdateTimingInformsOwnerOnChange) { Timing timing; - TestAnimationEffect* effect = TestAnimationEffect::Create(timing); + auto* effect = MakeGarbageCollected<TestAnimationEffect>(timing); MockAnimationEffectOwner* owner = MakeGarbageCollected<MockAnimationEffectOwner>(); @@ -849,7 +847,7 @@ TEST(AnimationAnimationEffectTest, UpdateTimingNoChange) { timing.iteration_duration = AnimationTimeDelta::FromSecondsD(2); timing.direction = Timing::PlaybackDirection::ALTERNATE_REVERSE; timing.timing_function = CubicBezierTimingFunction::Create(1, 1, 0.3, 0.3); - TestAnimationEffect* effect = TestAnimationEffect::Create(timing); + auto* effect = MakeGarbageCollected<TestAnimationEffect>(timing); MockAnimationEffectOwner* owner = MakeGarbageCollected<MockAnimationEffectOwner>(); |