third_party/WebKit/Source/platform/animation/CompositorAnimationPlayerTest.cpp - 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/platform/animation/CompositorAnimationPlayerTest.cpp

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/platform/animation/CompositorAnimationPlayer.cpp ('k') | third_party/WebKit/Source/platform/animation/CompositorAnimationTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/animation/CompositorAnimationPlayerTest.cpp

diff --git a/third_party/WebKit/Source/platform/animation/CompositorAnimationPlayerTest.cpp b/third_party/WebKit/Source/platform/animation/CompositorAnimationPlayerTest.cpp

index 792d2b791b760ec3181f848e10a62dc7fb39d46f..2aa9eb05a4c3fe7577e891a6197fb16153ed0cbd 100644

--- a/third_party/WebKit/Source/platform/animation/CompositorAnimationPlayerTest.cpp

+++ b/third_party/WebKit/Source/platform/animation/CompositorAnimationPlayerTest.cpp

@@ -6,6 +6,7 @@

#include "base/memory/scoped_ptr.h"

#include "base/time/time.h"

+#include "platform/animation/CompositorTargetProperty.h"

#include "public/platform/WebCompositorAnimationDelegate.h"

#include "testing/gmock/include/gmock/gmock.h"

#include "testing/gtest/include/gtest/gtest.h"

@@ -40,10 +41,10 @@ TEST(WebCompositorAnimationPlayerTest, NullDelegate)

cc::AnimationPlayer* player = webPlayer->animationPlayer();

webPlayer->setAnimationDelegate(delegate.get());

- player->NotifyAnimationFinished(TimeTicks(), Animation::SCROLL_OFFSET, 0);

+ player->NotifyAnimationFinished(TimeTicks(), CompositorTargetProperty::SCROLL_OFFSET, 0);

webPlayer->setAnimationDelegate(nullptr);

- player->NotifyAnimationFinished(TimeTicks(), Animation::SCROLL_OFFSET, 0);

+ player->NotifyAnimationFinished(TimeTicks(), CompositorTargetProperty::SCROLL_OFFSET, 0);

}

} // namespace blink