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" |
(...skipping 1115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1126 ThreadCheckingInputHandlerClient input_handler_client( | 1126 ThreadCheckingInputHandlerClient input_handler_client( |
1127 impl_thread.message_loop_proxy().get(), &received_stop_flinging); | 1127 impl_thread.message_loop_proxy().get(), &received_stop_flinging); |
1128 FakeLayerTreeHostClient client(FakeLayerTreeHostClient::DIRECT_3D); | 1128 FakeLayerTreeHostClient client(FakeLayerTreeHostClient::DIRECT_3D); |
1129 | 1129 |
1130 ASSERT_TRUE(impl_thread.message_loop_proxy().get()); | 1130 ASSERT_TRUE(impl_thread.message_loop_proxy().get()); |
1131 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( | 1131 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( |
1132 new TestSharedBitmapManager()); | 1132 new TestSharedBitmapManager()); |
1133 scoped_ptr<LayerTreeHost> layer_tree_host = | 1133 scoped_ptr<LayerTreeHost> layer_tree_host = |
1134 LayerTreeHost::CreateThreaded(&client, | 1134 LayerTreeHost::CreateThreaded(&client, |
1135 shared_bitmap_manager.get(), | 1135 shared_bitmap_manager.get(), |
| 1136 NULL, |
1136 settings, | 1137 settings, |
1137 base::MessageLoopProxy::current(), | 1138 base::MessageLoopProxy::current(), |
1138 impl_thread.message_loop_proxy()); | 1139 impl_thread.message_loop_proxy()); |
1139 | 1140 |
1140 impl_thread.message_loop_proxy() | 1141 impl_thread.message_loop_proxy() |
1141 ->PostTask(FROM_HERE, | 1142 ->PostTask(FROM_HERE, |
1142 base::Bind(&BindInputHandlerOnCompositorThread, | 1143 base::Bind(&BindInputHandlerOnCompositorThread, |
1143 layer_tree_host->GetInputHandler(), | 1144 layer_tree_host->GetInputHandler(), |
1144 base::Unretained(&input_handler_client))); | 1145 base::Unretained(&input_handler_client))); |
1145 | 1146 |
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1238 RunTest(true, false, true); | 1239 RunTest(true, false, true); |
1239 } | 1240 } |
1240 | 1241 |
1241 TEST_F(LayerTreeHostScrollTestLayerStructureChange, ScrollDestroyWholeTree) { | 1242 TEST_F(LayerTreeHostScrollTestLayerStructureChange, ScrollDestroyWholeTree) { |
1242 scroll_destroy_whole_tree_ = true; | 1243 scroll_destroy_whole_tree_ = true; |
1243 RunTest(true, false, true); | 1244 RunTest(true, false, true); |
1244 } | 1245 } |
1245 | 1246 |
1246 } // namespace | 1247 } // namespace |
1247 } // namespace cc | 1248 } // namespace cc |
OLD | NEW |