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/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
10 #include "base/run_loop.h" | 10 #include "base/run_loop.h" |
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
272 if (block_impl_side_invalidation_) { | 272 if (block_impl_side_invalidation_) { |
273 impl_side_invalidation_was_blocked_ = true; | 273 impl_side_invalidation_was_blocked_ = true; |
274 return; | 274 return; |
275 } | 275 } |
276 | 276 |
277 impl_side_invalidation_was_blocked_ = false; | 277 impl_side_invalidation_was_blocked_ = false; |
278 LayerTreeHostImpl::RequestImplSideInvalidation(); | 278 LayerTreeHostImpl::RequestImplSideInvalidation(); |
279 test_hooks_->DidRequestImplSideInvalidation(this); | 279 test_hooks_->DidRequestImplSideInvalidation(this); |
280 } | 280 } |
281 | 281 |
| 282 void DidReceiveCompositorFrameAck() override { |
| 283 test_hooks_->WillReceiveCompositorFrameAckOnThread(this); |
| 284 LayerTreeHostImpl::DidReceiveCompositorFrameAck(); |
| 285 test_hooks_->DidReceiveCompositorFrameAckOnThread(this); |
| 286 } |
| 287 |
282 AnimationHost* animation_host() const { | 288 AnimationHost* animation_host() const { |
283 return static_cast<AnimationHost*>(mutator_host()); | 289 return static_cast<AnimationHost*>(mutator_host()); |
284 } | 290 } |
285 | 291 |
286 private: | 292 private: |
287 TestHooks* test_hooks_; | 293 TestHooks* test_hooks_; |
288 bool block_notify_ready_to_activate_for_testing_ = false; | 294 bool block_notify_ready_to_activate_for_testing_ = false; |
289 bool notify_ready_to_activate_was_blocked_ = false; | 295 bool notify_ready_to_activate_was_blocked_ = false; |
290 | 296 |
291 bool block_impl_side_invalidation_ = false; | 297 bool block_impl_side_invalidation_ = false; |
(...skipping 599 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
891 DCHECK(task_runner_provider()->IsMainThread() || | 897 DCHECK(task_runner_provider()->IsMainThread() || |
892 task_runner_provider()->IsMainThreadBlocked()); | 898 task_runner_provider()->IsMainThreadBlocked()); |
893 return layer_tree_host_.get(); | 899 return layer_tree_host_.get(); |
894 } | 900 } |
895 | 901 |
896 Proxy* LayerTreeTest::proxy() { | 902 Proxy* LayerTreeTest::proxy() { |
897 return layer_tree_host() ? layer_tree_host()->proxy() : NULL; | 903 return layer_tree_host() ? layer_tree_host()->proxy() : NULL; |
898 } | 904 } |
899 | 905 |
900 } // namespace cc | 906 } // namespace cc |
OLD | NEW |