Web Animations: Trigger and update CSS Animations backed by the Web Animations model

Source/core/animation/ActiveAnimations.h

Index: Source/core/animation/ActiveAnimations.h
diff --git a/Source/core/animation/ActiveAnimations.h b/Source/core/animation/ActiveAnimations.h
index e4c748c8d98df13815d05a1a3d262eab0653d5f4..824ca95a269c22b6aefc7271ac150c9d4f3aaf75 100644
--- a/Source/core/animation/ActiveAnimations.h
+++ b/Source/core/animation/ActiveAnimations.h
@@ -32,22 +32,29 @@
 #define ActiveAnimations_h
 
 #include "core/animation/AnimationStack.h"
+#include "core/animation/css/CSSAnimations.h"
 #include "wtf/HashMap.h"
 #include "wtf/RefPtr.h"
 #include "wtf/Vector.h"
 
 namespace WebCore {
 
-class AnimationStack;
-
 class ActiveAnimations {
 public:
+    // Animations that are currently active for this element, their effects will be applied
+    // during a style recalc.
     AnimationStack* defaultStack() { return &m_defaultStack; }
-    bool isEmpty() const { return !m_defaultStack.hasActiveAnimations(); }
+    // Tracks the state of active CSS Animations. When active the individual animations will

[Steve Block, 2013/08/06 03:57:01]

Not sure I understand this comment. If this tracks _active_ CSS animations,
won't they all appear in the default stack?

[dstockwell, 2013/08/06 05:43:25]

Yes, they are always active. I'll simplify the comment.

+    // also be part of the default stack, but the mapping betwen animation name and player
+    // is kept here.
+    CSSAnimations* cssAnimations() { return &m_cssAnimations; }
+    // FIXME: Add AnimationStack for CSS Transitions
+    // CSS Transitions form a separate animation stack as they apply at a different level of
+    // the style cascade. Active transitions will not be present in the default stack.
+    bool isEmpty() const { return m_defaultStack.isEmpty() && m_cssAnimations.isEmpty(); }
 private:
     AnimationStack m_defaultStack;
-    // FIXME: Add AnimationStack for CSS Transitions
-    // FIXME: Add tracking data for CSS Animations
+    CSSAnimations m_cssAnimations;
 };
 
 } // namespace WebCore