Web Animations CSS: Split AnimatableNumber into AnimatableDouble and AnimatableLength

Source/core/animation/AnimatableDouble.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 11 matching lines @@
  * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
-#include "core/animation/AnimatableVisibility.h"
+#include "core/animation/AnimatableDouble.h"
+
+#include "core/css/CSSPrimitiveValue.h"
+#include "core/css/CSSValuePool.h"
+#include "core/platform/animation/AnimationUtilities.h"
 
 namespace WebCore {
 
-PassRefPtr<AnimatableValue> AnimatableVisibility::interpolateTo(const AnimatableValue* value, double fraction) const
+PassRefPtr<CSSValue> AnimatableDouble::toCSSValue() const
 {
-    EVisibility from = m_visibility;
-    EVisibility to = toAnimatableVisibility(value)->m_visibility;
-    if (from != VISIBLE && to != VISIBLE)
-        return defaultInterpolateTo(this, value, fraction);
-    if (fraction <= 0)
+    return cssValuePool().createValue(m_number, CSSPrimitiveValue::CSS_NUMBER);
+}
+
+PassRefPtr<AnimatableValue> AnimatableDouble::interpolateTo(const AnimatableValue* value, double fraction) const
+{
+    const AnimatableDouble* other = toAnimatableDouble(value);
+    return AnimatableDouble::create(blend(m_number, other->m_number, fraction));
+}
+
+PassRefPtr<AnimatableValue> AnimatableDouble::addWith(const AnimatableValue* value) const
+{
+    // Optimization for adding with 0.
+    if (!m_number)
+        return takeConstRef(value);
+    const AnimatableDouble* other = toAnimatableDouble(value);
+    if (!other->m_number)
         return takeConstRef(this);
-    if (fraction >= 1)
-        return takeConstRef(value);
-    return takeConstRef(from == VISIBLE ? this : value);
+
+    return AnimatableDouble::create(m_number + other->m_number);
 }
 
 } // namespace WebCore