Revert "Handle direction control in compositor Animations"

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 31 matching lines @@
 }
 
 TEST(AnimationTest, TrimTimeInfiniteIterations) {
   scoped_ptr<Animation> anim(CreateAnimation(-1));
   EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(0.0));
   EXPECT_EQ(0.5, anim->TrimTimeToCurrentIteration(0.5));
   EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(1.0));
   EXPECT_EQ(0.5, anim->TrimTimeToCurrentIteration(1.5));
 }
 
-TEST(AnimationTest, TrimTimeReverse) {
+TEST(AnimationTest, TrimTimeAlternating) {
   scoped_ptr<Animation> anim(CreateAnimation(-1));
-  anim->set_direction(Animation::Reverse);
-  EXPECT_EQ(1.0, anim->TrimTimeToCurrentIteration(0));
-  EXPECT_EQ(0.75, anim->TrimTimeToCurrentIteration(0.25));
+  anim->set_alternates_direction(true);
+  EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(0.0));
   EXPECT_EQ(0.5, anim->TrimTimeToCurrentIteration(0.5));
-  EXPECT_EQ(0.25, anim->TrimTimeToCurrentIteration(0.75));
-  EXPECT_EQ(1.0, anim->TrimTimeToCurrentIteration(1.0));
-  EXPECT_EQ(0.75, anim->TrimTimeToCurrentIteration(1.25));
-}
-
-TEST(AnimationTest, TrimTimeAlternate) {
-  scoped_ptr<Animation> anim(CreateAnimation(-1));
-  anim->set_direction(Animation::Alternate);
-  EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(0.0));
-  EXPECT_EQ(0.25, anim->TrimTimeToCurrentIteration(0.25));
-  EXPECT_EQ(0.5, anim->TrimTimeToCurrentIteration(0.5));
-  EXPECT_EQ(0.75, anim->TrimTimeToCurrentIteration(0.75));
   EXPECT_EQ(1, anim->TrimTimeToCurrentIteration(1.0));
   EXPECT_EQ(0.75, anim->TrimTimeToCurrentIteration(1.25));
 }
 
-TEST(AnimationTest, TrimTimeAlternateReverse) {
-  scoped_ptr<Animation> anim(CreateAnimation(-1));
-  anim->set_direction(Animation::AlternateReverse);
-  EXPECT_EQ(1.0, anim->TrimTimeToCurrentIteration(0.0));
-  EXPECT_EQ(0.75, anim->TrimTimeToCurrentIteration(0.25));
-  EXPECT_EQ(0.5, anim->TrimTimeToCurrentIteration(0.5));
-  EXPECT_EQ(0.25, anim->TrimTimeToCurrentIteration(0.75));
-  EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(1.0));
-  EXPECT_EQ(0.25, anim->TrimTimeToCurrentIteration(1.25));
-}
-
 TEST(AnimationTest, TrimTimeStartTime) {
   scoped_ptr<Animation> anim(CreateAnimation(1));
   anim->set_start_time(4);
   EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(0.0));
   EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(4.0));
   EXPECT_EQ(0.5, anim->TrimTimeToCurrentIteration(4.5));
   EXPECT_EQ(1, anim->TrimTimeToCurrentIteration(5.0));
   EXPECT_EQ(1, anim->TrimTimeToCurrentIteration(6.0));
 }
 
-TEST(AnimationTest, TrimTimeStartTimeReverse) {
-  scoped_ptr<Animation> anim(CreateAnimation(1));
-  anim->set_start_time(4);
-  anim->set_direction(Animation::Reverse);
-  EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(0.0));
-  EXPECT_EQ(1.0, anim->TrimTimeToCurrentIteration(4.0));
-  EXPECT_EQ(0.5, anim->TrimTimeToCurrentIteration(4.5));
-  EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(5.0));
-  EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(6.0));
-}
-
 TEST(AnimationTest, TrimTimeTimeOffset) {
   scoped_ptr<Animation> anim(CreateAnimation(1));
   anim->set_time_offset(4);
   anim->set_start_time(4);
   EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(0.0));
   EXPECT_EQ(0.5, anim->TrimTimeToCurrentIteration(0.5));
   EXPECT_EQ(1, anim->TrimTimeToCurrentIteration(1.0));
   EXPECT_EQ(1, anim->TrimTimeToCurrentIteration(1.0));
 }
 
