Upstream version 9.38.198.0

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

diff --git a/src/third_party/WebKit/Source/core/animation/InterpolableValue.cpp b/src/third_party/WebKit/Source/core/animation/InterpolableValue.cpp
index e1b43a9..67bcfb8 100644 (file)
--- a/src/third_party/WebKit/Source/core/animation/InterpolableValue.cpp
+++ b/src/third_party/WebKit/Source/core/animation/InterpolableValue.cpp
@@ -5,18 +5,18 @@
 #include "config.h"
 #include "core/animation/InterpolableValue.h"
 
-namespace WebCore {
+namespace blink {
 
 DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(InterpolableValue);
 
 PassOwnPtrWillBeRawPtr<InterpolableValue> InterpolableNumber::interpolate(const InterpolableValue &to, const double progress) const
 {
-    const InterpolableNumber* toNumber = toInterpolableNumber(&to);
+    const InterpolableNumber& toNumber = toInterpolableNumber(to);
     if (!progress)
         return create(m_value);
     if (progress == 1)
-        return create(toNumber->m_value);
-    return create(m_value * (1 - progress) + toNumber->m_value * progress);
+        return create(toNumber.m_value);
+    return create(m_value * (1 - progress) + toNumber.m_value * progress);
 }
 
 PassOwnPtrWillBeRawPtr<InterpolableValue> InterpolableBool::interpolate(const InterpolableValue &to, const double progress) const
@@ -29,21 +29,21 @@ PassOwnPtrWillBeRawPtr<InterpolableValue> InterpolableBool::interpolate(const In
 
 PassOwnPtrWillBeRawPtr<InterpolableValue> InterpolableList::interpolate(const InterpolableValue &to, const double progress) const
 {
-    const InterpolableList* toList = toInterpolableList(&to);
-    ASSERT(toList->m_size == m_size);
+    const InterpolableList& toList = toInterpolableList(to);
+    ASSERT(toList.m_size == m_size);
 
     if (!progress) {
         return create(*this);
     }
     if (progress == 1) {
-        return InterpolableList::create(*toList);
+        return InterpolableList::create(toList);
     }
 
     OwnPtrWillBeRawPtr<InterpolableList> result = create(m_size);
     for (size_t i = 0; i < m_size; i++) {
         ASSERT(m_values[i]);
-        ASSERT(toList->m_values[i]);
-        result->set(i, m_values[i]->interpolate(*(toList->m_values[i]), progress));
+        ASSERT(toList.m_values[i]);
+        result->set(i, m_values[i]->interpolate(*(toList.m_values[i]), progress));
     }
     return result.release();
 }
@@ -58,12 +58,12 @@ void InterpolableList::trace(Visitor* visitor)
 
 PassOwnPtrWillBeRawPtr<InterpolableValue> InterpolableAnimatableValue::interpolate(const InterpolableValue &other, const double percentage) const
 {
-    const InterpolableAnimatableValue *otherValue = toInterpolableAnimatableValue(&other);
+    const InterpolableAnimatableValue& otherValue = toInterpolableAnimatableValue(other);
     if (!percentage)
         return create(m_value);
     if (percentage == 1)
-        return create(otherValue->m_value);
-    return create(AnimatableValue::interpolate(m_value.get(), otherValue->m_value.get(), percentage));
+        return create(otherValue.m_value);
+    return create(AnimatableValue::interpolate(m_value.get(), otherValue.m_value.get(), percentage));
 }
 
 void InterpolableAnimatableValue::trace(Visitor* visitor)