| Index: third_party/WebKit/Source/core/animation/AnimationStackTest.cpp
|
| diff --git a/third_party/WebKit/Source/core/animation/AnimationStackTest.cpp b/third_party/WebKit/Source/core/animation/AnimationStackTest.cpp
|
| index bdccc72d67b26d45236e2a13eea0aa5b4fc3a4ed..4939000c434d19a04d653311ae41ebb67d950658 100644
|
| --- a/third_party/WebKit/Source/core/animation/AnimationStackTest.cpp
|
| +++ b/third_party/WebKit/Source/core/animation/AnimationStackTest.cpp
|
| @@ -142,28 +142,28 @@
|
| ActiveInterpolationsMap interpolations;
|
|
|
| updateTimeline(11);
|
| - ThreadHeap::collectAllGarbage();
|
| + Heap::collectAllGarbage();
|
| interpolations = AnimationStack::activeInterpolations(&element->elementAnimations()->animationStack(), nullptr, nullptr, KeyframeEffect::DefaultPriority);
|
| EXPECT_EQ(1u, interpolations.size());
|
| EXPECT_TRUE(interpolationValue(interpolations, CSSPropertyFontSize)->equals(AnimatableDouble::create(3).get()));
|
| EXPECT_EQ(3u, sampledEffectCount());
|
|
|
| updateTimeline(13);
|
| - ThreadHeap::collectAllGarbage();
|
| + Heap::collectAllGarbage();
|
| interpolations = AnimationStack::activeInterpolations(&element->elementAnimations()->animationStack(), nullptr, nullptr, KeyframeEffect::DefaultPriority);
|
| EXPECT_EQ(1u, interpolations.size());
|
| EXPECT_TRUE(interpolationValue(interpolations, CSSPropertyFontSize)->equals(AnimatableDouble::create(3).get()));
|
| EXPECT_EQ(3u, sampledEffectCount());
|
|
|
| updateTimeline(15);
|
| - ThreadHeap::collectAllGarbage();
|
| + Heap::collectAllGarbage();
|
| interpolations = AnimationStack::activeInterpolations(&element->elementAnimations()->animationStack(), nullptr, nullptr, KeyframeEffect::DefaultPriority);
|
| EXPECT_EQ(1u, interpolations.size());
|
| EXPECT_TRUE(interpolationValue(interpolations, CSSPropertyFontSize)->equals(AnimatableDouble::create(3).get()));
|
| EXPECT_EQ(2u, sampledEffectCount());
|
|
|
| updateTimeline(17);
|
| - ThreadHeap::collectAllGarbage();
|
| + Heap::collectAllGarbage();
|
| interpolations = AnimationStack::activeInterpolations(&element->elementAnimations()->animationStack(), nullptr, nullptr, KeyframeEffect::DefaultPriority);
|
| EXPECT_EQ(1u, interpolations.size());
|
| EXPECT_TRUE(interpolationValue(interpolations, CSSPropertyFontSize)->equals(AnimatableDouble::create(3).get()));
|
|
|