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

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

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: Rebase. Fix copyrights and years. 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/CompositorAnimations.cpp ('k') | third_party/WebKit/Source/core/animation/CompositorAnimationsTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 7320bb91669a92bab951564f5934d4b319c92f3c..fb751bb95e559a489c91985e9740c222d792ed3e 100644

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

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

@@ -35,13 +35,13 @@

#include "core/animation/EffectModel.h"

#include "core/animation/KeyframeEffectModel.h"

#include "core/animation/Timing.h"

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

#include "platform/animation/TimingFunction.h"

-#include "public/platform/WebCompositorAnimation.h"

#include "wtf/Allocator.h"

namespace blink {

-class WebCompositorAnimationCurve;

+class CompositorAnimationCurve;

class CORE_EXPORT CompositorAnimationsImpl {

STATIC_ONLY(CompositorAnimationsImpl);

@@ -68,9 +68,9 @@ private:

static bool convertTimingForCompositor(const Timing&, double timeOffset, CompositorTiming& out, double animationPlaybackRate);

- static void getAnimationOnCompositor(const Timing&, int group, double startTime, double timeOffset, const KeyframeEffectModelBase&, Vector<OwnPtr<WebCompositorAnimation>>& animations, double animationPlaybackRate);

+ static void getAnimationOnCompositor(const Timing&, int group, double startTime, double timeOffset, const KeyframeEffectModelBase&, Vector<OwnPtr<CompositorAnimation>>& animations, double animationPlaybackRate);

- static void addKeyframesToCurve(WebCompositorAnimationCurve&, const AnimatableValuePropertySpecificKeyframeVector&, const Timing&);

+ static void addKeyframesToCurve(CompositorAnimationCurve&, const AnimatableValuePropertySpecificKeyframeVector&, const Timing&);

friend class CompositorAnimations;

friend class AnimationCompositorAnimationsTest;