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/content_layer.h" | 8 #include "cc/layers/content_layer.h" |
9 #include "cc/layers/layer.h" | 9 #include "cc/layers/layer.h" |
10 #include "cc/layers/layer_impl.h" | 10 #include "cc/layers/layer_impl.h" |
(...skipping 1111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1122 impl_thread.message_loop_proxy().get(), &received_stop_flinging); | 1122 impl_thread.message_loop_proxy().get(), &received_stop_flinging); |
1123 FakeLayerTreeHostClient client(FakeLayerTreeHostClient::DIRECT_3D); | 1123 FakeLayerTreeHostClient client(FakeLayerTreeHostClient::DIRECT_3D); |
1124 | 1124 |
1125 ASSERT_TRUE(impl_thread.message_loop_proxy().get()); | 1125 ASSERT_TRUE(impl_thread.message_loop_proxy().get()); |
1126 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( | 1126 scoped_ptr<SharedBitmapManager> shared_bitmap_manager( |
1127 new TestSharedBitmapManager()); | 1127 new TestSharedBitmapManager()); |
1128 scoped_ptr<LayerTreeHost> layer_tree_host = | 1128 scoped_ptr<LayerTreeHost> layer_tree_host = |
1129 LayerTreeHost::CreateThreaded(&client, | 1129 LayerTreeHost::CreateThreaded(&client, |
1130 shared_bitmap_manager.get(), | 1130 shared_bitmap_manager.get(), |
1131 settings, | 1131 settings, |
| 1132 base::MessageLoopProxy::current(), |
1132 impl_thread.message_loop_proxy()); | 1133 impl_thread.message_loop_proxy()); |
1133 | 1134 |
1134 impl_thread.message_loop_proxy() | 1135 impl_thread.message_loop_proxy() |
1135 ->PostTask(FROM_HERE, | 1136 ->PostTask(FROM_HERE, |
1136 base::Bind(&BindInputHandlerOnCompositorThread, | 1137 base::Bind(&BindInputHandlerOnCompositorThread, |
1137 layer_tree_host->GetInputHandler(), | 1138 layer_tree_host->GetInputHandler(), |
1138 base::Unretained(&input_handler_client))); | 1139 base::Unretained(&input_handler_client))); |
1139 | 1140 |
1140 layer_tree_host->DidStopFlinging(); | 1141 layer_tree_host->DidStopFlinging(); |
1141 layer_tree_host.reset(); | 1142 layer_tree_host.reset(); |
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1232 RunTest(true, false, false); | 1233 RunTest(true, false, false); |
1233 } | 1234 } |
1234 | 1235 |
1235 TEST_F(LayerTreeHostScrollTestLayerStructureChange, ScrollDestroyWholeTree) { | 1236 TEST_F(LayerTreeHostScrollTestLayerStructureChange, ScrollDestroyWholeTree) { |
1236 scroll_destroy_whole_tree_ = true; | 1237 scroll_destroy_whole_tree_ = true; |
1237 RunTest(true, false, false); | 1238 RunTest(true, false, false); |
1238 } | 1239 } |
1239 | 1240 |
1240 } // namespace | 1241 } // namespace |
1241 } // namespace cc | 1242 } // namespace cc |
OLD | NEW |