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/trees/thread_proxy.h" | 5 #include "cc/trees/thread_proxy.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
147 &completion)); | 147 &completion)); |
148 completion.Wait(); | 148 completion.Wait(); |
149 } | 149 } |
150 | 150 |
151 bool ThreadProxy::IsStarted() const { | 151 bool ThreadProxy::IsStarted() const { |
152 DCHECK(Proxy::IsMainThread()); | 152 DCHECK(Proxy::IsMainThread()); |
153 return main().started; | 153 return main().started; |
154 } | 154 } |
155 | 155 |
156 bool ThreadProxy::CommitToActiveTree() const { | 156 bool ThreadProxy::CommitToActiveTree() const { |
157 // With ThreadProxy we use a pending tree and activate it once it's ready to | 157 // With ThreadProxy and impl-side painting, we use a pending tree and activate |
158 // draw. | 158 // it once it's ready to draw. |
159 return false; | 159 return !impl().layer_tree_host_impl->settings().impl_side_painting; |
160 } | 160 } |
161 | 161 |
162 void ThreadProxy::SetLayerTreeHostClientReady() { | 162 void ThreadProxy::SetLayerTreeHostClientReady() { |
163 TRACE_EVENT0("cc", "ThreadProxy::SetLayerTreeHostClientReady"); | 163 TRACE_EVENT0("cc", "ThreadProxy::SetLayerTreeHostClientReady"); |
164 Proxy::ImplThreadTaskRunner()->PostTask( | 164 Proxy::ImplThreadTaskRunner()->PostTask( |
165 FROM_HERE, | 165 FROM_HERE, |
166 base::Bind(&ThreadProxy::SetLayerTreeHostClientReadyOnImplThread, | 166 base::Bind(&ThreadProxy::SetLayerTreeHostClientReadyOnImplThread, |
167 impl_thread_weak_ptr_)); | 167 impl_thread_weak_ptr_)); |
168 } | 168 } |
169 | 169 |
(...skipping 1216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1386 } | 1386 } |
1387 | 1387 |
1388 void ThreadProxy::DidCompletePageScaleAnimationOnImplThread() { | 1388 void ThreadProxy::DidCompletePageScaleAnimationOnImplThread() { |
1389 DCHECK(IsImplThread()); | 1389 DCHECK(IsImplThread()); |
1390 Proxy::MainThreadTaskRunner()->PostTask( | 1390 Proxy::MainThreadTaskRunner()->PostTask( |
1391 FROM_HERE, base::Bind(&ThreadProxy::DidCompletePageScaleAnimation, | 1391 FROM_HERE, base::Bind(&ThreadProxy::DidCompletePageScaleAnimation, |
1392 main_thread_weak_ptr_)); | 1392 main_thread_weak_ptr_)); |
1393 } | 1393 } |
1394 | 1394 |
1395 } // namespace cc | 1395 } // namespace cc |
OLD | NEW |