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/threading/thread_task_runner_handle.h" | 10 #include "base/threading/thread_task_runner_handle.h" |
(...skipping 1333 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1344 | 1344 |
1345 void BindInputHandlerOnCompositorThread( | 1345 void BindInputHandlerOnCompositorThread( |
1346 const base::WeakPtr<InputHandler>& input_handler, | 1346 const base::WeakPtr<InputHandler>& input_handler, |
1347 ThreadCheckingInputHandlerClient* client) { | 1347 ThreadCheckingInputHandlerClient* client) { |
1348 input_handler->BindToClient(client); | 1348 input_handler->BindToClient(client); |
1349 } | 1349 } |
1350 | 1350 |
1351 TEST(LayerTreeHostFlingTest, DidStopFlingingThread) { | 1351 TEST(LayerTreeHostFlingTest, DidStopFlingingThread) { |
1352 base::Thread impl_thread("cc"); | 1352 base::Thread impl_thread("cc"); |
1353 ASSERT_TRUE(impl_thread.Start()); | 1353 ASSERT_TRUE(impl_thread.Start()); |
| 1354 ASSERT_TRUE(impl_thread.task_runner()); |
1354 | 1355 |
1355 bool received_stop_flinging = false; | 1356 bool received_stop_flinging = false; |
1356 LayerTreeSettings settings; | 1357 LayerTreeSettings settings; |
1357 | 1358 |
1358 ThreadCheckingInputHandlerClient input_handler_client( | 1359 StubLayerTreeHostClient layer_tree_host_client; |
1359 impl_thread.task_runner().get(), &received_stop_flinging); | |
1360 FakeLayerTreeHostClient client; | |
1361 | |
1362 ASSERT_TRUE(impl_thread.task_runner()); | |
1363 TestSharedBitmapManager shared_bitmap_manager; | 1360 TestSharedBitmapManager shared_bitmap_manager; |
1364 TestTaskGraphRunner task_graph_runner; | 1361 TestTaskGraphRunner task_graph_runner; |
1365 | 1362 |
1366 LayerTreeHost::InitParams params; | 1363 LayerTreeHost::InitParams params; |
1367 params.client = &client; | 1364 params.client = &layer_tree_host_client; |
1368 params.shared_bitmap_manager = &shared_bitmap_manager; | 1365 params.shared_bitmap_manager = &shared_bitmap_manager; |
1369 params.task_graph_runner = &task_graph_runner; | 1366 params.task_graph_runner = &task_graph_runner; |
1370 params.settings = &settings; | 1367 params.settings = &settings; |
1371 params.main_task_runner = base::ThreadTaskRunnerHandle::Get(); | 1368 params.main_task_runner = base::ThreadTaskRunnerHandle::Get(); |
1372 params.animation_host = AnimationHost::CreateForTesting(ThreadInstance::MAIN); | 1369 params.animation_host = AnimationHost::CreateForTesting(ThreadInstance::MAIN); |
1373 std::unique_ptr<LayerTreeHost> layer_tree_host = | 1370 std::unique_ptr<LayerTreeHost> layer_tree_host = |
1374 LayerTreeHost::CreateThreaded(impl_thread.task_runner(), ¶ms); | 1371 LayerTreeHost::CreateThreaded(impl_thread.task_runner(), ¶ms); |
1375 | 1372 |
| 1373 ThreadCheckingInputHandlerClient input_handler_client( |
| 1374 impl_thread.task_runner().get(), &received_stop_flinging); |
1376 impl_thread.task_runner()->PostTask( | 1375 impl_thread.task_runner()->PostTask( |
1377 FROM_HERE, base::Bind(&BindInputHandlerOnCompositorThread, | 1376 FROM_HERE, base::Bind(&BindInputHandlerOnCompositorThread, |
1378 layer_tree_host->GetInputHandler(), | 1377 layer_tree_host->GetInputHandler(), |
1379 base::Unretained(&input_handler_client))); | 1378 base::Unretained(&input_handler_client))); |
1380 | 1379 |
1381 layer_tree_host->DidStopFlinging(); | 1380 layer_tree_host->DidStopFlinging(); |
1382 layer_tree_host = nullptr; | 1381 layer_tree_host = nullptr; |
1383 impl_thread.Stop(); | 1382 impl_thread.Stop(); |
1384 EXPECT_TRUE(received_stop_flinging); | 1383 EXPECT_TRUE(received_stop_flinging); |
1385 } | 1384 } |
(...skipping 465 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1851 int num_impl_commits_; | 1850 int num_impl_commits_; |
1852 int num_aborted_commits_; | 1851 int num_aborted_commits_; |
1853 int num_impl_scrolls_; | 1852 int num_impl_scrolls_; |
1854 int num_draws_; | 1853 int num_draws_; |
1855 }; | 1854 }; |
1856 | 1855 |
1857 MULTI_THREAD_TEST_F(LayerTreeHostScrollTestScrollAbortedCommitMFBA); | 1856 MULTI_THREAD_TEST_F(LayerTreeHostScrollTestScrollAbortedCommitMFBA); |
1858 | 1857 |
1859 } // namespace | 1858 } // namespace |
1860 } // namespace cc | 1859 } // namespace cc |
OLD | NEW |