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

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

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.cpp
diff --git a/Source/core/animation/Animation.cpp b/Source/core/animation/Animation.cpp
index fe663328a6d2dac2ec9665e662db0b18d2a80d0d..cc0dadd1f0fe9a580d3b75637e65175c60be3b8f 100644
--- a/Source/core/animation/Animation.cpp
+++ b/Source/core/animation/Animation.cpp
@@ -36,6 +36,7 @@
#include "core/animation/AnimationHelpers.h"
#include "core/animation/CompositorAnimations.h"
#include "core/animation/DocumentTimeline.h"
+#include "core/animation/Interpolation.h"
#include "core/animation/KeyframeEffectModel.h"
#include "core/animation/Player.h"
#include "core/css/parser/BisonCSSParser.h"
@@ -359,7 +360,7 @@ void Animation::applyEffects(bool previouslyInEffect)
double iteration = currentIteration();
ASSERT(iteration >= 0);
// FIXME: Handle iteration values which overflow int.
- m_compositableValues = m_effect->sample(static_cast<int>(iteration), timeFraction());
+ m_activeInterpolations = m_effect->sample(static_cast<int>(iteration), timeFraction());
if (player())
m_target->setNeedsAnimationStyleRecalc();
}
@@ -379,7 +380,7 @@ void Animation::clearEffects()
}
m_activeInAnimationStack = false;
- m_compositableValues.clear();
+ m_activeInterpolations.clear();
m_target->setNeedsAnimationStyleRecalc();
invalidate();
}

Powered by Google App Engine
This is Rietveld 408576698