third_party/WebKit/Source/core/animation/CompositorAnimationsTest.cpp - Issue 1616653002: CC Animation: Move files from cc_blink to Source/platform/animation

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

Issue 1616653002: CC Animation: Move files from cc_blink to Source/platform/animation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Update GN. Port CompositorAnimationsTest to use CompositorFactoryMock. Created 4 years, 11 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

« no previous file with comments | « third_party/WebKit/Source/core/animation/CompositorAnimations.cpp ('k') | third_party/WebKit/Source/core/animation/CompositorAnimationsTestHelper.h » ('j') | third_party/WebKit/Source/platform/CompositorFactory.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/animation/CompositorAnimationsTest.cpp

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

index 8e99446dee9e8ad1b9c2214f17fc9ed79f334952..e94f850d52663a1a152192a7f100ae5040eb8b7f 100644

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

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

@@ -84,12 +84,16 @@ protected:

Persistent<AnimationTimeline> m_timeline;

OwnPtr<DummyPageHolder> m_pageHolder;

WebCompositorSupportMock m_mockCompositor;

+ CompositorFactoryMock* m_mockCompositorFactory;

- virtual void SetUp()

+ void SetUp() override

{

AnimationCompositorAnimationsTestBase::SetUp();

setCompositorForTesting(m_mockCompositor);

+ m_mockCompositorFactory = new CompositorFactoryMock();

+ CompositorFactory::initializeForTesting(m_mockCompositorFactory);

m_linearTimingFunction = LinearTimingFunction::shared();

m_cubicEaseTimingFunction = CubicBezierTimingFunction::preset(CubicBezierTimingFunction::Ease);

m_cubicCustomTimingFunction = CubicBezierTimingFunction::create(1, 2, 3, 4);

@@ -124,8 +128,13 @@ protected:

m_element = m_document->createElement("test", ASSERT_NO_EXCEPTION);

}

-public:

+ void TearDown() override

+ {

+ CompositorFactory::shutdown();

+ m_mockCompositorFactory = nullptr;

+ }

+public:

bool convertTimingForCompositor(const Timing& t, CompositorAnimationsImpl::CompositorTiming& out)

{

return CompositorAnimationsImpl::convertTimingForCompositor(t, 0, out, 1);

@@ -655,7 +664,7 @@ TEST_F(AnimationCompositorAnimationsTest, createSimpleOpacityAnimation)

// Curve is created

WebFloatAnimationCurveMock* mockCurvePtr = new WebFloatAnimationCurveMock;

ExpectationSet usesMockCurve;

- EXPECT_CALL(m_mockCompositor, createFloatAnimationCurve())

+ EXPECT_CALL(*m_mockCompositorFactory, createFloatAnimationCurve())

.WillOnce(Return(mockCurvePtr));

usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(WebFloatKeyframe(0.0, 2.0), WebCompositorAnimationCurve::TimingFunctionTypeLinear));

@@ -700,7 +709,7 @@ TEST_F(AnimationCompositorAnimationsTest, createSimpleOpacityAnimationDuration)

// Curve is created

WebFloatAnimationCurveMock* mockCurvePtr = new WebFloatAnimationCurveMock;

ExpectationSet usesMockCurve;

- EXPECT_CALL(m_mockCompositor, createFloatAnimationCurve())

+ EXPECT_CALL(*m_mockCompositorFactory, createFloatAnimationCurve())

.WillOnce(Return(mockCurvePtr));

usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(WebFloatKeyframe(0.0, 2.0), WebCompositorAnimationCurve::TimingFunctionTypeLinear));

@@ -750,7 +759,7 @@ TEST_F(AnimationCompositorAnimationsTest, createMultipleKeyframeOpacityAnimation

WebFloatAnimationCurveMock* mockCurvePtr = new WebFloatAnimationCurveMock();

ExpectationSet usesMockCurve;

- EXPECT_CALL(m_mockCompositor, createFloatAnimationCurve())

+ EXPECT_CALL(*m_mockCompositorFactory, createFloatAnimationCurve())

.WillOnce(Return(mockCurvePtr));

usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(WebFloatKeyframe(0.0, 2.0), WebCompositorAnimationCurve::TimingFunctionTypeLinear));

@@ -799,7 +808,7 @@ TEST_F(AnimationCompositorAnimationsTest, createSimpleOpacityAnimationStartDelay

// Curve is created

WebFloatAnimationCurveMock* mockCurvePtr = new WebFloatAnimationCurveMock;

ExpectationSet usesMockCurve;

- EXPECT_CALL(m_mockCompositor, createFloatAnimationCurve())

+ EXPECT_CALL(*m_mockCompositorFactory, createFloatAnimationCurve())

.WillOnce(Return(mockCurvePtr));

usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(WebFloatKeyframe(0.0, 2.0), WebCompositorAnimationCurve::TimingFunctionTypeLinear));

