Aura: Resize locks with --ui-enable-threaded-compositing

cc/thread_proxy.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "cc/thread_proxy.h"
 
 #include "CCDelayBasedTimeSource.h"
 #include "CCDrawQuad.h"
@@ skipping 271 matching lines @@
 }
 
 void ThreadProxy::setNeedsCommit()
 {
     DCHECK(isMainThread());
     if (m_commitRequested)
         return;
     TRACE_EVENT0("cc", "ThreadProxy::setNeedsCommit");
     m_commitRequested = true;
 
+    // FIXME(backer): Necessary?

[jamesr, 2012/10/23 17:50:44]

No, this is wrong.

[jonathan.backer, 2012/10/23 19:26:42]

Done.

+    if (m_deferredBeginFrameRequest.get())
+        return;
     if (m_commitRequestSentToImplThread)
         return;
     m_commitRequestSentToImplThread = true;
     Proxy::implThread()->postTask(createThreadTask(this, &ThreadProxy::setNeedsCommitOnImplThread));
 }
 
 void ThreadProxy::didLoseContextOnImplThread()
 {
     DCHECK(isImplThread());
     TRACE_EVENT0("cc", "ThreadProxy::didLoseContextOnImplThread");
@@ skipping 64 matching lines @@
 }
 
 void ThreadProxy::setNeedsRedraw()
 {
     DCHECK(isMainThread());
     TRACE_EVENT0("cc", "ThreadProxy::setNeedsRedraw");
     Proxy::implThread()->postTask(createThreadTask(this, &ThreadProxy::setFullRootLayerDamageOnImplThread));
     Proxy::implThread()->postTask(createThreadTask(this, &ThreadProxy::setNeedsRedrawOnImplThread));
 }
 
+void ThreadProxy::setDeferCommits(bool deferCommits)
+{
+    DCHECK(isMainThread());
+    if (!deferCommits && m_deferredBeginFrameRequest.get()) {
+        DCHECK(!m_pendingBeginFrameRequest.get());
+        m_deferredBeginFrameRequest.swap(m_pendingBeginFrameRequest);
+        m_mainThreadProxy->postTask(createThreadTask(this, &ThreadProxy::beginFrame));
+    }
+}
+
 bool ThreadProxy::commitRequested() const
 {
     DCHECK(isMainThread());
     return m_commitRequested;
 }
 
 void ThreadProxy::setNeedsRedrawOnImplThread()
 {
     DCHECK(isImplThread());
     TRACE_EVENT0("cc", "ThreadProxy::setNeedsRedrawOnImplThread");
@@ skipping 94 matching lines @@
     }
 }
 
 void ThreadProxy::beginFrame()
 {
     TRACE_EVENT0("cc", "ThreadProxy::beginFrame");
     DCHECK(isMainThread());
     if (!m_layerTreeHost)
         return;
 
+    if (m_layerTreeHost->deferCommits()) {
+        TRACE_EVENT0("cc", "EarlyOut_DeferCommits");
+        DCHECK(!m_deferredBeginFrameRequest.get());

[jamesr, 2012/10/23 17:50:44]

!m_deferredBeginFrameRequest works fine. no need for .get()

[jonathan.backer, 2012/10/23 19:26:42]

Done.

+        m_deferredBeginFrameRequest.swap(m_pendingBeginFrameRequest);

[jamesr, 2012/10/23 17:50:44]

This swap is unnecessary

[jonathan.backer, 2012/10/23 19:26:42]

Done.

+        return;
+    }
+
     if (!m_pendingBeginFrameRequest) {
         TRACE_EVENT0("cc", "EarlyOut_StaleBeginFrameMessage");
         return;
     }
 
     if (m_layerTreeHost->needsSharedContext() && !WebSharedGraphicsContext3D::haveCompositorThreadContext())
         WebSharedGraphicsContext3D::createCompositorThreadContext();
 
     scoped_ptr<BeginFrameAndCommitState> request(m_pendingBeginFrameRequest.Pass());
 
@@ skipping 448 matching lines @@
 ThreadProxy::BeginFrameAndCommitState::BeginFrameAndCommitState()
     : monotonicFrameBeginTime(0)
 {
 }
 
 ThreadProxy::BeginFrameAndCommitState::~BeginFrameAndCommitState()
 {
 }
 
 }  // namespace cc