Source/core/animation/CompositorAnimationsTest.cpp - Issue 652593003: Web Animations: Plumb compositor group id through animation creation and start/finish notifications

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

Issue 652593003: Web Animations: Plumb compositor group id through animation creation and start/finish notifications (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Pass groupId to createAnimation. Created 6 years, 2 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

Index: Source/core/animation/CompositorAnimationsTest.cpp

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

index fa62b15f477f9ae0489851cb7cfcc27581161b14..292cea413fbbd9439f2385ced276c1702b4b7e1a 100644

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

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

@@ -612,7 +612,7 @@ TEST_F(AnimationCompositorAnimationsTest, createSimpleOpacityAnimation)

WebCompositorAnimationMock* mockAnimationPtr = new WebCompositorAnimationMock(WebCompositorAnimation::TargetPropertyOpacity);

ExpectationSet usesMockAnimation;

- usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurvePtr), WebCompositorAnimation::TargetPropertyOpacity, _))

+ usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurvePtr), WebCompositorAnimation::TargetPropertyOpacity, _, _))

.WillOnce(Return(mockAnimationPtr));

usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(1));

@@ -660,7 +660,7 @@ TEST_F(AnimationCompositorAnimationsTest, createSimpleOpacityAnimationDuration)

WebCompositorAnimationMock* mockAnimationPtr = new WebCompositorAnimationMock(WebCompositorAnimation::TargetPropertyOpacity);

ExpectationSet usesMockAnimation;

- usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurvePtr), WebCompositorAnimation::TargetPropertyOpacity, _))

+ usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurvePtr), WebCompositorAnimation::TargetPropertyOpacity, _, _))

.WillOnce(Return(mockAnimationPtr));

usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(1));

@@ -715,7 +715,7 @@ TEST_F(AnimationCompositorAnimationsTest, createMultipleKeyframeOpacityAnimation

WebCompositorAnimationMock* mockAnimationPtr = new WebCompositorAnimationMock(WebCompositorAnimation::TargetPropertyOpacity);

ExpectationSet usesMockAnimation;

- usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurvePtr), WebCompositorAnimation::TargetPropertyOpacity, _))

+ usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurvePtr), WebCompositorAnimation::TargetPropertyOpacity, _, _))

.WillOnce(Return(mockAnimationPtr));

usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(5));

@@ -765,7 +765,7 @@ TEST_F(AnimationCompositorAnimationsTest, createSimpleOpacityAnimationStartDelay

WebCompositorAnimationMock* mockAnimationPtr = new WebCompositorAnimationMock(WebCompositorAnimation::TargetPropertyOpacity);

ExpectationSet usesMockAnimation;

- usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurvePtr), WebCompositorAnimation::TargetPropertyOpacity, _))

+ usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurvePtr), WebCompositorAnimation::TargetPropertyOpacity, _, _))

.WillOnce(Return(mockAnimationPtr));

usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(5));

@@ -825,7 +825,7 @@ TEST_F(AnimationCompositorAnimationsTest, createMultipleKeyframeOpacityAnimation

WebCompositorAnimationMock* mockAnimationPtr = new WebCompositorAnimationMock(WebCompositorAnimation::TargetPropertyOpacity);

ExpectationSet usesMockAnimation;

- usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurvePtr), WebCompositorAnimation::TargetPropertyOpacity, _))

+ usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurvePtr), WebCompositorAnimation::TargetPropertyOpacity, _, _))

.WillOnce(Return(mockAnimationPtr));

usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(10));

@@ -886,7 +886,7 @@ TEST_F(AnimationCompositorAnimationsTest, createReversedOpacityAnimation)

WebCompositorAnimationMock* mockAnimationPtr = new WebCompositorAnimationMock(WebCompositorAnimation::TargetPropertyOpacity);

ExpectationSet usesMockAnimation;

- usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurvePtr), WebCompositorAnimation::TargetPropertyOpacity, _))

+ usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurvePtr), WebCompositorAnimation::TargetPropertyOpacity, _, _))

.WillOnce(Return(mockAnimationPtr));

usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(10));

@@ -937,7 +937,7 @@ TEST_F(AnimationCompositorAnimationsTest, createReversedOpacityAnimationNegative

WebCompositorAnimationMock* mockAnimationPtr = new WebCompositorAnimationMock(WebCompositorAnimation::TargetPropertyOpacity);

ExpectationSet usesMockAnimation;

- usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurvePtr), WebCompositorAnimation::TargetPropertyOpacity, _))

+ usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurvePtr), WebCompositorAnimation::TargetPropertyOpacity, _, _))

.WillOnce(Return(mockAnimationPtr));

usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(5));

@@ -985,7 +985,7 @@ TEST_F(AnimationCompositorAnimationsTest, createSimpleOpacityAnimationPlaybackRa

WebCompositorAnimationMock* mockAnimationPtr = new WebCompositorAnimationMock(WebCompositorAnimation::TargetPropertyOpacity);

ExpectationSet usesMockAnimation;

- usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurvePtr), WebCompositorAnimation::TargetPropertyOpacity, _))

+ usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurvePtr), WebCompositorAnimation::TargetPropertyOpacity, _, _))

.WillOnce(Return(mockAnimationPtr));

usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(1));

@@ -1033,7 +1033,7 @@ TEST_F(AnimationCompositorAnimationsTest, createSimpleOpacityAnimationFillModeNo

WebCompositorAnimationMock* mockAnimationPtr = new WebCompositorAnimationMock(WebCompositorAnimation::TargetPropertyOpacity);

ExpectationSet usesMockAnimation;

- usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurvePtr), WebCompositorAnimation::TargetPropertyOpacity, _))

+ usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurvePtr), WebCompositorAnimation::TargetPropertyOpacity, _, _))

.WillOnce(Return(mockAnimationPtr));

usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(1));

@@ -1081,7 +1081,7 @@ TEST_F(AnimationCompositorAnimationsTest, createSimpleOpacityAnimationFillModeAu

WebCompositorAnimationMock* mockAnimationPtr = new WebCompositorAnimationMock(WebCompositorAnimation::TargetPropertyOpacity);

ExpectationSet usesMockAnimation;

- usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurvePtr), WebCompositorAnimation::TargetPropertyOpacity, _))

+ usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurvePtr), WebCompositorAnimation::TargetPropertyOpacity, _, _))

.WillOnce(Return(mockAnimationPtr));

usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(1));

« no previous file with comments | « no previous file | Source/core/animation/CompositorAnimationsTestHelper.h » ('j') | no next file with comments »