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

Unified Diff: Source/core/animation/css/CSSAnimations.cpp

Issue 23451019: Use AnimationData::initialAnimationTimingFunction() in CSSAnimations::timingFromAnimationData() (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 3 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/css/CSSAnimations.cpp
diff --git a/Source/core/animation/css/CSSAnimations.cpp b/Source/core/animation/css/CSSAnimations.cpp
index a13cbdada412c024d821d5d13b6818615eb9c46e..ce36831af509baa8b12a110de6e11ddb8ca48448 100644
--- a/Source/core/animation/css/CSSAnimations.cpp
+++ b/Source/core/animation/css/CSSAnimations.cpp
@@ -79,12 +79,15 @@ void timingFromAnimationData(const CSSAnimationData* animationData, Timing& timi
else
timing.iterationCount = animationData->iterationCount();
}
+ // For CSS animations, timing functions apply to individual keyframes, not
+ // to the complete animation.
+ // FIXME: Until chained timing functions are implemented, we simply apply
+ // the default timing function to the complete animation.
if (animationData->isTimingFunctionSet()) {
if (animationData->timingFunction()->type() != TimingFunction::LinearFunction)
timing.timingFunction = animationData->timingFunction();
} else {
- // CSS default is ease, default in model is linear.
- timing.timingFunction = CubicBezierTimingFunction::preset(CubicBezierTimingFunction::Ease);
+ timing.timingFunction = CSSAnimationData::initialAnimationTimingFunction();
}
if (animationData->isFillModeSet()) {
switch (animationData->fillMode()) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698