Upstream version 9.38.198.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 ef613d3..483dd14 100644 (file)
--- a/src/third_party/WebKit/Source/core/animation/InertAnimation.cpp
+++ b/src/third_party/WebKit/Source/core/animation/InertAnimation.cpp
@@ -30,31 +30,43 @@
 
 #include "config.h"
 #include "core/animation/InertAnimation.h"
+#include "core/animation/Interpolation.h"
 
-namespace WebCore {
+namespace blink {
 
-PassRefPtr<InertAnimation> InertAnimation::create(PassRefPtr<AnimationEffect> effect, const Timing& timing, bool paused)
+PassRefPtrWillBeRawPtr<InertAnimation> InertAnimation::create(PassRefPtrWillBeRawPtr<AnimationEffect> effect, const Timing& timing, bool paused)
 {
-    return adoptRef(new InertAnimation(effect, timing, paused));
+    return adoptRefWillBeNoop(new InertAnimation(effect, timing, paused));
 }
 
-InertAnimation::InertAnimation(PassRefPtr<AnimationEffect> effect, const Timing& timing, bool paused)
-    : TimedItem(timing)
+InertAnimation::InertAnimation(PassRefPtrWillBeRawPtr<AnimationEffect> effect, const Timing& timing, bool paused)
+    : AnimationNode(timing)
     , m_effect(effect)
     , m_paused(paused)
 {
 }
 
-PassOwnPtr<AnimationEffect::CompositableValueMap> InertAnimation::sample()
+PassOwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation> > > InertAnimation::sample(double inheritedTime)
 {
-    updateInheritedTime(0);
-    return isInEffect() ? m_effect->sample(currentIteration(), timeFraction()) : nullptr;
-}
+    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(), iterationDuration());
+}
 
-double InertAnimation::calculateTimeToEffectChange(double, double, Phase) const
+double InertAnimation::calculateTimeToEffectChange(bool, double, double) const
 {
     return std::numeric_limits<double>::infinity();
 }
 
-} // namespace WebCore
+void InertAnimation::trace(Visitor* visitor)
+{
+    visitor->trace(m_effect);
+    AnimationNode::trace(visitor);
+}
+
+} // namespace blink