Chromium Code Reviews| Index: cc/test/layer_tree_test.cc |
| diff --git a/cc/test/layer_tree_test.cc b/cc/test/layer_tree_test.cc |
| index 373959df0d40ca72490d1992f9b70f9da228135e..75b44fc8c559303b8e8f78f8911d1570c4b2dbd2 100644 |
| --- a/cc/test/layer_tree_test.cc |
| +++ b/cc/test/layer_tree_test.cc |
| @@ -259,22 +259,17 @@ class LayerTreeHostImplForTesting : public LayerTreeHostImpl { |
| LayerTreeHostImpl::ReclaimResources(ack); |
| } |
| - void UpdateVisibleTiles() override { |
| - LayerTreeHostImpl::UpdateVisibleTiles(); |
| - test_hooks_->UpdateVisibleTilesOnThread(this); |
| - } |
| - |
| void NotifyReadyToActivate() override { |
| if (block_notify_ready_to_activate_for_testing_) { |
| notify_ready_to_activate_was_blocked_ = true; |
| } else { |
| - client_->NotifyReadyToActivate(); |
| + LayerTreeHostImpl::NotifyReadyToActivate(); |
| test_hooks_->NotifyReadyToActivateOnThread(this); |
| } |
| } |
| void NotifyReadyToDraw() override { |
| - client_->NotifyReadyToDraw(); |
| + LayerTreeHostImpl::NotifyReadyToDraw(); |
|
danakj
2014/11/12 20:50:35
Here's the fix for the unit test. The LayerTreeTes
|
| test_hooks_->NotifyReadyToDrawOnThread(this); |
| } |
| @@ -327,6 +322,11 @@ class LayerTreeHostImplForTesting : public LayerTreeHostImpl { |
| test_hooks_->UpdateAnimationState(this, has_unfinished_animation); |
| } |
| + void NotifyTileStateChanged(const Tile* tile) override { |
| + LayerTreeHostImpl::NotifyTileStateChanged(tile); |
| + test_hooks_->NotifyTileStateChangedOnThread(this, tile); |
| + } |
| + |
| private: |
| TestHooks* test_hooks_; |
| bool block_notify_ready_to_activate_for_testing_; |
| @@ -513,7 +513,7 @@ void LayerTreeTest::EndTest() { |
| } |
| } |
| -void LayerTreeTest::EndTestAfterDelay(int delay_milliseconds) { |
| +void LayerTreeTest::EndTestAfterDelayMs(int delay_milliseconds) { |
| main_task_runner_->PostDelayedTask( |
| FROM_HERE, |
| base::Bind(&LayerTreeTest::EndTest, main_thread_weak_ptr_), |