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

third_party/WebKit/Source/core/animation/TimingCalculations.h

 /*
  * 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 71 matching lines @@
     case AnimationEffect::PhaseBefore:
         if (fillMode == Timing::FillModeBackwards || fillMode == Timing::FillModeBoth)
             return 0;
         return nullValue();
     case AnimationEffect::PhaseActive:
         if (isActiveInParentPhase(parentPhase, fillMode))
             return localTime - specified.startDelay;
         return nullValue();
     case AnimationEffect::PhaseAfter:
         if (fillMode == Timing::FillModeForwards || fillMode == Timing::FillModeBoth)
-            return activeDuration;
+            return std::max(0.0, std::min(activeDuration, activeDuration + specified.endDelay));
         return nullValue();
     case AnimationEffect::PhaseNone:
         ASSERT(isNull(localTime));
         return nullValue();
     default:
         NOTREACHED();
         return nullValue();
     }
 }
 
@@ skipping 15 matching lines @@
 
     return multiplyZeroAlwaysGivesZero(specified.playbackRate < 0 ? activeTime - activeDuration : activeTime, specified.playbackRate) + startOffset;
 }
 
 static inline bool endsOnIterationBoundary(double iterationCount, double iterationStart)
 {
     ASSERT(std::isfinite(iterationCount));
     return !fmod(iterationCount + iterationStart, 1);
 }
 
-static inline double calculateIterationTime(double iterationDuration, double repeatedDuration, double scaledActiveTime, double startOffset, const Timing& specified)
+// TODO(crbug.com/630915): Align this function with current Web Animations spec text.
+static inline double calculateIterationTime(double iterationDuration, double repeatedDuration, double scaledActiveTime, double startOffset, AnimationEffect::Phase phase, const Timing& specified)
 {
     ASSERT(iterationDuration > 0);
     ASSERT(repeatedDuration == multiplyZeroAlwaysGivesZero(iterationDuration, specified.iterationCount));
 
     if (isNull(scaledActiveTime))
         return nullValue();
 
     ASSERT(scaledActiveTime >= 0);
     ASSERT(scaledActiveTime <= repeatedDuration + startOffset);
 
     if (!std::isfinite(scaledActiveTime)
         || (scaledActiveTime - startOffset == repeatedDuration && specified.iterationCount && endsOnIterationBoundary(specified.iterationCount, specified.iterationStart)))
         return iterationDuration;
 
     ASSERT(std::isfinite(scaledActiveTime));
-    return fmod(scaledActiveTime, iterationDuration);
+    double iterationTime = fmod(scaledActiveTime, iterationDuration);
+
+    // This implements step 3 of
+    // http://w3c.github.io/web-animations/#calculating-the-simple-iteration-progress
+    if (iterationTime == 0
+        && phase == AnimationEffect::PhaseAfter
+        && repeatedDuration != 0
+        && scaledActiveTime != 0)
+        return iterationDuration;
+
+    return iterationTime;
 }
 
 static inline double calculateCurrentIteration(double iterationDuration, double iterationTime, double scaledActiveTime, const Timing& specified)
 {
     ASSERT(iterationDuration > 0);
     ASSERT(isNull(iterationTime) || iterationTime >= 0);
 
     if (isNull(scaledActiveTime))
         return nullValue();
 
@@ skipping 42 matching lines @@
     if (!std::isfinite(iterationDuration))
         return directedTime;
     double timeFraction = directedTime / iterationDuration;
     ASSERT(timeFraction >= 0 && timeFraction <= 1);
     return multiplyZeroAlwaysGivesZero(iterationDuration, specified.timingFunction->evaluate(timeFraction, accuracyForDuration(iterationDuration)));
 }
 
 } // namespace blink
 
 #endif