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

cc/layer_tree_host.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/layer_tree_host.h"
 
 #include "CCFontAtlas.h"
 #include "CCGraphicsContext.h"
@@ skipping 312 matching lines @@
 {
     TRACE_EVENT0("cc", "LayerTreeHost::didLoseContext");
     DCHECK(Proxy::isMainThread());
     m_contextLost = true;
     m_numFailedRecreateAttempts = 0;
     setNeedsCommit();
 }
 
 bool LayerTreeHost::compositeAndReadback(void *pixels, const IntRect& rect)
 {
+    // Clear any pending commits.

[jamesr, 2012/10/23 21:24:34]

No, this is definitely not right.  You're imposing lots of complexity on cc even
if the use case for aura is simplified

[jonathan.backer, 2012/10/24 16:42:14]

Done. Replaced with a DCHECK in ThreadProxy. Enforcing unlock in ui::Compositor.

+    setDeferCommits(false);
+
     m_triggerIdleUpdates = false;
     bool ret = m_proxy->compositeAndReadback(pixels, rect);
     m_triggerIdleUpdates = true;
     return ret;
 }
 
 void LayerTreeHost::finishAllRendering()
 {
     if (!m_rendererInitialized)
         return;
+
+    // Clear any pending commits.

[jamesr, 2012/10/23 21:24:34]

DCHECK, don't handle

[jonathan.backer, 2012/10/24 16:42:14]

Done. Added DCHECK to ThreadProxy.

+    setDeferCommits(false);
+
     m_proxy->finishAllRendering();
 }
 
+void LayerTreeHost::setDeferCommits(bool deferCommits)
+{
+    m_proxy->setDeferCommits(deferCommits);
+}
+
+bool LayerTreeHost::deferCommits() const
+{
+    return m_proxy->deferCommits();
+}
+
 void LayerTreeHost::renderingStats(RenderingStats* stats) const
 {
     *stats = m_renderingStats;
     m_proxy->renderingStats(stats);
 }
 
 const RendererCapabilities& LayerTreeHost::rendererCapabilities() const
 {
     return m_proxy->rendererCapabilities();
 }
@@ skipping 461 matching lines @@
             else
                 layer->notifyAnimationFinished(wallClockTime);
         }
     }
 
     for (size_t childIndex = 0; childIndex < layer->children().size(); ++childIndex)
         setAnimationEventsRecursive(events, layer->children()[childIndex].get(), wallClockTime);
 }
 
 } // namespace cc