Gracefully handle zero duration curves in CCActiveAnimation

cc/CCActiveAnimationTest.cpp

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "CCActiveAnimation.h"
 
 #include "CCAnimationTestCommon.h"
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include <wtf/Vector.h>
 
 using namespace WebKitTests;
 using namespace cc;
 
 namespace {
 
+PassOwnPtr<CCActiveAnimation> createActiveAnimation(int iterations, double duration)
+{
+    OwnPtr<CCActiveAnimation> toReturn(CCActiveAnimation::create(adoptPtr(new FakeFloatAnimationCurve(duration)), 0, 1, CCActiveAnimation::Opacity));
+    toReturn->setIterations(iterations);
+    return toReturn.release();
+}
+
 PassOwnPtr<CCActiveAnimation> createActiveAnimation(int iterations)
 {
-    OwnPtr<CCActiveAnimation> toReturn(CCActiveAnimation::create(adoptPtr(new FakeFloatAnimationCurve), 0, 1, CCActiveAnimation::Opacity));
-    toReturn->setIterations(iterations);
-    return toReturn.release();
+    return createActiveAnimation(iterations, 1);
 }
 
 TEST(CCActiveAnimationTest, TrimTimeZeroIterations)
 {
     OwnPtr<CCActiveAnimation> anim(createActiveAnimation(0));
     EXPECT_EQ(0, anim->trimTimeToCurrentIteration(-1));
     EXPECT_EQ(0, anim->trimTimeToCurrentIteration(0));
     EXPECT_EQ(0, anim->trimTimeToCurrentIteration(1));
 }
 
@@ skipping 66 matching lines @@
     anim->setRunState(CCActiveAnimation::Running, 0);
     EXPECT_EQ(0, anim->trimTimeToCurrentIteration(0));
     EXPECT_EQ(0.5, anim->trimTimeToCurrentIteration(0.5));
     anim->suspend(0.5);
     EXPECT_EQ(0.5, anim->trimTimeToCurrentIteration(1024));
     anim->resume(1024);
     EXPECT_EQ(0.5, anim->trimTimeToCurrentIteration(1024));
     EXPECT_EQ(1, anim->trimTimeToCurrentIteration(1024.5));
 }
 
+TEST(CCActiveAnimationTest, TrimTimeZeroDuration)
+{
+    OwnPtr<CCActiveAnimation> anim(createActiveAnimation(0, 0));
+    anim->setRunState(CCActiveAnimation::Running, 0);
+    EXPECT_EQ(0, anim->trimTimeToCurrentIteration(-1));
+    EXPECT_EQ(0, anim->trimTimeToCurrentIteration(0));
+    EXPECT_EQ(0, anim->trimTimeToCurrentIteration(1));
+}
+
 TEST(CCActiveAnimationTest, IsFinishedAtZeroIterations)
 {
     OwnPtr<CCActiveAnimation> anim(createActiveAnimation(0));
     anim->setRunState(CCActiveAnimation::Running, 0);
     EXPECT_FALSE(anim->isFinishedAt(-1));
     EXPECT_TRUE(anim->isFinishedAt(0));
     EXPECT_TRUE(anim->isFinishedAt(1));
 }
 
 TEST(CCActiveAnimationTest, IsFinishedAtOneIteration)
@@ skipping 79 matching lines @@
     anim->suspend(0);
     EXPECT_EQ(CCActiveAnimation::Paused, anim->runState());
     anim->setRunState(CCActiveAnimation::Running, 0);
     EXPECT_EQ(CCActiveAnimation::Paused, anim->runState());
     anim->resume(0);
     anim->setRunState(CCActiveAnimation::Running, 0);
     EXPECT_EQ(CCActiveAnimation::Running, anim->runState());
 }
 
 } // namespace