| 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)
|
|
|