Animation: Composite animations with any start delay specified

Source/core/animation/CompositorAnimations.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 243 matching lines @@
 }
 
 // -----------------------------------------------------------------------
 // CompositorAnimationsImpl
 // -----------------------------------------------------------------------
 
 bool CompositorAnimationsImpl::convertTimingForCompositor(const Timing& timing, double timeOffset, CompositorTiming& out, double playerPlaybackRate)
 {
     timing.assertValid();
 
-    // All fill modes are supported (the calling code handles them).
-
-    if (timing.iterationCount <= 0)
+    if (!timing.iterationCount || !timing.iterationDuration)
         return false;
 
-    if (std::isnan(timing.iterationDuration) || !timing.iterationDuration)
-        return false;
-
-    // All directions are supported.
-
-    // Now attempt an actual conversion
-    out.scaledDuration = timing.iterationDuration;
-    ASSERT(out.scaledDuration > 0);
-
-    double scaledStartDelay = timing.startDelay;
-    if (scaledStartDelay > 0 && scaledStartDelay > out.scaledDuration * timing.iterationCount)
-        return false;
-
-    out.direction = timing.direction;
-
     if (!std::isfinite(timing.iterationCount)) {
         out.adjustedIterationCount = -1;
     } else {
         out.adjustedIterationCount = timing.iterationCount;
-        ASSERT(out.adjustedIterationCount > 0);
     }
 
+    out.scaledDuration = timing.iterationDuration;
+    out.direction = timing.direction;
     // Compositor's time offset is positive for seeking into the animation.
-    out.scaledTimeOffset = -scaledStartDelay + timeOffset;
+    out.scaledTimeOffset = -timing.startDelay + timeOffset;
     out.playbackRate = timing.playbackRate * playerPlaybackRate;
     out.fillMode = timing.fillMode == Timing::FillModeAuto ? Timing::FillModeNone : timing.fillMode;
     out.iterationStart = timing.iterationStart;
-
+    out.assertValid();
     return true;
 }
 
 namespace {
 
 template<typename PlatformAnimationCurveType, typename PlatformAnimationKeyframeType>
 void addKeyframeWithTimingFunction(PlatformAnimationCurveType& curve, const PlatformAnimationKeyframeType& keyframe, const TimingFunction* timingFunction)
 {
     if (!timingFunction) {
         curve.add(keyframe);
@@ skipping 183 matching lines @@
             break;
         default:
             ASSERT_NOT_REACHED();
         }
         animations.append(animation.release());
     }
     ASSERT(!animations.isEmpty());
 }
 
 } // namespace blink