| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "cc/animation.h" | 5 #include "cc/animation/animation.h" |
| 6 | 6 |
| 7 #include "cc/test/animation_test_common.h" | 7 #include "cc/test/animation_test_common.h" |
| 8 #include "testing/gmock/include/gmock/gmock.h" | 8 #include "testing/gmock/include/gmock/gmock.h" |
| 9 #include "testing/gtest/include/gtest/gtest.h" | 9 #include "testing/gtest/include/gtest/gtest.h" |
| 10 | 10 |
| 11 namespace cc { | 11 namespace cc { |
| 12 namespace { | 12 namespace { |
| 13 | 13 |
| 14 scoped_ptr<Animation> CreateAnimation(int iterations, double duration) { | 14 scoped_ptr<Animation> CreateAnimation(int iterations, double duration) { |
| 15 scoped_ptr<Animation> to_return(Animation::Create( | 15 scoped_ptr<Animation> to_return(Animation::Create( |
| (...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 196 EXPECT_EQ(Animation::Paused, anim->run_state()); | 196 EXPECT_EQ(Animation::Paused, anim->run_state()); |
| 197 anim->SetRunState(Animation::Running, 0.0); | 197 anim->SetRunState(Animation::Running, 0.0); |
| 198 EXPECT_EQ(Animation::Paused, anim->run_state()); | 198 EXPECT_EQ(Animation::Paused, anim->run_state()); |
| 199 anim->Resume(0); | 199 anim->Resume(0); |
| 200 anim->SetRunState(Animation::Running, 0.0); | 200 anim->SetRunState(Animation::Running, 0.0); |
| 201 EXPECT_EQ(Animation::Running, anim->run_state()); | 201 EXPECT_EQ(Animation::Running, anim->run_state()); |
| 202 } | 202 } |
| 203 | 203 |
| 204 } // namespace | 204 } // namespace |
| 205 } // namespace cc | 205 } // namespace cc |
| OLD | NEW |