| Index: Source/core/platform/animation/StyleAnimationData.h
|
| diff --git a/Source/core/platform/animation/CSSAnimationData.h b/Source/core/platform/animation/StyleAnimationData.h
|
| similarity index 87%
|
| rename from Source/core/platform/animation/CSSAnimationData.h
|
| rename to Source/core/platform/animation/StyleAnimationData.h
|
| index de7980a7e08565669b1adc0041d7a30bc2b2fded..e59eee461fd7a1eb0c53ee009b3773cf845ab3d7 100644
|
| --- a/Source/core/platform/animation/CSSAnimationData.h
|
| +++ b/Source/core/platform/animation/StyleAnimationData.h
|
| @@ -22,8 +22,8 @@
|
| *
|
| */
|
|
|
| -#ifndef CSSAnimationData_h
|
| -#define CSSAnimationData_h
|
| +#ifndef StyleAnimationData_h
|
| +#define StyleAnimationData_h
|
|
|
| #include "CSSPropertyNames.h"
|
| #include "core/platform/animation/TimingFunction.h"
|
| @@ -34,12 +34,12 @@
|
|
|
| namespace WebCore {
|
|
|
| -class CSSAnimationData : public RefCounted<CSSAnimationData> {
|
| +class StyleAnimationData : public RefCounted<StyleAnimationData> {
|
| public:
|
| - ~CSSAnimationData();
|
| + ~StyleAnimationData();
|
|
|
| - static PassRefPtr<CSSAnimationData> create() { return adoptRef(new CSSAnimationData); }
|
| - static PassRefPtr<CSSAnimationData> create(const CSSAnimationData* o) { return adoptRef(new CSSAnimationData(*o)); }
|
| + static PassRefPtr<StyleAnimationData> create() { return adoptRef(new StyleAnimationData); }
|
| + static PassRefPtr<StyleAnimationData> create(const StyleAnimationData* o) { return adoptRef(new StyleAnimationData(*o)); }
|
|
|
| bool isDelaySet() const { return m_delaySet; }
|
| bool isDirectionSet() const { return m_directionSet; }
|
| @@ -53,7 +53,7 @@ public:
|
|
|
| // Flags this to be the special "none" animation (animation-name: none)
|
| bool isNoneAnimation() const { return m_isNone; }
|
| - // We can make placeholder CSSAnimationData objects to keep the comma-separated lists
|
| + // We can make placeholder StyleAnimationData objects to keep the comma-separated lists
|
| // of properties in sync. isValidAnimation means this is not a placeholder.
|
| bool isValidAnimation() const { return !m_isNone && !m_name.isEmpty(); }
|
|
|
| @@ -134,21 +134,21 @@ public:
|
|
|
| void setIsNoneAnimation(bool n) { m_isNone = n; }
|
|
|
| - CSSAnimationData& operator=(const CSSAnimationData& o);
|
| + StyleAnimationData& operator=(const StyleAnimationData& o);
|
|
|
| // return true if all members of this class match (excluding m_next)
|
| - bool animationsMatch(const CSSAnimationData*, bool matchPlayStates = true) const;
|
| + bool animationsMatch(const StyleAnimationData*, bool matchPlayStates = true) const;
|
|
|
| - // return true every CSSAnimationData in the chain (defined by m_next) match
|
| - bool operator==(const CSSAnimationData& o) const { return animationsMatch(&o); }
|
| - bool operator!=(const CSSAnimationData& o) const { return !(*this == o); }
|
| + // return true every StyleAnimationData in the chain (defined by m_next) match
|
| + bool operator==(const StyleAnimationData& o) const { return animationsMatch(&o); }
|
| + bool operator!=(const StyleAnimationData& o) const { return !(*this == o); }
|
|
|
| bool fillsBackwards() const { return m_fillModeSet && (m_fillMode == AnimationFillModeBackwards || m_fillMode == AnimationFillModeBoth); }
|
| bool fillsForwards() const { return m_fillModeSet && (m_fillMode == AnimationFillModeForwards || m_fillMode == AnimationFillModeBoth); }
|
|
|
| private:
|
| - CSSAnimationData();
|
| - CSSAnimationData(const CSSAnimationData& o);
|
| + StyleAnimationData();
|
| + StyleAnimationData(const StyleAnimationData& o);
|
|
|
| String m_name;
|
| CSSPropertyID m_property;
|
| @@ -188,4 +188,4 @@ public:
|
|
|
| } // namespace WebCore
|
|
|
| -#endif // CSSAnimationData_h
|
| +#endif // StyleAnimationData_h
|
|
|