| 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/layer_animation_controller.h" | 5 #include "cc/animation/layer_animation_controller.h" |
| 6 | 6 |
| 7 #include "cc/animation.h" | 7 #include "cc/animation/animation.h" |
| 8 #include "cc/animation_curve.h" | 8 #include "cc/animation/animation_curve.h" |
| 9 #include "cc/keyframed_animation_curve.h" | 9 #include "cc/animation/keyframed_animation_curve.h" |
| 10 #include "cc/test/animation_test_common.h" | 10 #include "cc/test/animation_test_common.h" |
| 11 #include "cc/transform_operations.h" | 11 #include "cc/transform_operations.h" |
| 12 #include "testing/gmock/include/gmock/gmock.h" | 12 #include "testing/gmock/include/gmock/gmock.h" |
| 13 #include "testing/gtest/include/gtest/gtest.h" | 13 #include "testing/gtest/include/gtest/gtest.h" |
| 14 #include "ui/gfx/transform.h" | 14 #include "ui/gfx/transform.h" |
| 15 | 15 |
| 16 namespace cc { | 16 namespace cc { |
| 17 namespace { | 17 namespace { |
| 18 | 18 |
| 19 void ExpectTranslateX(double translate_x, const gfx::Transform& matrix) { | 19 void ExpectTranslateX(double translate_x, const gfx::Transform& matrix) { |
| (...skipping 872 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 892 controller->Animate(3.0); | 892 controller->Animate(3.0); |
| 893 controller->UpdateState(events.get()); | 893 controller->UpdateState(events.get()); |
| 894 | 894 |
| 895 // The float tranisition should now be done. | 895 // The float tranisition should now be done. |
| 896 EXPECT_EQ(1.f, dummy.opacity()); | 896 EXPECT_EQ(1.f, dummy.opacity()); |
| 897 EXPECT_FALSE(controller->HasActiveAnimation()); | 897 EXPECT_FALSE(controller->HasActiveAnimation()); |
| 898 } | 898 } |
| 899 | 899 |
| 900 } // namespace | 900 } // namespace |
| 901 } // namespace cc | 901 } // namespace cc |
| OLD | NEW |