cc: Poll for state that triggers draws (synchronous compositor only)

cc/trees/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/trees/layer_tree_host.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/synchronization/lock.h"
@@ skipping 2386 matching lines @@
         base::Bind(&LayerTreeHostTestBeginFrameNotification::EndTest,
                    base::Unretained(this)));
   }
 
   virtual void AfterTest() OVERRIDE {}
 };
 
 MULTI_THREAD_TEST_F(
     LayerTreeHostTestBeginFrameNotificationShutdownWhileEnabled);
 
+class LayerTreeHostTestAbortedCommitDoesntStallNextCommitWhenIdle

[brianderson, 2013/09/11 23:19:32]

This test times out without the fix in this patch.

+    : public LayerTreeHostTest {
+ protected:
+  LayerTreeHostTestAbortedCommitDoesntStallNextCommitWhenIdle()
+  : commit_count_(0) {}

[enne (OOO), 2013/09/11 23:28:12]

style nit: this needs to be indented.

+
+  virtual void InitializeSettings(LayerTreeSettings* settings) OVERRIDE {
+    settings->begin_frame_scheduling_enabled = true;
+    settings->using_synchronous_renderer_compositor = true;
+  }
+
+  virtual void BeginTest() OVERRIDE { PostSetNeedsCommitToMainThread(); }
+
+  virtual void DidCommit() OVERRIDE {
+    commit_count_++;
+    if (commit_count_== 2) {
+      // A commit was just aborted, request a real commit now.
+      layer_tree_host()->SetNeedsCommit();
+    } else if (commit_count_ == 3) {
+      // Make sure the real commit following an aborted commit will still
+      // complete.
+      EndTest();
+    }
+  }
+
+  virtual void CommitCompleteOnThread(LayerTreeHostImpl *host_impl) OVERRIDE {

[enne (OOO), 2013/09/11 23:28:12]

style nit: '* ' not ' *'

+    // Initiate an aborted commit after every real commit.
+    host_impl->SetNeedsCommit();
+  }
+
+  virtual void AfterTest() OVERRIDE {}

[enne (OOO), 2013/09/11 23:28:12]

As a sanity check for this test, can you also check that the number of
CommitCompleteOnThread calls is two (or at least one?) so that you know for sure
that the commit was aborted?

+
+  int commit_count_;
+};
+
+MULTI_THREAD_TEST_F(
+    LayerTreeHostTestAbortedCommitDoesntStallNextCommitWhenIdle);
+
 class LayerTreeHostTestUninvertibleTransformDoesNotBlockActivation
     : public LayerTreeHostTest {
  protected:
   virtual void InitializeSettings(LayerTreeSettings* settings) OVERRIDE {
     settings->impl_side_painting = true;
   }
 
   virtual void SetupTree() OVERRIDE {
     LayerTreeHostTest::SetupTree();
 
@@ skipping 2223 matching lines @@
   scoped_refptr<TestContextProvider> context_provider_;
   FakeContentLayerClient client_;
 };
 
 // Impl-side painting is a multi-threaded compositor feature.
 MULTI_THREAD_TEST_F(LayerTreeHostTestMaxTransferBufferUsageBytes);
 
 }  // namespace
 
 }  // namespace cc