third_party/WebKit/Source/platform/graphics/GraphicsLayer.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/platform/graphics/GraphicsLayer.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: Add WTF_MAKE_NONCOPYABLE. Remove INSIDE_BLINK for keyframes. 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

« third_party/WebKit/Source/platform/graphics/DEPS ('K') | « third_party/WebKit/Source/platform/graphics/DEPS ('k') | third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp » ('j') | third_party/WebKit/Source/platform/graphics/filters/SkiaImageFilterBuilder.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/graphics/GraphicsLayer.h

diff --git a/third_party/WebKit/Source/platform/graphics/GraphicsLayer.h b/third_party/WebKit/Source/platform/graphics/GraphicsLayer.h

index 57101d591115aef46cd385775e6ec7d430b6aec8..5be8395fdce41ac9b36351c804e798002c8bc156 100644

--- a/third_party/WebKit/Source/platform/graphics/GraphicsLayer.h

+++ b/third_party/WebKit/Source/platform/graphics/GraphicsLayer.h

@@ -65,7 +65,7 @@ class LinkHighlight;

class JSONObject;

class PaintController;

class ScrollableArea;

-class WebCompositorAnimation;

+class CompositorAnimation;

class WebLayer;

typedef Vector<GraphicsLayer*, 64> GraphicsLayerVector;

@@ -195,7 +195,7 @@ public:

// Return true if the animation is handled by the compositing system. If this returns

// false, the animation will be run by AnimationController.

// These methods handle both transitions and keyframe animations.

- bool addAnimation(PassOwnPtr<WebCompositorAnimation>);

+ bool addAnimation(PassOwnPtr<CompositorAnimation>);

void pauseAnimation(int animationId, double /*timeOffset*/);

void removeAnimation(int animationId);

void abortAnimation(int animationId);