Web Animations CSS: Support Animation of StyleImage and LengthBox

Source/core/animation/AnimatableValue.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 27 matching lines @@
 
 class CSSValue;
 
 class AnimatableValue : public RefCounted<AnimatableValue> {
 public:
     virtual ~AnimatableValue() { }
 
     static const AnimatableValue* neutralValue();
 
     static PassRefPtr<AnimatableValue> interpolate(const AnimatableValue*, const AnimatableValue*, double fraction);
+    static PassRefPtr<AnimatableValue> defaultInterpolateTo(const AnimatableValue* left, const AnimatableValue* right, double fraction) { return takeConstRef((fraction < 0.5) ? left : right); }
     // For noncommutative values read add(A, B) to mean the value A with B composed onto it.
     static PassRefPtr<AnimatableValue> add(const AnimatableValue*, const AnimatableValue*);
+    static PassRefPtr<AnimatableValue> defaultAddWith(const AnimatableValue* left, const AnimatableValue* right) { return takeConstRef(right); }

[alancutter (OOO until 2018), 2013/08/27 02:37:45]

Is there a use for exposing these methods publicly?

[dstockwell, 2013/08/27 05:02:02]

This was for AnimatableList, I'll revert it.

 
+    bool isImage() const { return m_type == TypeImage; }
+    bool isLengthBox() const { return m_type == TypeLengthBox; }
     bool isNumber() const { return m_type == TypeNumber; }
     bool isNeutral() const { return m_type == TypeNeutral; }
     bool isTransform() const { return m_type == TypeTransform; }
     bool isUnknown() const { return m_type == TypeUnknown; }
 
 protected:
     enum AnimatableType {
+        TypeImage,
+        TypeLengthBox,
         TypeNeutral,
         TypeNumber,
         TypeTransform,
         TypeUnknown,
     };
 
     AnimatableValue(AnimatableType type) : m_type(type) { }
 
     bool isSameType(const AnimatableValue* value) const
     {
         ASSERT(value);
         return value->m_type == m_type;
     }
 
     virtual PassRefPtr<AnimatableValue> interpolateTo(const AnimatableValue*, double fraction) const = 0;
-    static PassRefPtr<AnimatableValue> defaultInterpolateTo(const AnimatableValue* left, const AnimatableValue* right, double fraction) { return takeConstRef((fraction < 0.5) ? left : right); }
 
     // For noncommutative values read A->addWith(B) to mean the value A with B composed onto it.
     virtual PassRefPtr<AnimatableValue> addWith(const AnimatableValue*) const = 0;
-    static PassRefPtr<AnimatableValue> defaultAddWith(const AnimatableValue* left, const AnimatableValue* right) { return takeConstRef(right); }
 
     template <class T>
     static PassRefPtr<T> takeConstRef(const T* value) { return PassRefPtr<T>(const_cast<T*>(value)); }
 
     const AnimatableType m_type;
 };
 
 } // namespace WebCore
 
 #endif // AnimatableValue_h