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

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 f360e3c9a57909c5249bf91080146c5a504681ce..aed79ca32944494f0b574a1cd7adedcc00445280 100644
--- a/Source/core/animation/Animation.h
+++ b/Source/core/animation/Animation.h
@@ -66,10 +66,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.get();
}
bool affects(CSSPropertyID) const;
@@ -106,7 +106,7 @@ private:
RefPtrWillBePersistent<AnimationEffect> m_effect;
bool m_activeInAnimationStack;
- OwnPtr<AnimationEffect::CompositableValueList> m_compositableValues;
+ OwnPtr<Vector<RefPtr<Interpolation> > > m_activeInterpolations;
Priority m_priority;

Powered by Google App Engine
This is Rietveld 408576698