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/thread_proxy.h" | 5 #include "cc/thread_proxy.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/debug/trace_event.h" | 8 #include "base/debug/trace_event.h" |
9 #include "cc/delay_based_time_source.h" | 9 #include "cc/delay_based_time_source.h" |
10 #include "cc/draw_quad.h" | 10 #include "cc/draw_quad.h" |
(...skipping 995 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1006 DebugScopedSetMainThreadBlocked mainThreadBlocked(this); | 1006 DebugScopedSetMainThreadBlocked mainThreadBlocked(this); |
1007 Proxy::implThread()->postTask(base::Bind(&ThreadProxy::commitPendingOnIm
plThreadForTesting, m_implThreadWeakPtr, &commitPendingRequest)); | 1007 Proxy::implThread()->postTask(base::Bind(&ThreadProxy::commitPendingOnIm
plThreadForTesting, m_implThreadWeakPtr, &commitPendingRequest)); |
1008 commitPendingRequest.completion.wait(); | 1008 commitPendingRequest.completion.wait(); |
1009 } | 1009 } |
1010 return commitPendingRequest.commitPending; | 1010 return commitPendingRequest.commitPending; |
1011 } | 1011 } |
1012 | 1012 |
1013 void ThreadProxy::commitPendingOnImplThreadForTesting(CommitPendingRequest* requ
est) | 1013 void ThreadProxy::commitPendingOnImplThreadForTesting(CommitPendingRequest* requ
est) |
1014 { | 1014 { |
1015 DCHECK(isImplThread()); | 1015 DCHECK(isImplThread()); |
1016 request->commitPending = m_schedulerOnImplThread->commitPending(); | 1016 if (m_layerTreeHostImpl->outputSurface()) |
| 1017 request->commitPending = m_schedulerOnImplThread->commitPending(); |
| 1018 else |
| 1019 request->commitPending = false; |
1017 request->completion.signal(); | 1020 request->completion.signal(); |
1018 } | 1021 } |
1019 | 1022 |
1020 } // namespace cc | 1023 } // namespace cc |
OLD | NEW |