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

cc/single_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/single_thread_proxy.h"
 
 #include "CCDrawQuad.h"
 #include "CCGraphicsContext.h"
@@ skipping 213 matching lines @@
 }
 
 void SingleThreadProxy::setNeedsRedraw()
 {
     // FIXME: Once we move render_widget scheduling into this class, we can
     // treat redraw requests more efficiently than commitAndRedraw requests.
     m_layerTreeHostImpl->setFullRootLayerDamage();
     setNeedsCommit();
 }
 
+void SingleThreadProxy::setDeferCommits(bool)
+{
+}
+
 bool SingleThreadProxy::commitRequested() const
 {
     return false;
 }
 
 void SingleThreadProxy::didAddAnimation()
 {
 }
 
 size_t SingleThreadProxy::maxPartialTextureUpdates() const
@@ skipping 65 matching lines @@
     NOTREACHED();
 }
 
 bool SingleThreadProxy::commitAndComposite()
 {
     DCHECK(Proxy::isMainThread());
 
     if (!m_layerTreeHost->initializeRendererIfNeeded())
         return false;
 
+    if (m_layerTreeHost->deferCommits()) {
+        TRACE_EVENT0("cc", "EarlyOut_DeferCommits");

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

I don't think this is right.  In single-threaded mode, the embedder of CC is in
complete control of when commits and composites happen.  They also get to decide
when to call deferCommits().  CC should just do exactly what the embedder asks
and not bail.

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

Done.

+        return false;
+    }
+
     // Unlink any texture backings that were deleted
     PrioritizedTextureManager::BackingList evictedContentsTexturesBackings;
     {
         DebugScopedSetImplThread implThread;
         m_layerTreeHost->contentsTextureManager()->getEvictedBackings(evictedContentsTexturesBackings);
     }
     m_layerTreeHost->contentsTextureManager()->unlinkEvictedBackings(evictedContentsTexturesBackings);
 
     scoped_ptr<TextureUpdateQueue> queue = make_scoped_ptr(new TextureUpdateQueue);
     m_layerTreeHost->updateLayers(*(queue.get()), m_layerTreeHostImpl->memoryAllocationLimitBytes());
@@ skipping 44 matching lines @@
 
 void SingleThreadProxy::didSwapFrame()
 {
     if (m_nextFrameIsNewlyCommittedFrame) {
         m_nextFrameIsNewlyCommittedFrame = false;
         m_layerTreeHost->didCommitAndDrawFrame();
     }
 }
 
 }