Source/core/animation/CompositorAnimationsTest.cpp - Issue 23874019: Web Animations CSS: Start running animations on the compositor

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

Issue 23874019: Web Animations CSS: Start running animations on the compositor (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Rebased. Created 7 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: Source/core/animation/CompositorAnimationsTest.cpp

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

index 829cf9015ff1dd400cc8f734b95e3e22e96668b8..69dc1c7b1c215755f56d919b93dc0ed0ce621808 100644

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

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

@@ -711,10 +711,10 @@ TEST_F(CoreAnimationCompositorAnimationsTest, isCandidateForCompositor)

basicFramesVector.append(createDefaultKeyframe(CSSPropertyOpacity, AnimationEffect::CompositeReplace, 1.0).get());

RefPtr<KeyframeAnimationEffect> basicFrames = KeyframeAnimationEffect::create(basicFramesVector).get();

- EXPECT_TRUE(CompositorAnimations::instance()->isCandidateForCompositorAnimation(linearTiming, *basicFrames.get()));

- EXPECT_TRUE(CompositorAnimations::instance()->isCandidateForCompositorAnimation(cubicTiming, *basicFrames.get()));

+ EXPECT_TRUE(CompositorAnimations::instance()->isCandidateForCompositorAnimations(linearTiming, *basicFrames.get()));

+ EXPECT_TRUE(CompositorAnimations::instance()->isCandidateForCompositorAnimations(cubicTiming, *basicFrames.get()));

// number of timing function and keyframes don't match

- EXPECT_FALSE(CompositorAnimations::instance()->isCandidateForCompositorAnimation(chainedTiming, *basicFrames.get()));

+ EXPECT_FALSE(CompositorAnimations::instance()->isCandidateForCompositorAnimations(chainedTiming, *basicFrames.get()));

KeyframeAnimationEffect::KeyframeVector nonBasicFramesVector;

nonBasicFramesVector.append(createDefaultKeyframe(CSSPropertyOpacity, AnimationEffect::CompositeReplace, 0.0).get());

@@ -722,9 +722,9 @@ TEST_F(CoreAnimationCompositorAnimationsTest, isCandidateForCompositor)

nonBasicFramesVector.append(createDefaultKeyframe(CSSPropertyOpacity, AnimationEffect::CompositeReplace, 1.0).get());

RefPtr<KeyframeAnimationEffect> nonBasicFrames = KeyframeAnimationEffect::create(nonBasicFramesVector).get();

- EXPECT_TRUE(CompositorAnimations::instance()->isCandidateForCompositorAnimation(linearTiming, *nonBasicFrames.get()));

- EXPECT_FALSE(CompositorAnimations::instance()->isCandidateForCompositorAnimation(cubicTiming, *nonBasicFrames.get()));

- EXPECT_TRUE(CompositorAnimations::instance()->isCandidateForCompositorAnimation(chainedTiming, *nonBasicFrames.get()));

+ EXPECT_TRUE(CompositorAnimations::instance()->isCandidateForCompositorAnimations(linearTiming, *nonBasicFrames.get()));

+ EXPECT_FALSE(CompositorAnimations::instance()->isCandidateForCompositorAnimations(cubicTiming, *nonBasicFrames.get()));

+ EXPECT_TRUE(CompositorAnimations::instance()->isCandidateForCompositorAnimations(chainedTiming, *nonBasicFrames.get()));

}

// -----------------------------------------------------------------------