Take time_offset into account when ticking animations that are Starting

cc/animation/animation_unittest.cc

 // 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 "cc/animation/animation.h"
 
 #include "cc/test/animation_test_common.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 92 matching lines @@
 }
 
 TEST(AnimationTest, TrimTimeZeroDuration) {
   scoped_ptr<Animation> anim(CreateAnimation(0, 0));
   anim->SetRunState(Animation::Running, 0.0);
   EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(-1.0));
   EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(0.0));
   EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(1.0));
 }
 
+TEST(AnimationTest, TrimTimeStarting) {
+  scoped_ptr<Animation> anim(CreateAnimation(1, 5.0));
+  anim->SetRunState(Animation::Starting, 0.0);
+  EXPECT_EQ(0.0, anim->TrimTimeToCurrentIteration(-1.0));
+  EXPECT_EQ(0.0, anim->TrimTimeToCurrentIteration(0.0));
+  EXPECT_EQ(0.0, anim->TrimTimeToCurrentIteration(1.0));
+  anim->set_time_offset(2.0);
+  EXPECT_EQ(2.0, anim->TrimTimeToCurrentIteration(-1.0));
+  EXPECT_EQ(2.0, anim->TrimTimeToCurrentIteration(0.0));
+  EXPECT_EQ(2.0, anim->TrimTimeToCurrentIteration(1.0));
+  anim->set_start_time(1.0);
+  EXPECT_EQ(0.0, anim->TrimTimeToCurrentIteration(-1.0));
+  EXPECT_EQ(1.0, anim->TrimTimeToCurrentIteration(0.0));
+  EXPECT_EQ(2.0, anim->TrimTimeToCurrentIteration(1.0));
+  EXPECT_EQ(3.0, anim->TrimTimeToCurrentIteration(2.0));
+}
+
+TEST(AnimationTest, TrimTimeNeedsSynchronizedStartTime) {
+  scoped_ptr<Animation> anim(CreateAnimation(1, 5.0));
+  anim->SetRunState(Animation::Running, 0.0);
+  anim->set_needs_synchronized_start_time(true);
+  EXPECT_EQ(0.0, anim->TrimTimeToCurrentIteration(-1.0));
+  EXPECT_EQ(0.0, anim->TrimTimeToCurrentIteration(0.0));
+  EXPECT_EQ(0.0, anim->TrimTimeToCurrentIteration(1.0));
+  anim->set_time_offset(2.0);
+  EXPECT_EQ(2.0, anim->TrimTimeToCurrentIteration(-1.0));
+  EXPECT_EQ(2.0, anim->TrimTimeToCurrentIteration(0.0));
+  EXPECT_EQ(2.0, anim->TrimTimeToCurrentIteration(1.0));
+  anim->set_start_time(1.0);
+  anim->set_needs_synchronized_start_time(false);
+  EXPECT_EQ(1.0, anim->TrimTimeToCurrentIteration(0.0));
+  EXPECT_EQ(2.0, anim->TrimTimeToCurrentIteration(1.0));
+  EXPECT_EQ(3.0, anim->TrimTimeToCurrentIteration(2.0));
+}
+
 TEST(AnimationTest, IsFinishedAtZeroIterations) {
   scoped_ptr<Animation> anim(CreateAnimation(0));
   anim->SetRunState(Animation::Running, 0.0);
   EXPECT_FALSE(anim->IsFinishedAt(-1.0));
   EXPECT_TRUE(anim->IsFinishedAt(0.0));
   EXPECT_TRUE(anim->IsFinishedAt(1.0));
 }
 
 TEST(AnimationTest, IsFinishedAtOneIteration) {
   scoped_ptr<Animation> anim(CreateAnimation(1));
@@ skipping 73 matching lines @@
   EXPECT_EQ(Animation::Paused, anim->run_state());
   anim->SetRunState(Animation::Running, 0.0);
   EXPECT_EQ(Animation::Paused, anim->run_state());
   anim->Resume(0);
   anim->SetRunState(Animation::Running, 0.0);
   EXPECT_EQ(Animation::Running, anim->run_state());
 }
 
 }  // namespace
 }  // namespace cc