OLD | NEW |
1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 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/layers/layer.h" | 5 #include "cc/layers/layer.h" |
6 | 6 |
7 #include "cc/animation/keyframed_animation_curve.h" | 7 #include "cc/animation/keyframed_animation_curve.h" |
8 #include "cc/base/math_util.h" | 8 #include "cc/base/math_util.h" |
9 #include "cc/base/thread.h" | 9 #include "cc/base/thread.h" |
10 #include "cc/layers/layer_impl.h" | 10 #include "cc/layers/layer_impl.h" |
11 #include "cc/resources/layer_painter.h" | 11 #include "cc/resources/layer_painter.h" |
12 #include "cc/test/animation_test_common.h" | 12 #include "cc/test/animation_test_common.h" |
13 #include "cc/test/fake_impl_proxy.h" | 13 #include "cc/test/fake_impl_proxy.h" |
14 #include "cc/test/fake_layer_tree_host_client.h" | 14 #include "cc/test/fake_layer_tree_host_client.h" |
15 #include "cc/test/fake_layer_tree_host_impl.h" | 15 #include "cc/test/fake_layer_tree_host_impl.h" |
16 #include "cc/test/geometry_test_utils.h" | 16 #include "cc/test/geometry_test_utils.h" |
| 17 #include "cc/test/layer_test_common.h" |
17 #include "cc/trees/layer_tree_host.h" | 18 #include "cc/trees/layer_tree_host.h" |
18 #include "cc/trees/single_thread_proxy.h" | 19 #include "cc/trees/single_thread_proxy.h" |
19 #include "testing/gmock/include/gmock/gmock.h" | 20 #include "testing/gmock/include/gmock/gmock.h" |
20 #include "testing/gtest/include/gtest/gtest.h" | 21 #include "testing/gtest/include/gtest/gtest.h" |
21 #include "ui/gfx/transform.h" | 22 #include "ui/gfx/transform.h" |
22 | 23 |
23 using ::testing::AnyNumber; | 24 using ::testing::AnyNumber; |
24 using ::testing::AtLeast; | 25 using ::testing::AtLeast; |
25 using ::testing::Mock; | 26 using ::testing::Mock; |
26 using ::testing::StrictMock; | 27 using ::testing::StrictMock; |
27 using ::testing::_; | 28 using ::testing::_; |
28 | 29 |
29 #define EXPECT_SET_NEEDS_COMMIT(expect, code_to_test) do { \ | |
30 EXPECT_CALL(*layer_tree_host_, SetNeedsCommit()).Times((expect)); \ | |
31 code_to_test; \ | |
32 Mock::VerifyAndClearExpectations(layer_tree_host_.get()); \ | |
33 } while (false) | |
34 | |
35 #define EXPECT_SET_NEEDS_FULL_TREE_SYNC(expect, code_to_test) do { \ | 30 #define EXPECT_SET_NEEDS_FULL_TREE_SYNC(expect, code_to_test) do { \ |
36 EXPECT_CALL(*layer_tree_host_, SetNeedsFullTreeSync()).Times((expect)); \ | 31 EXPECT_CALL(*layer_tree_host_, SetNeedsFullTreeSync()).Times((expect)); \ |
37 code_to_test; \ | 32 code_to_test; \ |
38 Mock::VerifyAndClearExpectations(layer_tree_host_.get()); \ | 33 Mock::VerifyAndClearExpectations(layer_tree_host_.get()); \ |
39 } while (false) | 34 } while (false) |
40 | 35 |
41 | 36 |
42 namespace cc { | 37 namespace cc { |
43 namespace { | 38 namespace { |
44 | 39 |
(...skipping 957 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1002 layer->SetLayerTreeHost(layer_tree_host.get()); | 997 layer->SetLayerTreeHost(layer_tree_host.get()); |
1003 AssertLayerTreeHostMatchesForSubtree(layer.get(), layer_tree_host.get()); | 998 AssertLayerTreeHostMatchesForSubtree(layer.get(), layer_tree_host.get()); |
1004 | 999 |
1005 // Case 3: with a LayerTreeHost where accelerated animation is disabled, the | 1000 // Case 3: with a LayerTreeHost where accelerated animation is disabled, the |
1006 // animation should be rejected. | 1001 // animation should be rejected. |
1007 EXPECT_FALSE(AddTestAnimation(layer.get())); | 1002 EXPECT_FALSE(AddTestAnimation(layer.get())); |
1008 } | 1003 } |
1009 | 1004 |
1010 } // namespace | 1005 } // namespace |
1011 } // namespace cc | 1006 } // namespace cc |
OLD | NEW |