| Index: Source/core/animation/css/CSSAnimations.h
|
| diff --git a/Source/core/animation/ActiveAnimations.h b/Source/core/animation/css/CSSAnimations.h
|
| similarity index 73%
|
| copy from Source/core/animation/ActiveAnimations.h
|
| copy to Source/core/animation/css/CSSAnimations.h
|
| index e4c748c8d98df13815d05a1a3d262eab0653d5f4..69ed03070e39bbf72f727edbac280113104dfb3a 100644
|
| --- a/Source/core/animation/ActiveAnimations.h
|
| +++ b/Source/core/animation/css/CSSAnimations.h
|
| @@ -1,3 +1,4 @@
|
| +
|
| /*
|
| * Copyright (C) 2013 Google Inc. All rights reserved.
|
| *
|
| @@ -28,26 +29,35 @@
|
| * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| */
|
|
|
| -#ifndef ActiveAnimations_h
|
| -#define ActiveAnimations_h
|
| +#ifndef CSSAnimations_h
|
| +#define CSSAnimations_h
|
| +
|
| +#include "core/animation/Animation.h"
|
|
|
| -#include "core/animation/AnimationStack.h"
|
| +#include "core/animation/Player.h"
|
| +#include "core/rendering/style/RenderStyleConstants.h"
|
| #include "wtf/HashMap.h"
|
| -#include "wtf/RefPtr.h"
|
| #include "wtf/Vector.h"
|
| +#include "wtf/text/AtomicString.h"
|
|
|
| namespace WebCore {
|
|
|
| -class AnimationStack;
|
| +class CSSAnimationDataList;
|
| +class Element;
|
| +class RenderObject;
|
| +class StyleResolver;
|
| +
|
| +class CSSAnimations FINAL {
|
|
|
| -class ActiveAnimations {
|
| public:
|
| - AnimationStack* defaultStack() { return &m_defaultStack; }
|
| - bool isEmpty() const { return !m_defaultStack.hasActiveAnimations(); }
|
| + CSSAnimations() { }
|
| + bool isEmpty() const { return m_animations.isEmpty(); }
|
| + void cancel();
|
| + void update(Element*, EDisplay, StyleResolver*, const CSSAnimationDataList*);
|
| +
|
| private:
|
| - AnimationStack m_defaultStack;
|
| - // FIXME: Add AnimationStack for CSS Transitions
|
| - // FIXME: Add tracking data for CSS Animations
|
| + typedef HashMap<StringImpl*, Player*> AnimationMap;
|
| + AnimationMap m_animations;
|
| };
|
|
|
| } // namespace WebCore
|
|
|