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/trees/layer_tree_host.h" | 5 #include "cc/trees/layer_tree_host.h" |
6 | 6 |
7 #include "base/memory/weak_ptr.h" | 7 #include "base/memory/weak_ptr.h" |
8 #include "cc/layers/layer.h" | 8 #include "cc/layers/layer.h" |
9 #include "cc/layers/layer_impl.h" | 9 #include "cc/layers/layer_impl.h" |
10 #include "cc/layers/picture_layer.h" | 10 #include "cc/layers/picture_layer.h" |
| 11 #include "cc/scheduler/begin_frame_source.h" |
11 #include "cc/test/fake_content_layer_client.h" | 12 #include "cc/test/fake_content_layer_client.h" |
12 #include "cc/test/fake_layer_tree_host_client.h" | 13 #include "cc/test/fake_layer_tree_host_client.h" |
13 #include "cc/test/fake_picture_layer.h" | 14 #include "cc/test/fake_picture_layer.h" |
14 #include "cc/test/fake_picture_layer_impl.h" | 15 #include "cc/test/fake_picture_layer_impl.h" |
15 #include "cc/test/geometry_test_utils.h" | 16 #include "cc/test/geometry_test_utils.h" |
16 #include "cc/test/layer_tree_test.h" | 17 #include "cc/test/layer_tree_test.h" |
17 #include "cc/test/test_shared_bitmap_manager.h" | 18 #include "cc/test/test_shared_bitmap_manager.h" |
18 #include "cc/trees/layer_tree_impl.h" | 19 #include "cc/trees/layer_tree_impl.h" |
19 #include "ui/gfx/geometry/point_conversions.h" | 20 #include "ui/gfx/geometry/point_conversions.h" |
20 #include "ui/gfx/geometry/size_conversions.h" | 21 #include "ui/gfx/geometry/size_conversions.h" |
(...skipping 1094 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1115 | 1116 |
1116 ASSERT_TRUE(impl_thread.message_loop_proxy().get()); | 1117 ASSERT_TRUE(impl_thread.message_loop_proxy().get()); |
1117 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( | 1118 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( |
1118 new TestSharedBitmapManager()); | 1119 new TestSharedBitmapManager()); |
1119 scoped_ptr<LayerTreeHost> layer_tree_host = | 1120 scoped_ptr<LayerTreeHost> layer_tree_host = |
1120 LayerTreeHost::CreateThreaded(&client, | 1121 LayerTreeHost::CreateThreaded(&client, |
1121 shared_bitmap_manager.get(), | 1122 shared_bitmap_manager.get(), |
1122 NULL, | 1123 NULL, |
1123 settings, | 1124 settings, |
1124 base::MessageLoopProxy::current(), | 1125 base::MessageLoopProxy::current(), |
1125 impl_thread.message_loop_proxy()); | 1126 impl_thread.message_loop_proxy(), |
| 1127 nullptr); |
1126 | 1128 |
1127 impl_thread.message_loop_proxy() | 1129 impl_thread.message_loop_proxy() |
1128 ->PostTask(FROM_HERE, | 1130 ->PostTask(FROM_HERE, |
1129 base::Bind(&BindInputHandlerOnCompositorThread, | 1131 base::Bind(&BindInputHandlerOnCompositorThread, |
1130 layer_tree_host->GetInputHandler(), | 1132 layer_tree_host->GetInputHandler(), |
1131 base::Unretained(&input_handler_client))); | 1133 base::Unretained(&input_handler_client))); |
1132 | 1134 |
1133 layer_tree_host->DidStopFlinging(); | 1135 layer_tree_host->DidStopFlinging(); |
1134 layer_tree_host = nullptr; | 1136 layer_tree_host = nullptr; |
1135 impl_thread.Stop(); | 1137 impl_thread.Stop(); |
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1223 RunTest(true, false, true); | 1225 RunTest(true, false, true); |
1224 } | 1226 } |
1225 | 1227 |
1226 TEST_F(LayerTreeHostScrollTestLayerStructureChange, ScrollDestroyWholeTree) { | 1228 TEST_F(LayerTreeHostScrollTestLayerStructureChange, ScrollDestroyWholeTree) { |
1227 scroll_destroy_whole_tree_ = true; | 1229 scroll_destroy_whole_tree_ = true; |
1228 RunTest(true, false, true); | 1230 RunTest(true, false, true); |
1229 } | 1231 } |
1230 | 1232 |
1231 } // namespace | 1233 } // namespace |
1232 } // namespace cc | 1234 } // namespace cc |
OLD | NEW |