Web Animations: Account for end delay in after phase active time

third_party/WebKit/Source/core/animation/AnimationEffect.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 138 matching lines @@
         // FIXME: parentPhase depends on groups being implemented.
         const AnimationEffect::Phase parentPhase = AnimationEffect::PhaseActive;
         const double activeTime = calculateActiveTime(activeDuration, resolvedFillMode(m_timing.fillMode, isKeyframeEffect()), localTime, parentPhase, currentPhase, m_timing);
 
         double currentIteration;
         double progress;
         if (const double iterationDuration = this->iterationDuration()) {
             const double startOffset = multiplyZeroAlwaysGivesZero(m_timing.iterationStart, iterationDuration);
             ASSERT(startOffset >= 0);
             const double scaledActiveTime = calculateScaledActiveTime(activeDuration, activeTime, startOffset, m_timing);
-            const double iterationTime = calculateIterationTime(iterationDuration, repeatedDuration(), scaledActiveTime, startOffset, m_timing);
+            const double iterationTime = calculateIterationTime(iterationDuration, repeatedDuration(), scaledActiveTime, startOffset, currentPhase, m_timing);
 
             currentIteration = calculateCurrentIteration(iterationDuration, iterationTime, scaledActiveTime, m_timing);
             const double transformedTime = calculateTransformedTime(currentIteration, iterationDuration, iterationTime, m_timing);
 
             // The infinite iterationDuration case here is a workaround because
             // the specified behaviour does not handle infinite durations well.
             // There is an open issue against the spec to fix this:
             // https://github.com/w3c/web-animations/issues/142
             if (!std::isfinite(iterationDuration))
                 progress = fmod(m_timing.iterationStart, 1.0);
@@ skipping 10 matching lines @@
             const double localRepeatedDuration = localIterationDuration * m_timing.iterationCount;
             ASSERT(localRepeatedDuration >= 0);
             const double localActiveDuration = m_timing.playbackRate ? localRepeatedDuration / std::abs(m_timing.playbackRate) : std::numeric_limits<double>::infinity();
             ASSERT(localActiveDuration >= 0);
             const double localLocalTime = localTime < m_timing.startDelay ? localTime : localActiveDuration + m_timing.startDelay;
             const AnimationEffect::Phase localCurrentPhase = calculatePhase(localActiveDuration, localLocalTime, m_timing);
             const double localActiveTime = calculateActiveTime(localActiveDuration, resolvedFillMode(m_timing.fillMode, isKeyframeEffect()), localLocalTime, parentPhase, localCurrentPhase, m_timing);
             const double startOffset = m_timing.iterationStart * localIterationDuration;
             ASSERT(startOffset >= 0);
             const double scaledActiveTime = calculateScaledActiveTime(localActiveDuration, localActiveTime, startOffset, m_timing);
-            const double iterationTime = calculateIterationTime(localIterationDuration, localRepeatedDuration, scaledActiveTime, startOffset, m_timing);
+            const double iterationTime = calculateIterationTime(localIterationDuration, localRepeatedDuration, scaledActiveTime, startOffset, currentPhase, m_timing);
 
             currentIteration = calculateCurrentIteration(localIterationDuration, iterationTime, scaledActiveTime, m_timing);
             progress = calculateTransformedTime(currentIteration, localIterationDuration, iterationTime, m_timing);
         }
 
         m_calculated.currentIteration = currentIteration;
         m_calculated.progress = progress;
 
         m_calculated.phase = currentPhase;
         m_calculated.isInEffect = !isNull(activeTime);
@@ skipping 32 matching lines @@
     return AnimationEffectTiming::create(this);
 }
 
 DEFINE_TRACE(AnimationEffect)
 {
     visitor->trace(m_animation);
     visitor->trace(m_eventDelegate);
 }
 
 } // namespace blink