diff options
Diffstat (limited to 'chromium/third_party/blink/renderer/core/animation/effect_stack_test.cc')
-rw-r--r-- | chromium/third_party/blink/renderer/core/animation/effect_stack_test.cc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/chromium/third_party/blink/renderer/core/animation/effect_stack_test.cc b/chromium/third_party/blink/renderer/core/animation/effect_stack_test.cc index 8f4e6bc8ea5..f662694c1a6 100644 --- a/chromium/third_party/blink/renderer/core/animation/effect_stack_test.cc +++ b/chromium/third_party/blink/renderer/core/animation/effect_stack_test.cc @@ -6,7 +6,6 @@ #include <memory> #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/blink/renderer/core/animation/animatable/animatable_double.h" #include "third_party/blink/renderer/core/animation/animation_clock.h" #include "third_party/blink/renderer/core/animation/animation_test_helper.h" #include "third_party/blink/renderer/core/animation/document_timeline.h" @@ -16,6 +15,7 @@ #include "third_party/blink/renderer/core/animation/pending_animations.h" #include "third_party/blink/renderer/core/animation/string_keyframe.h" #include "third_party/blink/renderer/core/testing/page_test_base.h" +#include "third_party/blink/renderer/platform/heap/heap.h" namespace blink { @@ -50,21 +50,21 @@ class AnimationEffectStackTest : public PageTestBase { KeyframeEffectModelBase* MakeEffectModel(CSSPropertyID id, const String& value) { StringKeyframeVector keyframes(2); - keyframes[0] = StringKeyframe::Create(); + keyframes[0] = MakeGarbageCollected<StringKeyframe>(); keyframes[0]->SetOffset(0.0); keyframes[0]->SetCSSPropertyValue( id, value, SecureContextMode::kInsecureContext, nullptr); - keyframes[1] = StringKeyframe::Create(); + keyframes[1] = MakeGarbageCollected<StringKeyframe>(); keyframes[1]->SetOffset(1.0); keyframes[1]->SetCSSPropertyValue( id, value, SecureContextMode::kInsecureContext, nullptr); - return StringKeyframeEffectModel::Create(keyframes); + return MakeGarbageCollected<StringKeyframeEffectModel>(keyframes); } InertEffect* MakeInertEffect(KeyframeEffectModelBase* effect) { Timing timing; timing.fill_mode = Timing::FillMode::BOTH; - return InertEffect::Create(effect, timing, false, 0); + return MakeGarbageCollected<InertEffect>(effect, timing, false, 0); } KeyframeEffect* MakeKeyframeEffect(KeyframeEffectModelBase* effect, @@ -72,7 +72,7 @@ class AnimationEffectStackTest : public PageTestBase { Timing timing; timing.fill_mode = Timing::FillMode::BOTH; timing.iteration_duration = AnimationTimeDelta::FromSecondsD(duration); - return KeyframeEffect::Create(element.Get(), effect, timing); + return MakeGarbageCollected<KeyframeEffect>(element.Get(), effect, timing); } double GetFontSizeValue( @@ -173,8 +173,7 @@ TEST_F(AnimationEffectStackTest, ForwardsFillDiscarding) { Play(MakeKeyframeEffect(MakeEffectModel(CSSPropertyID::kFontSize, "1px")), 2); Play(MakeKeyframeEffect(MakeEffectModel(CSSPropertyID::kFontSize, "2px")), 6); Play(MakeKeyframeEffect(MakeEffectModel(CSSPropertyID::kFontSize, "3px")), 4); - GetDocument().GetPendingAnimations().Update( - base::Optional<CompositorElementIdSet>()); + GetDocument().GetPendingAnimations().Update(nullptr); // Because we will be forcing a naive GC that assumes there are no Oilpan // objects on the stack (e.g. passes BlinkGC::kNoHeapPointersOnStack), we have |