third_party/WebKit/Source/core/animation/CompositorAnimationsTest.cpp - Issue 1663963004: Blink Compositor Animation: Use PassOwnPtr in CompositorFactory.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1663963004: Blink Compositor Animation: Use PassOwnPtr in CompositorFactory. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@curves

Patch Set: 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') | no next file with comments »
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 86e273849ee679d3ce3dbb6f6b5727b983bfe1de..c893c973ba66b7af963687fab803a7c579e04186 100644

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

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

@@ -111,7 +111,7 @@ protected:

if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled()) {

EXPECT_CALL(*m_mockCompositorFactory, createAnimationTimeline())

- .WillOnce(Return(new WebCompositorAnimationTimelineMock()));

+ .WillOnce(Return(adoptPtr(new WebCompositorAnimationTimelineMock())));

}

m_pageHolder = DummyPageHolder::create();

m_document = &m_pageHolder->document();

@@ -119,7 +119,7 @@ protected:

if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled()) {

EXPECT_CALL(*m_mockCompositorFactory, createAnimationTimeline())

- .WillOnce(Return(new WebCompositorAnimationTimelineMock()));

+ .WillOnce(Return(adoptPtr(new WebCompositorAnimationTimelineMock())));

}

m_timeline = AnimationTimeline::create(m_document.get());

m_timeline->resetForTesting();

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

WebFloatAnimationCurveMock* mockCurvePtr = new WebFloatAnimationCurveMock;

ExpectationSet usesMockCurve;

EXPECT_CALL(*m_mockCompositorFactory, createFloatAnimationCurve())

- .WillOnce(Return(mockCurvePtr));

+ .WillOnce(Return(adoptPtr(mockCurvePtr)));

usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(CompositorFloatKeyframe(0.0, 2.0), CompositorAnimationCurve::TimingFunctionTypeLinear));

usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(CompositorFloatKeyframe(1.0, 5.0)));

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

ExpectationSet usesMockAnimation;

usesMockCurve += EXPECT_CALL(*m_mockCompositorFactory, createAnimation(Ref(*mockCurvePtr), CompositorAnimation::TargetPropertyOpacity, _, _))

- .WillOnce(Return(mockAnimationPtr));

+ .WillOnce(Return(adoptPtr(mockAnimationPtr)));

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

usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setTimeOffset(0.0));