Web Animations: Introduce ActiveAnimations and AnimationStack

Source/core/animation/Animation.cpp

 /*
  * 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 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/animation/Animation.h"
 
+#include "core/animation/DocumentTimeline.h"
+#include "core/animation/Player.h"
 #include "core/dom/Element.h"
 
 namespace WebCore {
 
 PassRefPtr<Animation> Animation::create(PassRefPtr<Element> target, PassRefPtr<AnimationEffect> effect, const Timing& timing)
 {
     return adoptRef(new Animation(target, effect, timing));
 }
 
 Animation::Animation(PassRefPtr<Element> target, PassRefPtr<AnimationEffect> effect, const Timing& timing)
     : TimedItem(timing)
     , m_target(target)
     , m_effect(effect)
-    , m_isInTargetActiveAnimationsList(false)
+    , m_activeInAnimationStack(false)
 {
 }
 
-Animation::~Animation()
+void Animation::willDetach()
 {
-    if (m_isInTargetActiveAnimationsList)
-        m_target->removeActiveAnimation(this);
+    ASSERT(player());
+    if (m_activeInAnimationStack)
+        player()->timeline()->animationStack().remove(m_target.get(), this);
 }
 
 void Animation::applyEffects(bool previouslyActiveOrInEffect)
 {
+    ASSERT(player());
     if (!previouslyActiveOrInEffect) {
-        m_target->addActiveAnimation(this);
-        m_isInTargetActiveAnimationsList = true;
+        player()->timeline()->animationStack().add(m_target.get(), this);
+        m_activeInAnimationStack = true;
     }
     m_compositableValues = m_effect->sample(currentIteration(), timeFraction());
     m_target->setNeedsStyleRecalc(LocalStyleChange, StyleChangeFromRenderer);
 }
 
 void Animation::clearEffects()
 {
-    m_target->removeActiveAnimation(this);
-    m_isInTargetActiveAnimationsList = false;
+    ASSERT(player());
+    player()->timeline()->animationStack().remove(m_target.get(), this);
+    m_activeInAnimationStack = false;

[shans, 2013/07/17 06:25:28]

reuse willDetach() here? Or add a detach() function?

[dstockwell, 2013/07/17 13:10:19]

Done.

     m_compositableValues.clear();
 }
 
 void Animation::updateChildrenAndEffects(bool wasActiveOrInEffect) const
 {
     const bool isActiveOrInEffect = isActive() || isInEffect();
-    ASSERT(m_isInTargetActiveAnimationsList == wasActiveOrInEffect);
+    ASSERT(m_activeInAnimationStack == wasActiveOrInEffect);
     if (wasActiveOrInEffect && !isActiveOrInEffect)
         const_cast<Animation*>(this)->clearEffects();
     else if (isActiveOrInEffect)
         const_cast<Animation*>(this)->applyEffects(wasActiveOrInEffect);
 }
 
 } // namespace WebCore