Source/core/animation/AnimationStackTest.cpp - Issue 863863004: Implemented additive animations for length

Unified Diff: Source/core/animation/AnimationStackTest.cpp

Issue 863863004: Implemented additive animations for length (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: More comprehensive non-negative length layout tests Created 5 years, 10 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

« LayoutTests/web-animations-api/animations-additive-width.html ('K') | « Source/core/animation/AnimationStack.cpp ('k') | Source/core/animation/ConstantStyleInterpolation.h » ('j') | Source/core/animation/Interpolation.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/animation/AnimationStackTest.cpp

diff --git a/Source/core/animation/AnimationStackTest.cpp b/Source/core/animation/AnimationStackTest.cpp

index b107076f2dd68188a48e0b604d638a6c9038362c..552bb4eb0cf45a104fcc92d83bd985a2c068ead8 100644

--- a/Source/core/animation/AnimationStackTest.cpp

+++ b/Source/core/animation/AnimationStackTest.cpp

@@ -86,9 +86,9 @@ TEST_F(AnimationAnimationStackTest, ActiveAnimationsSorted)

play(makeAnimation(makeAnimationEffect(CSSPropertyFontSize, AnimatableDouble::create(1))).get(), 10);

play(makeAnimation(makeAnimationEffect(CSSPropertyFontSize, AnimatableDouble::create(2))).get(), 15);

play(makeAnimation(makeAnimationEffect(CSSPropertyFontSize, AnimatableDouble::create(3))).get(), 5);

- WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation> > result = AnimationStack::activeInterpolations(&element->activeAnimations()->defaultStack(), 0, 0, Animation::DefaultPriority, 0);

+ InterpolationPipelineMap result = AnimationStack::activeInterpolations(&element->activeAnimations()->defaultStack(), 0, 0, Animation::DefaultPriority, 0);

EXPECT_EQ(1u, result.size());

- EXPECT_TRUE(interpolationValue(result.get(CSSPropertyFontSize))->equals(AnimatableDouble::create(3).get()));

+ EXPECT_TRUE(interpolationValue(result.get(CSSPropertyFontSize)->first()->interpolation().get())->equals(AnimatableDouble::create(3).get()));

}

TEST_F(AnimationAnimationStackTest, NewAnimations)

@@ -100,10 +100,10 @@ TEST_F(AnimationAnimationStackTest, NewAnimations)

RefPtrWillBeRawPtr<InertAnimation> inert2 = makeInertAnimation(makeAnimationEffect(CSSPropertyZIndex, AnimatableDouble::create(4)));

newAnimations.append(inert1.get());

newAnimations.append(inert2.get());

+ InterpolationPipelineMap result = AnimationStack::activeInterpolations(&element->activeAnimations()->defaultStack(), &newAnimations, 0, Animation::DefaultPriority, 10);

EXPECT_EQ(2u, result.size());

- EXPECT_TRUE(interpolationValue(result.get(CSSPropertyFontSize))->equals(AnimatableDouble::create(3).get()));

- EXPECT_TRUE(interpolationValue(result.get(CSSPropertyZIndex))->equals(AnimatableDouble::create(4).get()));

+ EXPECT_TRUE(interpolationValue(result.get(CSSPropertyFontSize)->first()->interpolation().get())->equals(AnimatableDouble::create(3).get()));

+ EXPECT_TRUE(interpolationValue(result.get(CSSPropertyZIndex)->first()->interpolation().get())->equals(AnimatableDouble::create(4).get()));

}

TEST_F(AnimationAnimationStackTest, CancelledAnimationPlayers)

@@ -112,9 +112,9 @@ TEST_F(AnimationAnimationStackTest, CancelledAnimationPlayers)

RefPtrWillBeRawPtr<AnimationPlayer> player = play(makeAnimation(makeAnimationEffect(CSSPropertyFontSize, AnimatableDouble::create(1))).get(), 0);

cancelledAnimationPlayers.add(player.get());

play(makeAnimation(makeAnimationEffect(CSSPropertyZIndex, AnimatableDouble::create(2))).get(), 0);

+ InterpolationPipelineMap result = AnimationStack::activeInterpolations(&element->activeAnimations()->defaultStack(), 0, &cancelledAnimationPlayers, Animation::DefaultPriority, 0);

EXPECT_EQ(1u, result.size());

- EXPECT_TRUE(interpolationValue(result.get(CSSPropertyZIndex))->equals(AnimatableDouble::create(2).get()));

+ EXPECT_TRUE(interpolationValue(result.get(CSSPropertyZIndex)->first()->interpolation().get())->equals(AnimatableDouble::create(2).get()));

}

TEST_F(AnimationAnimationStackTest, ForwardsFillDiscarding)

@@ -123,31 +123,31 @@ TEST_F(AnimationAnimationStackTest, ForwardsFillDiscarding)

play(makeAnimation(makeAnimationEffect(CSSPropertyFontSize, AnimatableDouble::create(2))).get(), 6);

play(makeAnimation(makeAnimationEffect(CSSPropertyFontSize, AnimatableDouble::create(3))).get(), 4);

document->compositorPendingAnimations().update();

- WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation> > interpolations;

+ InterpolationPipelineMap interpolations;

updateTimeline(11);

Heap::collectAllGarbage();

interpolations = AnimationStack::activeInterpolations(&element->activeAnimations()->defaultStack(), 0, 0, Animation::DefaultPriority, 0);

- EXPECT_TRUE(interpolationValue(interpolations.get(CSSPropertyFontSize))->equals(AnimatableDouble::create(3).get()));

+ EXPECT_TRUE(interpolationValue(interpolations.get(CSSPropertyFontSize)->first()->interpolation().get())->equals(AnimatableDouble::create(3).get()));

EXPECT_EQ(3u, effects().size());

EXPECT_EQ(1u, interpolations.size());

updateTimeline(13);

Heap::collectAllGarbage();

interpolations = AnimationStack::activeInterpolations(&element->activeAnimations()->defaultStack(), 0, 0, Animation::DefaultPriority, 0);

- EXPECT_TRUE(interpolationValue(interpolations.get(CSSPropertyFontSize))->equals(AnimatableDouble::create(3).get()));

+ EXPECT_TRUE(interpolationValue(interpolations.get(CSSPropertyFontSize)->first()->interpolation().get())->equals(AnimatableDouble::create(3).get()));

EXPECT_EQ(3u, effects().size());

updateTimeline(15);

Heap::collectAllGarbage();

interpolations = AnimationStack::activeInterpolations(&element->activeAnimations()->defaultStack(), 0, 0, Animation::DefaultPriority, 0);

- EXPECT_TRUE(interpolationValue(interpolations.get(CSSPropertyFontSize))->equals(AnimatableDouble::create(3).get()));

+ EXPECT_TRUE(interpolationValue(interpolations.get(CSSPropertyFontSize)->first()->interpolation().get())->equals(AnimatableDouble::create(3).get()));

EXPECT_EQ(2u, effects().size());

updateTimeline(17);

Heap::collectAllGarbage();

interpolations = AnimationStack::activeInterpolations(&element->activeAnimations()->defaultStack(), 0, 0, Animation::DefaultPriority, 0);

- EXPECT_TRUE(interpolationValue(interpolations.get(CSSPropertyFontSize))->equals(AnimatableDouble::create(3).get()));

+ EXPECT_TRUE(interpolationValue(interpolations.get(CSSPropertyFontSize)->first()->interpolation().get())->equals(AnimatableDouble::create(3).get()));

EXPECT_EQ(1u, effects().size());

}