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 927 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
938 TRACE_EVENT0("cc", "ThreadProxy::initializeRendererOnImplThread"); | 938 TRACE_EVENT0("cc", "ThreadProxy::initializeRendererOnImplThread"); |
939 DCHECK(isImplThread()); | 939 DCHECK(isImplThread()); |
940 DCHECK(m_outputSurfaceBeforeInitializationOnImplThread.get()); | 940 DCHECK(m_outputSurfaceBeforeInitializationOnImplThread.get()); |
941 *initializeSucceeded = m_layerTreeHostImpl->initializeRenderer(m_outputSurfa ceBeforeInitializationOnImplThread.Pass()); | 941 *initializeSucceeded = m_layerTreeHostImpl->initializeRenderer(m_outputSurfa ceBeforeInitializationOnImplThread.Pass()); |
942 if (*initializeSucceeded) { | 942 if (*initializeSucceeded) { |
943 *capabilities = m_layerTreeHostImpl->rendererCapabilities(); | 943 *capabilities = m_layerTreeHostImpl->rendererCapabilities(); |
944 m_schedulerOnImplThread->setSwapBuffersCompleteSupported( | 944 m_schedulerOnImplThread->setSwapBuffersCompleteSupported( |
945 capabilities->usingSwapCompleteCallback); | 945 capabilities->usingSwapCompleteCallback); |
946 } | 946 } |
947 | 947 |
948 int maxFramesPending = FrameRateController::kDefaultMaxFramesPending; | |
949 if (m_layerTreeHostImpl->outputSurface()->Capabilities().has_parent_composit or) | |
jamesr
2013/01/08 00:18:39
This line caused crashes on the win_aura bots (and
| |
950 maxFramesPending = 1; | |
951 m_schedulerOnImplThread->setMaxFramesPending(maxFramesPending); | |
952 | |
948 completion->signal(); | 953 completion->signal(); |
949 } | 954 } |
950 | 955 |
951 void ThreadProxy::layerTreeHostClosedOnImplThread(CompletionEvent* completion) | 956 void ThreadProxy::layerTreeHostClosedOnImplThread(CompletionEvent* completion) |
952 { | 957 { |
953 TRACE_EVENT0("cc", "ThreadProxy::layerTreeHostClosedOnImplThread"); | 958 TRACE_EVENT0("cc", "ThreadProxy::layerTreeHostClosedOnImplThread"); |
954 DCHECK(isImplThread()); | 959 DCHECK(isImplThread()); |
955 m_layerTreeHost->deleteContentsTexturesOnImplThread(m_layerTreeHostImpl->res ourceProvider()); | 960 m_layerTreeHost->deleteContentsTexturesOnImplThread(m_layerTreeHostImpl->res ourceProvider()); |
956 m_inputHandlerOnImplThread.reset(); | 961 m_inputHandlerOnImplThread.reset(); |
957 m_layerTreeHostImpl.reset(); | 962 m_layerTreeHostImpl.reset(); |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1013 } | 1018 } |
1014 | 1019 |
1015 void ThreadProxy::commitPendingOnImplThreadForTesting(CommitPendingRequest* requ est) | 1020 void ThreadProxy::commitPendingOnImplThreadForTesting(CommitPendingRequest* requ est) |
1016 { | 1021 { |
1017 DCHECK(isImplThread()); | 1022 DCHECK(isImplThread()); |
1018 request->commitPending = m_schedulerOnImplThread->commitPending(); | 1023 request->commitPending = m_schedulerOnImplThread->commitPending(); |
1019 request->completion.signal(); | 1024 request->completion.signal(); |
1020 } | 1025 } |
1021 | 1026 |
1022 } // namespace cc | 1027 } // namespace cc |
OLD | NEW |