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

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

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

index 71b795ee502c9e5c95b36170c3b55361f7d3cba5..8926e51f6d2cc3d70319fc5b6188984730e51c7f 100644

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

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

@@ -37,8 +37,8 @@

#include "core/animation/EffectModel.h"

#include "core/dom/Element.h"

#include "platform/Timer.h"

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

#include "platform/heap/Handle.h"

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

#include "wtf/RefPtr.h"

#include "wtf/Vector.h"

@@ -94,7 +94,7 @@ public:

void setPlaybackRate(double);

double playbackRate() const;

- WebCompositorAnimationTimeline* compositorTimeline() const { return m_compositorTimeline.get(); }

+ CompositorAnimationTimeline* compositorTimeline() const { return m_compositorTimeline.get(); }

Document* document() { return m_document.get(); }

#if !ENABLE(OILPAN)

@@ -126,7 +126,7 @@ private:

Member<PlatformTiming> m_timing;

double m_lastCurrentTimeInternal;

- OwnPtr<WebCompositorAnimationTimeline> m_compositorTimeline;

+ OwnPtr<CompositorAnimationTimeline> m_compositorTimeline;

class AnimationTimelineTiming final : public PlatformTiming {

public: