Web Animations: Fix CSS events to handle animations with very short durations

Source/core/animation/css/CSSAnimations.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 24 matching lines @@
 #include "core/animation/KeyframeAnimationEffect.h"
 #include "core/css/CSSKeyframeRule.h"
 #include "core/css/resolver/StyleResolver.h"
 #include "core/dom/AnimationEvent.h"
 #include "core/dom/Element.h"
 #include "core/dom/EventNames.h"
 #include "core/platform/animation/CSSAnimationDataList.h"
 #include "core/platform/animation/TimingFunction.h"
 #include "wtf/HashSet.h"
 
+namespace {
+
+using namespace WebCore;
+
+bool isEarlierPhase(TimedItem::Phase target, TimedItem::Phase reference)
+{
+    ASSERT(target != TimedItem::PhaseNone);
+    ASSERT(reference != TimedItem::PhaseNone);
+    return target < reference;
+}
+
+bool isLaterPhase(TimedItem::Phase target, TimedItem::Phase reference)
+{
+    ASSERT(target != TimedItem::PhaseNone);
+    ASSERT(reference != TimedItem::PhaseNone);
+    return target > reference;
+}
+
+} // namespace
+
 namespace WebCore {
 
 void timingFromAnimationData(const CSSAnimationData* animationData, Timing& timing)
 {
     if (animationData->isDelaySet())
         timing.startDelay = animationData->delay();
     if (animationData->isDurationSet()) {
         timing.iterationDuration = animationData->duration();
         timing.hasIterationDuration = true;
     }
@@ skipping 153 matching lines @@
 
     m_animations.clear();
 }
 
 void CSSAnimations::EventDelegate::maybeDispatch(Document::ListenerType listenerType, AtomicString& eventName, double elapsedTime)
 {
     if (m_target->document()->hasListenerType(listenerType))
         m_target->document()->timeline()->addEventToDispatch(m_target, AnimationEvent::create(eventName, m_name, elapsedTime));
 }
 
-void CSSAnimations::EventDelegate::onEventCondition(bool wasInPlay, bool isInPlay, double previousIteration, double currentIteration)
+void CSSAnimations::EventDelegate::onEventCondition(bool isFirstSample, TimedItem::Phase previousPhase, TimedItem::Phase phase, double previousIteration, double currentIteration)

[dstockwell, 2013/08/21 06:21:53]

phase -> currentPhase or currentIteration -> iteration for consistency

 {
     // Events for a single document are queued and dispatched as a group at
     // the end of DocumentTimeline::serviceAnimations.
     // FIXME: Events which are queued outside of serviceAnimations should
     // trigger a timer to dispatch when control is released.
     // FIXME: Receive TimedItem as param in order to produce correct elapsed time value.
     double elapsedTime = 0;
-    if (!wasInPlay && isInPlay) {
-        maybeDispatch(Document::ANIMATIONSTART_LISTENER, eventNames().webkitAnimationStartEvent, elapsedTime);
-        return;
-    }
-    if (wasInPlay && isInPlay && currentIteration != previousIteration) {
+    if (previousPhase == TimedItem::PhaseActive && phase == TimedItem::PhaseActive && previousIteration != currentIteration) {
         maybeDispatch(Document::ANIMATIONITERATION_LISTENER, eventNames().webkitAnimationIterationEvent, elapsedTime);
         return;
     }
-    if (wasInPlay && !isInPlay) {
+    if ((isFirstSample || previousPhase == TimedItem::PhaseBefore) && isLaterPhase(phase, TimedItem::PhaseBefore))
+        maybeDispatch(Document::ANIMATIONSTART_LISTENER, eventNames().webkitAnimationStartEvent, elapsedTime);
+    if ((isFirstSample || isEarlierPhase(previousPhase, TimedItem::PhaseAfter)) && phase == TimedItem::PhaseAfter)
         maybeDispatch(Document::ANIMATIONEND_LISTENER, eventNames().webkitAnimationEndEvent, elapsedTime);
-        return;
-    }
 }
 
 } // namespace WebCore