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 2311 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2339 EXPECT_FALSE(controller->IsAnimatingProperty(Animation::Opacity)); | 2339 EXPECT_FALSE(controller->IsAnimatingProperty(Animation::Opacity)); |
2340 EXPECT_FALSE(controller->IsAnimatingProperty(Animation::Filter)); | 2340 EXPECT_FALSE(controller->IsAnimatingProperty(Animation::Filter)); |
2341 | 2341 |
2342 controller->Animate(kInitialTickTime + TimeDelta::FromMilliseconds(2000)); | 2342 controller->Animate(kInitialTickTime + TimeDelta::FromMilliseconds(2000)); |
2343 controller->UpdateState(true, nullptr); | 2343 controller->UpdateState(true, nullptr); |
2344 EXPECT_TRUE(controller->IsAnimatingProperty(Animation::Opacity)); | 2344 EXPECT_TRUE(controller->IsAnimatingProperty(Animation::Opacity)); |
2345 } | 2345 } |
2346 | 2346 |
2347 } // namespace | 2347 } // namespace |
2348 } // namespace cc | 2348 } // namespace cc |
OLD | NEW |