Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(271)

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
« no previous file with comments | « Source/core/animation/AnimatableValue.h ('k') | Source/core/animation/Animation.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/Animation.h
diff --git a/Source/core/animation/Animation.h b/Source/core/animation/Animation.h
index abc1be35e82ba28cab42075d6a46bb3f3c48596c..a8f62001d6b7b06cfeffe94e2020c2bfebab3acb 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);
+ return *m_activeInterpolations;
}
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') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698