Web Animations CSS: Split AnimatableNumber into AnimatableDouble and AnimatableLength

Source/core/animation/css/CSSAnimatableValueFactory.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 15 matching lines @@
  * 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/css/CSSAnimatableValueFactory.h"
 
 #include "CSSValueKeywords.h"
 #include "core/animation/AnimatableColor.h"
+#include "core/animation/AnimatableDouble.h"
 #include "core/animation/AnimatableImage.h"
+#include "core/animation/AnimatableLength.h"
 #include "core/animation/AnimatableLengthBox.h"
 #include "core/animation/AnimatableLengthSize.h"
-#include "core/animation/AnimatableNumber.h"
 #include "core/animation/AnimatableTransform.h"
 #include "core/animation/AnimatableUnknown.h"
 #include "core/animation/AnimatableVisibility.h"
 #include "core/animation/css/CSSAnimations.h"
 #include "core/css/CSSPrimitiveValue.h"
 #include "core/platform/Length.h"
 #include "core/platform/LengthBox.h"
 #include "core/rendering/style/RenderStyle.h"
 
 
 namespace WebCore {
 
 static PassRefPtr<AnimatableValue> createFromLength(const Length& length, const RenderStyle* style)
 {
     switch (length.type()) {
-    case Relative:
-        return AnimatableNumber::create(length.value(), AnimatableNumber::UnitTypeNumber);
     case Fixed:
-        return AnimatableNumber::create(adjustFloatForAbsoluteZoom(length.value(), style), AnimatableNumber::UnitTypeLength);
+        return AnimatableLength::create(adjustFloatForAbsoluteZoom(length.value(), style), AnimatableLength::UnitTypeLength);
     case Percent:
-        return AnimatableNumber::create(length.value(), AnimatableNumber::UnitTypePercentage);
+        return AnimatableLength::create(length.value(), AnimatableLength::UnitTypePercentage);
     case ViewportPercentageWidth:
-        return AnimatableNumber::create(length.value(), AnimatableNumber::UnitTypeViewportWidth);
+        return AnimatableLength::create(length.value(), AnimatableLength::UnitTypeViewportWidth);
     case ViewportPercentageHeight:
-        return AnimatableNumber::create(length.value(), AnimatableNumber::UnitTypeViewportHeight);
+        return AnimatableLength::create(length.value(), AnimatableLength::UnitTypeViewportHeight);
     case ViewportPercentageMin:
-        return AnimatableNumber::create(length.value(), AnimatableNumber::UnitTypeViewportMin);
+        return AnimatableLength::create(length.value(), AnimatableLength::UnitTypeViewportMin);
     case ViewportPercentageMax:
-        return AnimatableNumber::create(length.value(), AnimatableNumber::UnitTypeViewportMax);
+        return AnimatableLength::create(length.value(), AnimatableLength::UnitTypeViewportMax);
     case Calculated:
         // FIXME: Convert platform calcs to CSS calcs.
         ASSERT_WITH_MESSAGE(false, "Web Animations not yet implemented: Convert platform CalculationValue to AnimatableValue");
         return 0;
     case Auto:
     case Intrinsic:
     case MinIntrinsic:
     case MinContent:
     case MaxContent:
     case FillAvailable:
     case FitContent:
         return AnimatableUnknown::create(CSSPrimitiveValue::create(length));
     case Undefined:
         return AnimatableUnknown::create(CSSPrimitiveValue::create(CSSValueNone));
     case ExtendToZoom: // Does not apply to elements.
+    case Relative:

[dstockwell, 2013/09/30 22:01:58]

Need a comment about why we don't expect this.

[alancutter (OOO until 2018), 2013/09/30 23:04:43]

Done.

         ASSERT_NOT_REACHED();
         return 0;
     }
     ASSERT_NOT_REACHED();
     return 0;
 }
 
 inline static PassRefPtr<AnimatableValue> createFromDouble(double value)
 {
-    return AnimatableNumber::create(value, AnimatableNumber::UnitTypeNumber);
+    return AnimatableDouble::create(value);
 }
 
 inline static PassRefPtr<AnimatableValue> createFromLengthBox(const LengthBox lengthBox, const RenderStyle* style)
 {
     return AnimatableLengthBox::create(
         createFromLength(lengthBox.left(), style),
         createFromLength(lengthBox.right(), style),
         createFromLength(lengthBox.top(), style),
         createFromLength(lengthBox.bottom(), style));
 }
@@ skipping 153 matching lines @@
     case CSSPropertyZIndex:
         return createFromDouble(style->zIndex());
     default:
         RELEASE_ASSERT_WITH_MESSAGE(!CSSAnimations::isAnimatableProperty(property), "Web Animations not yet implemented: Create AnimatableValue from render style: %s", getPropertyNameString(property).utf8().data());
         ASSERT_NOT_REACHED();
         return 0;
     }
 }
 
 } // namespace WebCore