Make sure begin and end events are dispatched for back-to-back intervals

Source/core/svg/animation/SVGSMILElement.cpp

 /*
  * Copyright (C) 2008 Apple 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 982 matching lines @@
                 notifyDependentsIntervalChanged();
             }
         }
     }
     m_nextProgressTime = elapsed;
 
     if (m_timeContainer)
         m_timeContainer->notifyIntervalsChanged();
 }
 
-void SVGSMILElement::checkRestart(SMILTime elapsed)
+bool SVGSMILElement::checkRestart(SMILTime elapsed)

[pdr., 2014/02/03 23:23:00]

Can we clean this up a bit?

I'll offer a suggestion:
RestartedInterval SVGSMILElement::maybeTriggerRestart(SMILTime elapsed)
where RestartedInterval is an enum with two values: DidRestartInterval and
DidNotRestartInterval.

 {
     ASSERT(!m_isWaitingForFirstInterval);
     ASSERT(elapsed >= m_intervalBegin);
 
     Restart restart = this->restart();
     if (restart == RestartNever)
-        return;
+        return false;
 
     if (elapsed < m_intervalEnd) {
         if (restart != RestartAlways)
-            return;
+            return false;
         SMILTime nextBegin = findInstanceTime(Begin, m_intervalBegin, false);
         if (nextBegin < m_intervalEnd) {
             m_intervalEnd = nextBegin;
             notifyDependentsIntervalChanged();
         }
     }
 
     if (elapsed >= m_intervalEnd)
-        resolveNextInterval();
+        return resolveNextInterval();
+
+    return false;
 }
 
 void SVGSMILElement::seekToIntervalCorrespondingToTime(SMILTime elapsed)
 {
     ASSERT(!m_isWaitingForFirstInterval);
     ASSERT(elapsed >= m_intervalBegin);
 
     // Manually seek from interval to interval, just as if the animation would run regulary.
     while (true) {
         // Figure out the next value in the begin time list after the current interval begin.
@@ skipping 126 matching lines @@
         seekToIntervalCorrespondingToTime(elapsed);
         if (elapsed < m_intervalBegin) {
             // elapsed is not within an interval.
             m_nextProgressTime = m_intervalBegin;
             return false;
         }
     }
 
     unsigned repeat = 0;
     float percent = calculateAnimationPercentAndRepeat(elapsed, repeat);
-    checkRestart(elapsed);
+    bool didRestart = checkRestart(elapsed);
 
     ActiveState oldActiveState = m_activeState;
     m_activeState = determineActiveState(elapsed);
     bool animationIsContributing = isContributing(elapsed);
 
     // Only reset the animated type to the base value once for the lowest priority animation that animates and contributes to a particular element/attribute pair.
     if (this == resultElement && animationIsContributing)
         resetAnimatedType();
 
+    ASSERT(!didRestart || m_activeState == Active);
+
     if (animationIsContributing) {
-        if (oldActiveState == Inactive) {
+        if (oldActiveState == Inactive || didRestart) {
             smilBeginEventSender().dispatchEventSoon(this);
             startedActiveInterval();
         }
 
         if (repeat && repeat != m_lastRepeat)
             dispatchRepeatEvents(repeat);
 
         updateAnimation(percent, repeat, resultElement);
         m_lastPercent = percent;
         m_lastRepeat = repeat;
     }
 
-    if (oldActiveState == Active && m_activeState != Active) {
+    if ((oldActiveState == Active && m_activeState != Active) || didRestart) {
         smilEndEventSender().dispatchEventSoon(this);
         endedActiveInterval();
-        if (m_activeState != Frozen && this == resultElement)
+        if (!didRestart && m_activeState != Frozen && this == resultElement)
             clearAnimatedType(m_targetElement);
     }
 
     // Triggering all the pending events if the animation timeline is changed.
     if (seekToTime) {
         if (m_activeState == Inactive)
             smilBeginEventSender().dispatchEventSoon(this);
 
         if (repeat) {
             for (unsigned repeatEventCount = 1; repeatEventCount < repeat; repeatEventCount++)
@@ skipping 100 matching lines @@
     if (eventType == "repeatn") {
         unsigned repeatEventCount = m_repeatEventCountList.first();
         m_repeatEventCountList.remove(0);
         dispatchEvent(RepeatEvent::create(eventType, repeatEventCount));
     } else {
         dispatchEvent(Event::create(eventType));
     }
 }
 
 }