| OLD | NEW |
| 1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 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/test/layer_tree_test.h" | 5 #include "cc/test/layer_tree_test.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/location.h" | 8 #include "base/location.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" |
| (...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 381 LayerTreeHostImpl::NotifyReadyToDraw(); | 381 LayerTreeHostImpl::NotifyReadyToDraw(); |
| 382 test_hooks_->NotifyReadyToDrawOnThread(this); | 382 test_hooks_->NotifyReadyToDrawOnThread(this); |
| 383 } | 383 } |
| 384 | 384 |
| 385 void NotifyAllTileTasksCompleted() override { | 385 void NotifyAllTileTasksCompleted() override { |
| 386 LayerTreeHostImpl::NotifyAllTileTasksCompleted(); | 386 LayerTreeHostImpl::NotifyAllTileTasksCompleted(); |
| 387 test_hooks_->NotifyAllTileTasksCompleted(this); | 387 test_hooks_->NotifyAllTileTasksCompleted(this); |
| 388 } | 388 } |
| 389 | 389 |
| 390 void BlockNotifyReadyToActivateForTesting(bool block) override { | 390 void BlockNotifyReadyToActivateForTesting(bool block) override { |
| 391 CHECK(proxy()->ImplThreadTaskRunner()) | 391 CHECK(thread_verifier()->ImplThreadTaskRunner()) |
| 392 << "Not supported for single-threaded mode."; | 392 << "Not supported for single-threaded mode."; |
| 393 block_notify_ready_to_activate_for_testing_ = block; | 393 block_notify_ready_to_activate_for_testing_ = block; |
| 394 if (!block && notify_ready_to_activate_was_blocked_) { | 394 if (!block && notify_ready_to_activate_was_blocked_) { |
| 395 NotifyReadyToActivate(); | 395 NotifyReadyToActivate(); |
| 396 notify_ready_to_activate_was_blocked_ = false; | 396 notify_ready_to_activate_was_blocked_ = false; |
| 397 } | 397 } |
| 398 } | 398 } |
| 399 | 399 |
| 400 void ActivateSyncTree() override { | 400 void ActivateSyncTree() override { |
| 401 test_hooks_->WillActivateTreeOnThread(this); | 401 test_hooks_->WillActivateTreeOnThread(this); |
| (...skipping 595 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 997 LayerTreeHost* LayerTreeTest::layer_tree_host() { | 997 LayerTreeHost* LayerTreeTest::layer_tree_host() { |
| 998 // We check for a null proxy here as we sometimes ask for the layer tree host | 998 // We check for a null proxy here as we sometimes ask for the layer tree host |
| 999 // when the proxy does not exist, often for checking settings after a test has | 999 // when the proxy does not exist, often for checking settings after a test has |
| 1000 // completed. For example, LTHPixelResourceTest::RunPixelResourceTest. See | 1000 // completed. For example, LTHPixelResourceTest::RunPixelResourceTest. See |
| 1001 // elsewhere in this file for other examples. | 1001 // elsewhere in this file for other examples. |
| 1002 DCHECK(!proxy() || proxy()->IsMainThread() || proxy()->IsMainThreadBlocked()); | 1002 DCHECK(!proxy() || proxy()->IsMainThread() || proxy()->IsMainThreadBlocked()); |
| 1003 return layer_tree_host_.get(); | 1003 return layer_tree_host_.get(); |
| 1004 } | 1004 } |
| 1005 | 1005 |
| 1006 } // namespace cc | 1006 } // namespace cc |
| OLD | NEW |