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/point_conversions.h" | 20 #include "ui/gfx/point_conversions.h" |
20 #include "ui/gfx/size_conversions.h" | 21 #include "ui/gfx/size_conversions.h" |
(...skipping 1107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1128 FakeLayerTreeHostClient client(FakeLayerTreeHostClient::DIRECT_3D); | 1129 FakeLayerTreeHostClient client(FakeLayerTreeHostClient::DIRECT_3D); |
1129 | 1130 |
1130 ASSERT_TRUE(impl_thread.message_loop_proxy().get()); | 1131 ASSERT_TRUE(impl_thread.message_loop_proxy().get()); |
1131 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( | 1132 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( |
1132 new TestSharedBitmapManager()); | 1133 new TestSharedBitmapManager()); |
1133 scoped_ptr<LayerTreeHost> layer_tree_host = | 1134 scoped_ptr<LayerTreeHost> layer_tree_host = |
1134 LayerTreeHost::CreateThreaded(&client, | 1135 LayerTreeHost::CreateThreaded(&client, |
1135 shared_bitmap_manager.get(), | 1136 shared_bitmap_manager.get(), |
1136 settings, | 1137 settings, |
1137 base::MessageLoopProxy::current(), | 1138 base::MessageLoopProxy::current(), |
1138 impl_thread.message_loop_proxy()); | 1139 impl_thread.message_loop_proxy(), |
| 1140 scoped_ptr<ExternalBeginFrameSource>()); |
1139 | 1141 |
1140 impl_thread.message_loop_proxy() | 1142 impl_thread.message_loop_proxy() |
1141 ->PostTask(FROM_HERE, | 1143 ->PostTask(FROM_HERE, |
1142 base::Bind(&BindInputHandlerOnCompositorThread, | 1144 base::Bind(&BindInputHandlerOnCompositorThread, |
1143 layer_tree_host->GetInputHandler(), | 1145 layer_tree_host->GetInputHandler(), |
1144 base::Unretained(&input_handler_client))); | 1146 base::Unretained(&input_handler_client))); |
1145 | 1147 |
1146 layer_tree_host->DidStopFlinging(); | 1148 layer_tree_host->DidStopFlinging(); |
1147 layer_tree_host = nullptr; | 1149 layer_tree_host = nullptr; |
1148 impl_thread.Stop(); | 1150 impl_thread.Stop(); |
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1238 RunTest(true, false, true); | 1240 RunTest(true, false, true); |
1239 } | 1241 } |
1240 | 1242 |
1241 TEST_F(LayerTreeHostScrollTestLayerStructureChange, ScrollDestroyWholeTree) { | 1243 TEST_F(LayerTreeHostScrollTestLayerStructureChange, ScrollDestroyWholeTree) { |
1242 scroll_destroy_whole_tree_ = true; | 1244 scroll_destroy_whole_tree_ = true; |
1243 RunTest(true, false, true); | 1245 RunTest(true, false, true); |
1244 } | 1246 } |
1245 | 1247 |
1246 } // namespace | 1248 } // namespace |
1247 } // namespace cc | 1249 } // namespace cc |
OLD | NEW |