third_party/WebKit/Source/core/animation/CompositorAnimationsTestHelper.h - Issue 1700653002: CC Animation: Expose TargetProperty enum to be aliased in Blink Platform.

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/CompositorAnimationsTestHelper.h

Issue 1700653002: CC Animation: Expose TargetProperty enum to be aliased in Blink Platform. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase. Created 4 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

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

Index: third_party/WebKit/Source/core/animation/CompositorAnimationsTestHelper.h

diff --git a/third_party/WebKit/Source/core/animation/CompositorAnimationsTestHelper.h b/third_party/WebKit/Source/core/animation/CompositorAnimationsTestHelper.h

index 075bae816b81c60f73b713a833ac6a75184f57bc..0b53fa4a37f051e2178426331bbe3bced0f19bfa 100644

--- a/third_party/WebKit/Source/core/animation/CompositorAnimationsTestHelper.h

+++ b/third_party/WebKit/Source/core/animation/CompositorAnimationsTestHelper.h

@@ -58,12 +58,12 @@ inline void PrintTo(const CompositorFloatKeyframe& frame, ::std::ostream* os)

class WebCompositorAnimationMock : public CompositorAnimation {

private:

- CompositorAnimation::TargetProperty m_property;

+ CompositorTargetProperty::Type m_property;

public:

// Target Property is set through the constructor.

- WebCompositorAnimationMock(CompositorAnimation::TargetProperty p) : m_property(p) { }

- virtual CompositorAnimation::TargetProperty targetProperty() const { return m_property; }

+ WebCompositorAnimationMock(CompositorTargetProperty::Type p) : m_property(p) { }

+ virtual CompositorTargetProperty::Type targetProperty() const { return m_property; }

MOCK_METHOD0(id, int());

MOCK_METHOD0(group, int());

@@ -130,7 +130,7 @@ class AnimationCompositorAnimationsTestBase : public ::testing::Test {

public:

class CompositorFactoryMock : public CompositorFactory {

public:

- MOCK_METHOD4(createAnimation, CompositorAnimation*(const CompositorAnimationCurve& curve, CompositorAnimation::TargetProperty target, int groupId, int animationId));

+ MOCK_METHOD4(createAnimation, CompositorAnimation*(const CompositorAnimationCurve& curve, CompositorTargetProperty::Type target, int groupId, int animationId));

MOCK_METHOD0(createFloatAnimationCurve, CompositorFloatAnimationCurve*());

MOCK_METHOD0(createAnimationPlayer, CompositorAnimationPlayer*());

MOCK_METHOD0(createAnimationTimeline, CompositorAnimationTimeline*());