Source/core/animation/Animation.h - Issue 194673002: Web Animations: Refactor KeyframeEffectModel to work via an InterpolationEffect.

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/animation/Animation.h

Issue 194673002: Web Animations: Refactor KeyframeEffectModel to work via an InterpolationEffect. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@interpolationWrap

Patch Set: Created 6 years, 9 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

Index: Source/core/animation/Animation.h

diff --git a/Source/core/animation/Animation.h b/Source/core/animation/Animation.h

index abc1be35e82ba28cab42075d6a46bb3f3c48596c..087abd419a5fc14aae903d7b78f25527b1e9e975 100644

--- a/Source/core/animation/Animation.h

+++ b/Source/core/animation/Animation.h

@@ -71,10 +71,10 @@ public:

virtual bool isAnimation() const OVERRIDE { return true; }

- const AnimationEffect::CompositableValueList* compositableValues() const

+ const Vector<RefPtr<Interpolation> >* activeInterpolations() const

{

- ASSERT(m_compositableValues);

- return m_compositableValues.get();

+ ASSERT(m_activeInterpolations);

dstockwell 2014/03/17 02:05:57 If it can't be null, return a reference?

shans 2014/03/18 20:09:28 Done.

+ return m_activeInterpolations.get();

}

bool affects(CSSPropertyID) const;

@@ -107,7 +107,7 @@ private:

RefPtrWillBePersistent<AnimationEffect> m_effect;

bool m_activeInAnimationStack;

- OwnPtr<AnimationEffect::CompositableValueList> m_compositableValues;

+ OwnPtr<Vector<RefPtr<Interpolation> > > m_activeInterpolations;

Priority m_priority;

« no previous file with comments | « Source/core/animation/AnimatableValue.h ('k') | Source/core/animation/Animation.cpp » ('j') | Source/core/animation/KeyframeEffectModel.cpp » ('J')