Use message passing for BeginFrameAndCommitState and clean up forced commit logic

cc/layer_tree_host_unittest.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 "cc/layer_tree_host.h"
 
 #include "base/synchronization/lock.h"
 #include "cc/content_layer.h"
 #include "cc/content_layer_client.h"
 #include "cc/graphics_context.h"
@@ skipping 295 matching lines @@
         }
     }
 
     virtual void didCommit() OVERRIDE
     {
         m_numCommits++;
         if (m_numCommits == 1) {
             // Make the viewport empty so the host says it can't draw.
             m_layerTreeHost->setViewportSize(gfx::Size(0, 0), gfx::Size(0, 0));
 
-            scoped_array<char> pixels(new char[4]);
-            m_layerTreeHost->compositeAndReadback(static_cast<void*>(pixels.get()), gfx::Rect(0, 0, 1, 1));
+            char pixels[4];
+            m_layerTreeHost->compositeAndReadback(static_cast<void*>(&pixels), gfx::Rect(0, 0, 1, 1));
         } else if (m_numCommits == 2) {
             m_layerTreeHost->setNeedsRedraw();
             m_layerTreeHost->setNeedsCommit();
         } else
             endTest();
     }
 
     virtual void afterTest() OVERRIDE
     {
     }
@@ skipping 103 matching lines @@
         postSetNeedsCommitToMainThread();
     }
 
     virtual void didCommitAndDrawFrame() OVERRIDE
     {
         m_numCommits++;
         if (m_numCommits == 1) {
             m_layerTreeHost->setVisible(false);
             m_layerTreeHost->setNeedsCommit();
             m_layerTreeHost->setNeedsCommit();
-            scoped_array<char> pixels(new char[4]);
-            m_layerTreeHost->compositeAndReadback(static_cast<void*>(pixels.get()), gfx::Rect(0, 0, 1, 1));
+            char pixels[4];
+            m_layerTreeHost->compositeAndReadback(static_cast<void*>(&pixels), gfx::Rect(0, 0, 1, 1));
         } else
             endTest();
 
     }
 
     virtual void afterTest() OVERRIDE
     {
     }
 
 private:
@@ skipping 2010 matching lines @@
 }
 
 class LayerTreeHostTestCompositeAndReadbackCleanup : public LayerTreeHostTest {
 public:
     LayerTreeHostTestCompositeAndReadbackCleanup() { }
 
     virtual void beginTest() OVERRIDE
     {
         Layer* rootLayer = m_layerTreeHost->rootLayer();
 
-        scoped_array<char> pixels(new char[4]);
-        m_layerTreeHost->compositeAndReadback(static_cast<void*>(pixels.get()), gfx::Rect(0, 0, 1, 1));
+        char pixels[4];
+        m_layerTreeHost->compositeAndReadback(static_cast<void*>(&pixels), gfx::Rect(0, 0, 1, 1));
         EXPECT_FALSE(rootLayer->renderSurface());
 
         endTest();
     }
 
     virtual void afterTest() OVERRIDE
     {
     }
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestCompositeAndReadbackCleanup)
 
+class LayerTreeHostTestCompositeAndReadbackAnimateCount : public LayerTreeHostTest {
+public:
+    LayerTreeHostTestCompositeAndReadbackAnimateCount()
+        : m_layoutCount(0)
+    {
+    }
+
+    virtual void animate(base::TimeTicks) OVERRIDE
+    {
+        // We shouldn't animate on the compositeAndReadback-forced commit, but we should
+        // for the setNeedsCommit-triggered commit.
+        EXPECT_EQ(1, m_layoutCount);
+    }
+
+    virtual void layout() OVERRIDE
+    {
+        m_layoutCount++;
+        if (m_layoutCount == 2)
+            endTest();
+    }
+
+    virtual void beginTest() OVERRIDE
+    {
+        m_layerTreeHost->setNeedsCommit();
+
+        char pixels[4];
+        m_layerTreeHost->compositeAndReadback(&pixels, gfx::Rect(0, 0, 1, 1));
+    }
+
+    virtual void afterTest() OVERRIDE
+    {
+    }
+
+private:
+    int m_layoutCount;
+};
+
+TEST_F(LayerTreeHostTestCompositeAndReadbackAnimateCount, runMultiThread)
+{
+    runTest(true);
+}
+
 class LayerTreeHostTestSurfaceNotAllocatedForLayersOutsideMemoryLimit : public LayerTreeHostTest {
 public:
     LayerTreeHostTestSurfaceNotAllocatedForLayersOutsideMemoryLimit()
         : m_rootLayer(ContentLayerWithUpdateTracking::create(&m_fakeDelegate))
         , m_surfaceLayer1(ContentLayerWithUpdateTracking::create(&m_fakeDelegate))
         , m_replicaLayer1(ContentLayerWithUpdateTracking::create(&m_fakeDelegate))
         , m_surfaceLayer2(ContentLayerWithUpdateTracking::create(&m_fakeDelegate))
         , m_replicaLayer2(ContentLayerWithUpdateTracking::create(&m_fakeDelegate))
     {
     }
@@ skipping 719 matching lines @@
     int m_numCompleteCommits;
 };
 
 TEST_F(LayerTreeHostTestDeferCommits, runMultiThread)
 {
     runTest(true);
 }
 
 }  // namespace
 }  // namespace cc