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 "cc/animation/animation.h" | 8 #include "cc/animation/animation.h" |
9 #include "cc/animation/animation_registrar.h" | 9 #include "cc/animation/animation_registrar.h" |
10 #include "cc/animation/layer_animation_controller.h" | 10 #include "cc/animation/layer_animation_controller.h" |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
68 const LayerTreeSettings& settings, | 68 const LayerTreeSettings& settings, |
69 LayerTreeHostImplClient* host_impl_client, | 69 LayerTreeHostImplClient* host_impl_client, |
70 Proxy* proxy, | 70 Proxy* proxy, |
71 RenderingStatsInstrumentation* stats_instrumentation) | 71 RenderingStatsInstrumentation* stats_instrumentation) |
72 : LayerTreeHostImpl(settings, | 72 : LayerTreeHostImpl(settings, |
73 host_impl_client, | 73 host_impl_client, |
74 proxy, | 74 proxy, |
75 stats_instrumentation), | 75 stats_instrumentation), |
76 test_hooks_(test_hooks) {} | 76 test_hooks_(test_hooks) {} |
77 | 77 |
| 78 virtual void BeginFrame(const BeginFrameArgs& args) OVERRIDE { |
| 79 test_hooks_->WillBeginFrameOnThread(this, args); |
| 80 LayerTreeHostImpl::BeginFrame(args); |
| 81 } |
| 82 |
78 virtual void BeginCommit() OVERRIDE { | 83 virtual void BeginCommit() OVERRIDE { |
79 LayerTreeHostImpl::BeginCommit(); | 84 LayerTreeHostImpl::BeginCommit(); |
80 test_hooks_->BeginCommitOnThread(this); | 85 test_hooks_->BeginCommitOnThread(this); |
81 } | 86 } |
82 | 87 |
83 virtual void CommitComplete() OVERRIDE { | 88 virtual void CommitComplete() OVERRIDE { |
84 LayerTreeHostImpl::CommitComplete(); | 89 LayerTreeHostImpl::CommitComplete(); |
85 test_hooks_->CommitCompleteOnThread(this); | 90 test_hooks_->CommitCompleteOnThread(this); |
86 | 91 |
87 if (!settings().impl_side_painting) { | 92 if (!settings().impl_side_painting) { |
(...skipping 536 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
624 | 629 |
625 scoped_refptr<cc::ContextProvider> LayerTreeTest:: | 630 scoped_refptr<cc::ContextProvider> LayerTreeTest:: |
626 OffscreenContextProviderForCompositorThread() { | 631 OffscreenContextProviderForCompositorThread() { |
627 if (!compositor_thread_contexts_.get() || | 632 if (!compositor_thread_contexts_.get() || |
628 compositor_thread_contexts_->DestroyedOnMainThread()) | 633 compositor_thread_contexts_->DestroyedOnMainThread()) |
629 compositor_thread_contexts_ = TestContextProvider::Create(); | 634 compositor_thread_contexts_ = TestContextProvider::Create(); |
630 return compositor_thread_contexts_; | 635 return compositor_thread_contexts_; |
631 } | 636 } |
632 | 637 |
633 } // namespace cc | 638 } // namespace cc |
OLD | NEW |