-TEST(AnimationTest, TrimTimeTimeOffsetReverse) {
-  scoped_ptr<Animation> anim(CreateAnimation(1));
-  anim->set_time_offset(4);
-  anim->set_start_time(4);
-  anim->set_direction(Animation::Reverse);
-  EXPECT_EQ(1.0, anim->TrimTimeToCurrentIteration(0.0));
-  EXPECT_EQ(0.5, anim->TrimTimeToCurrentIteration(0.5));
-  EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(1.0));
-  EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(1.0));
-}
-
 TEST(AnimationTest, TrimTimeNegativeTimeOffset) {
   scoped_ptr<Animation> anim(CreateAnimation(1));
   anim->set_time_offset(-4);
 
   EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(0.0));
   EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(4.0));
   EXPECT_EQ(0.5, anim->TrimTimeToCurrentIteration(4.5));
   EXPECT_EQ(1, anim->TrimTimeToCurrentIteration(5.0));
 }
 
-TEST(AnimationTest, TrimTimeNegativeTimeOffsetReverse) {
-  scoped_ptr<Animation> anim(CreateAnimation(1));
-  anim->set_time_offset(-4);
-  anim->set_direction(Animation::Reverse);
-
-  EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(0.0));
-  EXPECT_EQ(1.0, anim->TrimTimeToCurrentIteration(4.0));
-  EXPECT_EQ(0.5, anim->TrimTimeToCurrentIteration(4.5));
-  EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(5.0));
-}
-
 TEST(AnimationTest, TrimTimePauseResume) {
   scoped_ptr<Animation> anim(CreateAnimation(1));
   anim->SetRunState(Animation::Running, 0.0);
   EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(0.0));
   EXPECT_EQ(0.5, anim->TrimTimeToCurrentIteration(0.5));
   anim->SetRunState(Animation::Paused, 0.5);
   EXPECT_EQ(0.5, anim->TrimTimeToCurrentIteration(1024.0));
   anim->SetRunState(Animation::Running, 1024.0);
   EXPECT_EQ(0.5, anim->TrimTimeToCurrentIteration(1024.0));
   EXPECT_EQ(1, anim->TrimTimeToCurrentIteration(1024.5));
 }
 
-TEST(AnimationTest, TrimTimePauseResumeReverse) {
-  scoped_ptr<Animation> anim(CreateAnimation(1));
-  anim->set_direction(Animation::Reverse);
-  anim->SetRunState(Animation::Running, 0.0);
-  EXPECT_EQ(1.0, anim->TrimTimeToCurrentIteration(0.0));
-  EXPECT_EQ(0.5, anim->TrimTimeToCurrentIteration(0.5));
-  anim->SetRunState(Animation::Paused, 0.25);
-  EXPECT_EQ(0.75, anim->TrimTimeToCurrentIteration(1024.0));
-  anim->SetRunState(Animation::Running, 1024.0);
-  EXPECT_EQ(0.75, anim->TrimTimeToCurrentIteration(1024.0));
-  EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(1024.75));
-}
-
 TEST(AnimationTest, TrimTimeSuspendResume) {
   scoped_ptr<Animation> anim(CreateAnimation(1));
   anim->SetRunState(Animation::Running, 0.0);
   EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(0.0));
   EXPECT_EQ(0.5, anim->TrimTimeToCurrentIteration(0.5));
   anim->Suspend(0.5);
   EXPECT_EQ(0.5, anim->TrimTimeToCurrentIteration(1024.0));
   anim->Resume(1024);
   EXPECT_EQ(0.5, anim->TrimTimeToCurrentIteration(1024.0));
   EXPECT_EQ(1, anim->TrimTimeToCurrentIteration(1024.5));
 }
 
-TEST(AnimationTest, TrimTimeSuspendResumeReverse) {
-  scoped_ptr<Animation> anim(CreateAnimation(1));
-  anim->set_direction(Animation::Reverse);
-  anim->SetRunState(Animation::Running, 0.0);
-  EXPECT_EQ(1.0, anim->TrimTimeToCurrentIteration(0.0));
-  EXPECT_EQ(0.75, anim->TrimTimeToCurrentIteration(0.25));
-  anim->Suspend(0.75);
-  EXPECT_EQ(0.25, anim->TrimTimeToCurrentIteration(1024.0));
-  anim->Resume(1024);
-  EXPECT_EQ(0.25, anim->TrimTimeToCurrentIteration(1024.0));
-  EXPECT_EQ(0, anim->TrimTimeToCurrentIteration(1024.25));
-}
-
 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));
@@ skipping 129 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