@@ -854,7 +863,7 @@ TEST_F(AnimationCompositorAnimationsTest, createMultipleKeyframeOpacityAnimation

WebFloatAnimationCurveMock* mockCurvePtr = new WebFloatAnimationCurveMock();

ExpectationSet usesMockCurve;

- EXPECT_CALL(m_mockCompositor, createFloatAnimationCurve())

+ EXPECT_CALL(*m_mockCompositorFactory, createFloatAnimationCurve())

.WillOnce(Return(mockCurvePtr));

usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(WebFloatKeyframe(0.0, 2.0), WebCompositorAnimationCurve::TimingFunctionTypeEase));

@@ -912,7 +921,7 @@ TEST_F(AnimationCompositorAnimationsTest, createReversedOpacityAnimation)

WebFloatAnimationCurveMock* mockCurvePtr = new WebFloatAnimationCurveMock();

ExpectationSet usesMockCurve;

- EXPECT_CALL(m_mockCompositor, createFloatAnimationCurve())

+ EXPECT_CALL(*m_mockCompositorFactory, createFloatAnimationCurve())

.WillOnce(Return(mockCurvePtr));

usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(WebFloatKeyframe(0.0, 2.0), WebCompositorAnimationCurve::TimingFunctionTypeEaseIn));

@@ -962,7 +971,7 @@ TEST_F(AnimationCompositorAnimationsTest, createReversedOpacityAnimationNegative

// Curve is created

WebFloatAnimationCurveMock* mockCurvePtr = new WebFloatAnimationCurveMock;

ExpectationSet usesMockCurve;

- EXPECT_CALL(m_mockCompositor, createFloatAnimationCurve())

+ EXPECT_CALL(*m_mockCompositorFactory, createFloatAnimationCurve())

.WillOnce(Return(mockCurvePtr));

usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(WebFloatKeyframe(0.0, 2.0), WebCompositorAnimationCurve::TimingFunctionTypeLinear));

@@ -1007,7 +1016,7 @@ TEST_F(AnimationCompositorAnimationsTest, createSimpleOpacityAnimationPlaybackRa

// Curve is created

WebFloatAnimationCurveMock* mockCurvePtr = new WebFloatAnimationCurveMock;

ExpectationSet usesMockCurve;

- EXPECT_CALL(m_mockCompositor, createFloatAnimationCurve())

+ EXPECT_CALL(*m_mockCompositorFactory, createFloatAnimationCurve())

.WillOnce(Return(mockCurvePtr));

usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(WebFloatKeyframe(0.0, 2.0), WebCompositorAnimationCurve::TimingFunctionTypeLinear));

@@ -1052,7 +1061,7 @@ TEST_F(AnimationCompositorAnimationsTest, createSimpleOpacityAnimationFillModeNo

// Curve is created

WebFloatAnimationCurveMock* mockCurvePtr = new WebFloatAnimationCurveMock;

ExpectationSet usesMockCurve;

- EXPECT_CALL(m_mockCompositor, createFloatAnimationCurve())

+ EXPECT_CALL(*m_mockCompositorFactory, createFloatAnimationCurve())

.WillOnce(Return(mockCurvePtr));

usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(WebFloatKeyframe(0.0, 2.0), WebCompositorAnimationCurve::TimingFunctionTypeLinear));

@@ -1097,7 +1106,7 @@ TEST_F(AnimationCompositorAnimationsTest, createSimpleOpacityAnimationFillModeAu

// Curve is created

WebFloatAnimationCurveMock* mockCurvePtr = new WebFloatAnimationCurveMock;

ExpectationSet usesMockCurve;

- EXPECT_CALL(m_mockCompositor, createFloatAnimationCurve())

+ EXPECT_CALL(*m_mockCompositorFactory, createFloatAnimationCurve())

.WillOnce(Return(mockCurvePtr));

usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(WebFloatKeyframe(0.0, 2.0), WebCompositorAnimationCurve::TimingFunctionTypeLinear));

@@ -1142,7 +1151,7 @@ TEST_F(AnimationCompositorAnimationsTest, createSimpleOpacityAnimationWithTiming

// Curve is created

WebFloatAnimationCurveMock* mockCurvePtr = new WebFloatAnimationCurveMock;

ExpectationSet usesMockCurve;

- EXPECT_CALL(m_mockCompositor, createFloatAnimationCurve())

+ EXPECT_CALL(*m_mockCompositorFactory, createFloatAnimationCurve())

.WillOnce(Return(mockCurvePtr));

usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(WebFloatKeyframe(0.0, 2.0), WebCompositorAnimationCurve::TimingFunctionTypeLinear));