Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / animation / InertAnimation.cpp

diff --git a/src/third_party/WebKit/Source/core/animation/InertAnimation.cpp b/src/third_party/WebKit/Source/core/animation/InertAnimation.cpp
index bc87b7c..42479bf 100644 (file)
--- a/src/third_party/WebKit/Source/core/animation/InertAnimation.cpp
+++ b/src/third_party/WebKit/Source/core/animation/InertAnimation.cpp
@@ -46,16 +46,16 @@ InertAnimation::InertAnimation(PassRefPtrWillBeRawPtr<AnimationEffect> effect, c
 {
 }
 
-PassOwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation> > > InertAnimation::sample()
+PassOwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation> > > InertAnimation::sample(double inheritedTime)
 {
-    updateInheritedTime(0);
+    updateInheritedTime(inheritedTime, TimingUpdateOnDemand);
     if (!isInEffect())
         return nullptr;
 
     double iteration = currentIteration();
     ASSERT(iteration >= 0);
     // FIXME: Handle iteration values which overflow int.
-    return m_effect->sample(static_cast<int>(iteration), timeFraction(), duration());
+    return m_effect->sample(static_cast<int>(iteration), timeFraction(), iterationDuration());
 }