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/location.h" | 7 #include "base/location.h" |
8 #include "base/memory/weak_ptr.h" | 8 #include "base/memory/weak_ptr.h" |
9 #include "base/single_thread_task_runner.h" | 9 #include "base/single_thread_task_runner.h" |
10 #include "base/thread_task_runner_handle.h" | 10 #include "base/thread_task_runner_handle.h" |
11 #include "cc/layers/layer.h" | 11 #include "cc/layers/layer.h" |
12 #include "cc/layers/layer_impl.h" | 12 #include "cc/layers/layer_impl.h" |
13 #include "cc/layers/picture_layer.h" | 13 #include "cc/layers/picture_layer.h" |
14 #include "cc/scheduler/begin_frame_source.h" | 14 #include "cc/scheduler/begin_frame_source.h" |
15 #include "cc/test/fake_content_layer_client.h" | 15 #include "cc/test/fake_content_layer_client.h" |
16 #include "cc/test/fake_layer_tree_host_client.h" | 16 #include "cc/test/fake_layer_tree_host_client.h" |
17 #include "cc/test/fake_picture_layer.h" | 17 #include "cc/test/fake_picture_layer.h" |
18 #include "cc/test/fake_picture_layer_impl.h" | 18 #include "cc/test/fake_picture_layer_impl.h" |
19 #include "cc/test/geometry_test_utils.h" | 19 #include "cc/test/geometry_test_utils.h" |
20 #include "cc/test/layer_tree_test.h" | 20 #include "cc/test/layer_tree_test.h" |
21 #include "cc/test/test_shared_bitmap_manager.h" | 21 #include "cc/test/test_shared_bitmap_manager.h" |
| 22 #include "cc/test/test_task_graph_runner.h" |
22 #include "cc/trees/layer_tree_impl.h" | 23 #include "cc/trees/layer_tree_impl.h" |
23 #include "ui/gfx/geometry/point_conversions.h" | 24 #include "ui/gfx/geometry/point_conversions.h" |
24 #include "ui/gfx/geometry/size_conversions.h" | 25 #include "ui/gfx/geometry/size_conversions.h" |
25 #include "ui/gfx/geometry/vector2d_conversions.h" | 26 #include "ui/gfx/geometry/vector2d_conversions.h" |
26 | 27 |
27 namespace cc { | 28 namespace cc { |
28 namespace { | 29 namespace { |
29 | 30 |
30 class LayerTreeHostScrollTest : public LayerTreeTest {}; | 31 class LayerTreeHostScrollTest : public LayerTreeTest {}; |
31 | 32 |
(...skipping 1099 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1131 base::Thread impl_thread("cc"); | 1132 base::Thread impl_thread("cc"); |
1132 ASSERT_TRUE(impl_thread.Start()); | 1133 ASSERT_TRUE(impl_thread.Start()); |
1133 | 1134 |
1134 bool received_stop_flinging = false; | 1135 bool received_stop_flinging = false; |
1135 LayerTreeSettings settings; | 1136 LayerTreeSettings settings; |
1136 | 1137 |
1137 ThreadCheckingInputHandlerClient input_handler_client( | 1138 ThreadCheckingInputHandlerClient input_handler_client( |
1138 impl_thread.task_runner().get(), &received_stop_flinging); | 1139 impl_thread.task_runner().get(), &received_stop_flinging); |
1139 FakeLayerTreeHostClient client(FakeLayerTreeHostClient::DIRECT_3D); | 1140 FakeLayerTreeHostClient client(FakeLayerTreeHostClient::DIRECT_3D); |
1140 | 1141 |
1141 ASSERT_TRUE(impl_thread.task_runner().get()); | 1142 ASSERT_TRUE(impl_thread.task_runner()); |
1142 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( | 1143 TestSharedBitmapManager shared_bitmap_manager; |
1143 new TestSharedBitmapManager()); | 1144 TestTaskGraphRunner task_graph_runner; |
1144 | 1145 |
1145 LayerTreeHost::InitParams params; | 1146 LayerTreeHost::InitParams params; |
1146 params.client = &client; | 1147 params.client = &client; |
1147 params.shared_bitmap_manager = shared_bitmap_manager.get(); | 1148 params.shared_bitmap_manager = &shared_bitmap_manager; |
| 1149 params.task_graph_runner = &task_graph_runner; |
1148 params.settings = &settings; | 1150 params.settings = &settings; |
1149 params.main_task_runner = base::ThreadTaskRunnerHandle::Get(); | 1151 params.main_task_runner = base::ThreadTaskRunnerHandle::Get(); |
1150 scoped_ptr<LayerTreeHost> layer_tree_host = | 1152 scoped_ptr<LayerTreeHost> layer_tree_host = |
1151 LayerTreeHost::CreateThreaded(impl_thread.task_runner(), ¶ms); | 1153 LayerTreeHost::CreateThreaded(impl_thread.task_runner(), ¶ms); |
1152 | 1154 |
1153 impl_thread.task_runner()->PostTask( | 1155 impl_thread.task_runner()->PostTask( |
1154 FROM_HERE, base::Bind(&BindInputHandlerOnCompositorThread, | 1156 FROM_HERE, base::Bind(&BindInputHandlerOnCompositorThread, |
1155 layer_tree_host->GetInputHandler(), | 1157 layer_tree_host->GetInputHandler(), |
1156 base::Unretained(&input_handler_client))); | 1158 base::Unretained(&input_handler_client))); |
1157 | 1159 |
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1248 RunTest(true, false); | 1250 RunTest(true, false); |
1249 } | 1251 } |
1250 | 1252 |
1251 TEST_F(LayerTreeHostScrollTestLayerStructureChange, ScrollDestroyWholeTree) { | 1253 TEST_F(LayerTreeHostScrollTestLayerStructureChange, ScrollDestroyWholeTree) { |
1252 scroll_destroy_whole_tree_ = true; | 1254 scroll_destroy_whole_tree_ = true; |
1253 RunTest(true, false); | 1255 RunTest(true, false); |
1254 } | 1256 } |
1255 | 1257 |
1256 } // namespace | 1258 } // namespace |
1257 } // namespace cc | 1259 } // namespace cc |
OLD | NEW |