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

Unified Diff: Source/core/animation/Animation.cpp

Issue 15405006: Modify AnimationEffect::sample() to return a CompositableValue (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix rebase Created 7 years, 7 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/Animation.h ('k') | Source/core/animation/AnimationEffect.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/Animation.cpp
diff --git a/Source/core/animation/Animation.cpp b/Source/core/animation/Animation.cpp
index d3a32364977eef09964a13c45b7eeb929bf78cfc..0150c3793419146530c60ad6b79a18327cbe5786 100644
--- a/Source/core/animation/Animation.cpp
+++ b/Source/core/animation/Animation.cpp
@@ -60,7 +60,7 @@ void Animation::applyEffects(bool previouslyActiveOrInEffect)
m_target->addActiveAnimation(this);
m_isInTargetActiveAnimationsList = true;
}
- m_cachedStyle = m_effect->sample(0, currentIteration());
+ m_compositableValues = m_effect->sample(currentIteration(), 0.0);
m_target->setNeedsStyleRecalc(SyntheticStyleChange);
}
@@ -68,7 +68,7 @@ void Animation::clearEffects()
{
m_target->removeActiveAnimation(this);
m_isInTargetActiveAnimationsList = false;
- m_cachedStyle.clear();
+ m_compositableValues.clear();
}
void Animation::updateChildrenAndEffects(bool wasActiveOrInEffect) const
« no previous file with comments | « Source/core/animation/Animation.h ('k') | Source/core/animation/AnimationEffect.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698