Web Animations: Add CSSAnimatableValueFactory API (partial implementation)

Source/core/animation/AnimatableNumber.h

 /*
  * 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 24 matching lines @@
 #include "core/css/CSSCalculationValue.h"
 #include "core/css/CSSPrimitiveValue.h"
 
 namespace WebCore {
 
 // Handles animation of CSSPrimitiveValues that can be represented by doubles including CSSCalcValue.
 // See primitiveUnitToNumberType() for the list of supported units (with the exception of calc).
 // 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,
         UnitTypeRootFontSize,
         UnitTypePercentage,
         UnitTypeViewportWidth,
         UnitTypeViewportHeight,
         UnitTypeViewportMin,
         UnitTypeViewportMax,
         UnitTypeTime,
         UnitTypeAngle,
         UnitTypeFrequency,
         UnitTypeResolution,
         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)
         , m_unitType(unitType)
         , m_isCalc(false)
         , m_cachedCSSPrimitiveValue(cssPrimitiveValue)
     {
         ASSERT(m_unitType != UnitTypeInvalid);
     }
     AnimatableNumber(PassRefPtr<CSSCalcExpressionNode> calcExpression, CSSPrimitiveValue* cssPrimitiveValue)
         : AnimatableValue(TypeNumber)
         , m_isCalc(true)
         , m_calcExpression(calcExpression)
         , m_cachedCSSPrimitiveValue(cssPrimitiveValue)
     {
         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));
     }
     static PassRefPtr<AnimatableNumber> create(const AnimatableNumber* leftAddend, const AnimatableNumber* rightAddend);
 
     PassRefPtr<CSSPrimitiveValue> toCSSPrimitiveValue() const;
     PassRefPtr<CSSCalcExpressionNode> toCSSCalcExpressionNode() const;
 
     PassRefPtr<AnimatableNumber> scale(double) const;
     static NumberUnitType primitiveUnitToNumberType(unsigned short primitiveUnit);
     static unsigned short numberTypeToPrimitiveUnit(NumberUnitType numberType);
 
     double m_number;
     NumberUnitType m_unitType;
 
     bool m_isCalc;
     RefPtr<CSSCalcExpressionNode> m_calcExpression;
 
     mutable RefPtr<CSSPrimitiveValue> m_cachedCSSPrimitiveValue;
 };
 
 
 } // namespace WebCore
 
 #endif // AnimatableNumber_h