| 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/layer_animation_controller.h" | 5 #include "cc/animation/layer_animation_controller.h" |
| 6 | 6 |
| 7 #include "cc/animation/animation.h" | 7 #include "cc/animation/animation.h" |
| 8 #include "cc/animation/animation_curve.h" | 8 #include "cc/animation/animation_curve.h" |
| 9 #include "cc/animation/animation_delegate.h" | 9 #include "cc/animation/animation_delegate.h" |
| 10 #include "cc/animation/animation_registrar.h" | 10 #include "cc/animation/animation_registrar.h" |
| 11 #include "cc/animation/keyframed_animation_curve.h" | 11 #include "cc/animation/keyframed_animation_curve.h" |
| 12 #include "cc/animation/scroll_offset_animation_curve.h" | 12 #include "cc/animation/scroll_offset_animation_curve.h" |
| 13 #include "cc/animation/transform_operations.h" | 13 #include "cc/animation/transform_operations.h" |
| 14 #include "cc/test/animation_test_common.h" | 14 #include "cc/test/animation_test_common.h" |
| 15 #include "testing/gmock/include/gmock/gmock.h" | 15 #include "testing/gmock/include/gmock/gmock.h" |
| 16 #include "testing/gtest/include/gtest/gtest.h" | 16 #include "testing/gtest/include/gtest/gtest.h" |
| 17 #include "ui/gfx/box_f.h" | 17 #include "ui/gfx/geometry/box_f.h" |
| 18 #include "ui/gfx/transform.h" | 18 #include "ui/gfx/transform.h" |
| 19 | 19 |
| 20 namespace cc { | 20 namespace cc { |
| 21 namespace { | 21 namespace { |
| 22 | 22 |
| 23 using base::TimeDelta; | 23 using base::TimeDelta; |
| 24 using base::TimeTicks; | 24 using base::TimeTicks; |
| 25 | 25 |
| 26 static base::TimeTicks TicksFromSecondsF(double seconds) { | 26 static base::TimeTicks TicksFromSecondsF(double seconds) { |
| 27 return base::TimeTicks::FromInternalValue(seconds * | 27 return base::TimeTicks::FromInternalValue(seconds * |
| (...skipping 2200 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2228 // been ticked at the new animation's starting point. | 2228 // been ticked at the new animation's starting point. |
| 2229 EXPECT_EQ(Animation::Running, | 2229 EXPECT_EQ(Animation::Running, |
| 2230 controller_impl->GetAnimation(second_animation_group_id, | 2230 controller_impl->GetAnimation(second_animation_group_id, |
| 2231 Animation::Opacity)->run_state()); | 2231 Animation::Opacity)->run_state()); |
| 2232 EXPECT_EQ(1.f, pending_dummy_impl.opacity()); | 2232 EXPECT_EQ(1.f, pending_dummy_impl.opacity()); |
| 2233 EXPECT_EQ(1.f, dummy_impl.opacity()); | 2233 EXPECT_EQ(1.f, dummy_impl.opacity()); |
| 2234 } | 2234 } |
| 2235 | 2235 |
| 2236 } // namespace | 2236 } // namespace |
| 2237 } // namespace cc | 2237 } // namespace cc |
| OLD | NEW |