cc: Force layer tree tests to go idle before exiting.

cc/test/layer_tree_test_common.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/test/layer_tree_test_common.h"
 
 #include "base/stl_util.h"
 #include "cc/active_animation.h"
 #include "cc/content_layer.h"
 #include "cc/font_atlas.h"
@@ skipping 254 matching lines @@
 private:
     explicit ThreadedMockLayerTreeHostClient(TestHooks* testHooks) : m_testHooks(testHooks) { }
 
     TestHooks* m_testHooks;
 };
 
 ThreadedTest::ThreadedTest()
     : m_beginning(false)
     , m_endWhenBeginReturns(false)
     , m_timedOut(false)
-    , m_finished(false)
     , m_scheduled(false)
     , m_started(false)
     , m_implThread(0)
 {
 }
 
 ThreadedTest::~ThreadedTest()
 {
 }
 
 void ThreadedTest::endTest()
 {
-    m_finished = true;
-
     // For the case where we endTest during beginTest(), set a flag to indicate that
     // the test should end the second beginTest regains control.
     if (m_beginning)
         m_endWhenBeginReturns = true;
     else
         m_mainThreadProxy->postTask(FROM_HERE, base::Bind(&ThreadedTest::realEndTest, base::Unretained(this)));
 }
 
 void ThreadedTest::endTestAfterDelay(int delayMilliseconds)
 {
@@ skipping 67 matching lines @@
 }
 
 void ThreadedTest::timeout()
 {
     m_timedOut = true;
     endTest();
 }
 
 void ThreadedTest::scheduleComposite()
 {
-    if (!m_started || m_scheduled || m_finished)
+    if (!m_started || m_scheduled)
         return;
     m_scheduled = true;
     m_mainThreadProxy->postTask(FROM_HERE, base::Bind(&ThreadedTest::dispatchComposite, base::Unretained(this)));
 }
 
 void ThreadedTest::realEndTest()
 {
+    if (m_layerTreeHost && m_layerTreeHost->proxy()->commitPendingForTesting()) {
+        m_mainThreadProxy->postTask(FROM_HERE, base::Bind(&ThreadedTest::realEndTest, base::Unretained(this)));
+        return;
+    }
+        
     MessageLoop::current()->Quit();
 }
 
 void ThreadedTest::dispatchSetNeedsAnimate()
 {
     DCHECK(!proxy() || proxy()->isMainThread());
 
-    if (m_finished)
-        return;
-
     if (m_layerTreeHost.get())
         m_layerTreeHost->setNeedsAnimate();
 }
 
 void ThreadedTest::dispatchAddInstantAnimation()
 {
     DCHECK(!proxy() || proxy()->isMainThread());
 
-    if (m_finished)
-        return;
-
     if (m_layerTreeHost.get() && m_layerTreeHost->rootLayer())
         addOpacityTransitionToLayer(*m_layerTreeHost->rootLayer(), 0, 0, 0.5, false);
 }
 
 void ThreadedTest::dispatchAddAnimation(Layer* layerToReceiveAnimation)
 {
     DCHECK(!proxy() || proxy()->isMainThread());
 
-    if (m_finished)
-        return;
-
     if (layerToReceiveAnimation)
         addOpacityTransitionToLayer(*layerToReceiveAnimation, 10, 0, 0.5, true);
 }
 
 void ThreadedTest::dispatchSetNeedsCommit()
 {
     DCHECK(!proxy() || proxy()->isMainThread());
 
-    if (m_finished)
-        return;
-
     if (m_layerTreeHost.get())
         m_layerTreeHost->setNeedsCommit();
 }
 
 void ThreadedTest::dispatchAcquireLayerTextures()
 {
     DCHECK(!proxy() || proxy()->isMainThread());
 
-    if (m_finished)
-        return;
-
     if (m_layerTreeHost.get())
         m_layerTreeHost->acquireLayerTextures();
 }
 
 void ThreadedTest::dispatchSetNeedsRedraw()
 {
     DCHECK(!proxy() || proxy()->isMainThread());
 
-    if (m_finished)
-        return;
-
     if (m_layerTreeHost.get())
         m_layerTreeHost->setNeedsRedraw();
 }
 
 void ThreadedTest::dispatchSetVisible(bool visible)
 {
     DCHECK(!proxy() || proxy()->isMainThread());
 
-    if (m_finished)
-        return;
-
     if (m_layerTreeHost.get())
         m_layerTreeHost->setVisible(visible);
 }
 
 void ThreadedTest::dispatchComposite()
 {
     m_scheduled = false;
-    if (m_layerTreeHost.get() && !m_finished)
+    if (m_layerTreeHost.get())
         m_layerTreeHost->composite();
 }
 
 void ThreadedTest::dispatchDidAddAnimation()
 {
     DCHECK(!proxy() || proxy()->isMainThread());
 
-    if (m_finished)
-        return;
-
     if (m_layerTreeHost.get())
         m_layerTreeHost->didAddAnimation();
 }
 
 void ThreadedTest::runTest(bool threaded)
 {
     if (threaded) {
         m_implThread.reset(new base::Thread("ThreadedTest"));
         ASSERT_TRUE(m_implThread->Start());
     }
@@ skipping 16 matching lines @@
     ASSERT_FALSE(m_layerTreeHost.get());
     m_client.reset();
     if (m_timedOut) {
         FAIL() << "Test timed out";
         return;
     }
     afterTest();
 }
 
 }  // namespace cc