Web Animations: Add an event delegate to allow different forms of event dispatch

Source/core/animation/TimedItem.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 16 matching lines @@
  * (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/TimedItem.h"
 #include "core/animation/TimedItemCalculations.h"
 
 namespace WebCore {
 
-TimedItem::TimedItem(const Timing& timing)
+TimedItem::TimedItem(const Timing& timing, PassOwnPtr<TimedItemEventDelegate> eventDelegate)
     : m_parent(0)
     , m_player(0)
     , m_startTime(0)
     , m_specified(timing)
     , m_calculated()
+    , m_eventDelegate(eventDelegate)
 {
     timing.assertValid();
 }
 
 void TimedItem::updateInheritedTime(double inheritedTime) const
 {
     const double localTime = inheritedTime - m_startTime;
     const double iterationDuration = m_specified.hasIterationDuration
         ? m_specified.iterationDuration
         : intrinsicIterationDuration();
@@ skipping 26 matching lines @@
         const TimedItem::Phase phase = calculatePhase(activeDuration, newLocalTime, m_specified);
         const double activeTime = calculateActiveTime(activeDuration, newLocalTime, parentPhase, phase, m_specified);
         const double startOffset = m_specified.iterationStart * iterationDuration;
         const double scaledActiveTime = calculateScaledActiveTime(activeDuration, activeTime, startOffset, m_specified);
         const double iterationTime = calculateIterationTime(iterationDuration, repeatedDuration, scaledActiveTime, startOffset, m_specified);
 
         currentIteration = calculateCurrentIteration(iterationDuration, iterationTime, scaledActiveTime, m_specified);
         timeFraction = calculateTransformedTime(currentIteration, iterationDuration, iterationTime, m_specified);
     }
 
+    const double lastIteration = m_calculated.currentIteration;
     m_calculated.currentIteration = currentIteration;
     m_calculated.activeDuration = activeDuration;
     m_calculated.timeFraction = timeFraction;
 
-    const bool wasInEffect = isInEffect();
+    const bool wasInEffect = m_calculated.isInEffect;
+    const bool wasInPlay = m_calculated.isInPlay;
     m_calculated.isInEffect = !isNull(activeTime);
     m_calculated.isInPlay = phase == PhaseActive && (!m_parent || m_parent->isInPlay());
     m_calculated.isCurrent = phase == PhaseBefore || isInPlay() || (m_parent && m_parent->isCurrent());
 
+    if (m_eventDelegate && (isInPlay() != wasInPlay || (isInPlay() && lastIteration != currentIteration)))
+        m_eventDelegate->onEventCondition(wasInPlay, isInPlay(), lastIteration, currentIteration);
+
     // FIXME: This probably shouldn't be recursive.
     updateChildrenAndEffects(wasInEffect);
 }
 
 TimedItem::CalculatedTiming::CalculatedTiming()
     : activeDuration(nullValue())
     , currentIteration(nullValue())
     , timeFraction(nullValue())
     , isCurrent(false)
     , isInEffect(false)
     , isInPlay(false)
 {
 }
 
 } // namespace WebCore