Source/core/page/animation/KeyframeAnimation.h - Issue 14391005: Rename Animation -> PrimitiveAnimation

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: Source/core/page/animation/KeyframeAnimation.h

Issue 14391005: Rename Animation -> PrimitiveAnimation (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 7 years, 8 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 | « Source/core/page/animation/ImplicitAnimation.cpp ('k') | Source/core/page/animation/KeyframeAnimation.cpp » ('j') | Source/core/platform/animation/PrimitiveAnimation.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/page/animation/KeyframeAnimation.h

diff --git a/Source/core/page/animation/KeyframeAnimation.h b/Source/core/page/animation/KeyframeAnimation.h

index 1b337503b684c9223b46989ea30a675b05159bfa..4da7da26bbdaf96ec50cc7af530ef878222a8df0 100644

--- a/Source/core/page/animation/KeyframeAnimation.h

+++ b/Source/core/page/animation/KeyframeAnimation.h

@@ -41,7 +41,7 @@ class RenderStyle;

// for a single RenderObject.

class KeyframeAnimation : public AnimationBase {

public:

- static PassRefPtr<KeyframeAnimation> create(const Animation* animation, RenderObject* renderer, int index, CompositeAnimation* compositeAnimation, RenderStyle* unanimatedStyle)

+ static PassRefPtr<KeyframeAnimation> create(const PrimitiveAnimation* animation, RenderObject* renderer, int index, CompositeAnimation* compositeAnimation, RenderStyle* unanimatedStyle)

{

return adoptRef(new KeyframeAnimation(animation, renderer, index, compositeAnimation, unanimatedStyle));

};

@@ -80,7 +80,7 @@ protected:

void checkForMatchingFilterFunctionLists();

private:

- KeyframeAnimation(const Animation* animation, RenderObject*, int index, CompositeAnimation*, RenderStyle* unanimatedStyle);

+ KeyframeAnimation(const PrimitiveAnimation* animation, RenderObject*, int index, CompositeAnimation*, RenderStyle* unanimatedStyle);

virtual ~KeyframeAnimation();

// Get the styles for the given property surrounding the current animation time and the progress between them.