Web Animations: Add CSSAnimatableValueFactory API (partial implementation)

Source/core/animation/AnimatableNumber.h

Index: Source/core/animation/AnimatableNumber.h
diff --git a/Source/core/animation/AnimatableNumber.h b/Source/core/animation/AnimatableNumber.h
index 42a6d687356e91e81367857a09ab4045ae06f3c5..39e774a625691f64609696e377c83844c4389ec2 100644
--- a/Source/core/animation/AnimatableNumber.h
+++ b/Source/core/animation/AnimatableNumber.h
@@ -42,18 +42,8 @@ namespace WebCore {
 // If created from a CSSPrimitiveValue this class will cache it to be returned in toCSSValue().
 class AnimatableNumber : public AnimatableValue {
 public:
-    virtual ~AnimatableNumber() { }
-    static bool canCreateFrom(const CSSValue*);
-    static PassRefPtr<AnimatableNumber> create(CSSValue*);
-    virtual PassRefPtr<CSSValue> toCSSValue() const OVERRIDE;
-
-protected:
-    virtual PassRefPtr<AnimatableValue> interpolateTo(const AnimatableValue*, double fraction) const OVERRIDE;
-    virtual PassRefPtr<AnimatableValue> addWith(const AnimatableValue*) const OVERRIDE;
-
-private:
     enum NumberUnitType {
-        UnitTypeNone,
+        UnitTypeNumber,
         UnitTypeLength,
         UnitTypeFontSize,
         UnitTypeFontXSize,
@@ -70,6 +60,20 @@ private:
         UnitTypeInvalid,
     };
 
+    virtual ~AnimatableNumber() { }
+    static bool canCreateFrom(const CSSValue*);
+    static PassRefPtr<AnimatableNumber> create(CSSValue*);
+    static PassRefPtr<AnimatableNumber> create(double number, NumberUnitType unitType, CSSPrimitiveValue* cssPrimitiveValue = 0)
+    {
+        return adoptRef(new AnimatableNumber(number, unitType, cssPrimitiveValue));
+    }
+    virtual PassRefPtr<CSSValue> toCSSValue() const OVERRIDE;
+
+protected:
+    virtual PassRefPtr<AnimatableValue> interpolateTo(const AnimatableValue*, double fraction) const OVERRIDE;
+    virtual PassRefPtr<AnimatableValue> addWith(const AnimatableValue*) const OVERRIDE;
+
+private:
     AnimatableNumber(double number, NumberUnitType unitType, CSSPrimitiveValue* cssPrimitiveValue)
         : AnimatableValue(TypeNumber)
         , m_number(number)
@@ -88,10 +92,6 @@ private:
         ASSERT(m_calcExpression);
     }
 
-    static PassRefPtr<AnimatableNumber> create(double number, NumberUnitType unitType, CSSPrimitiveValue* cssPrimitiveValue = 0)
-    {
-        return adoptRef(new AnimatableNumber(number, unitType, cssPrimitiveValue));
-    }
     static PassRefPtr<AnimatableNumber> create(PassRefPtr<CSSCalcExpressionNode> calcExpression, CSSPrimitiveValue* cssPrimitiveValue = 0)
     {
         return adoptRef(new AnimatableNumber(calcExpression, cssPrimitiveValue));