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

Unified Diff: Source/core/frame/animation/KeyframeAnimation.cpp

Issue 24085002: Correctly apply per-keyframe timing functions (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 1 month 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/frame/animation/KeyframeAnimation.cpp
diff --git a/Source/core/frame/animation/KeyframeAnimation.cpp b/Source/core/frame/animation/KeyframeAnimation.cpp
index 55f6b152f08a544f315f1a4b33b461585be00305..616981f1d0ca58ba980e87539650814aa8bad41a 100644
--- a/Source/core/frame/animation/KeyframeAnimation.cpp
+++ b/Source/core/frame/animation/KeyframeAnimation.cpp
@@ -147,9 +147,7 @@ void KeyframeAnimation::fetchIntervalEndpointsForProperty(CSSPropertyID property
// A scale of infinity is handled in AnimationBase::fractionalTime().
ASSERT(scale >= 0 && (!std::isinf(scale) || prevIndex == nextIndex));
- // FIXME: This sometimes gets the wrong timing function. See crbug.com/288540.
- const TimingFunction* timingFunction = KeyframeValue::timingFunction(prevKeyframe.style(), name());
- prog = progress(scale, offset, timingFunction);
+ prog = progress(scale, offset, KeyframeValue::timingFunction(*prevKeyframe.style()));
}
void KeyframeAnimation::animate(CompositeAnimation*, RenderObject*, const RenderStyle*, RenderStyle* targetStyle, RefPtr<RenderStyle>& animatedStyle)
« no previous file with comments | « Source/core/css/resolver/StyleResolver.cpp ('k') | Source/core/rendering/animation/WebAnimationProvider.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698