Fix race conditions in window snapshot code.

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 618 matching lines @@
 
     if (sfn == kReadbackReplacementSourceFrameNumber)
       EndTest();
   }
 
   virtual void AfterTest() OVERRIDE {}
 };
 
 MULTI_THREAD_TEST_F(LayerTreeHostTestCompositeAndReadbackAfterForcedDraw);
 
+class LayerTreeHostTestSetNextCommitForcesRedraw : public LayerTreeHostTest {
+ public:

[bajones, 2013/09/27 20:50:11]

@enne: Is this what you had in mind?

+  LayerTreeHostTestSetNextCommitForcesRedraw()
+      : num_draws_(0),
+        bounds_(50, 50),
+        root_layer_(ContentLayer::Create(&client_)) {
+  }
+
+  virtual void BeginTest() OVERRIDE {
+    root_layer_->SetIsDrawable(true);
+    root_layer_->SetBounds(bounds_);
+    layer_tree_host()->SetRootLayer(root_layer_);
+    layer_tree_host()->SetViewportSize(bounds_);
+    PostSetNeedsCommitToMainThread();
+  }
+
+  virtual bool PrepareToDrawOnThread(LayerTreeHostImpl* host_impl,
+                                     LayerTreeHostImpl::FrameData* frame_data,
+                                     bool result) OVERRIDE {
+    EXPECT_TRUE(result);
+
+    gfx::RectF root_damage_rect;
+    if (!frame_data->render_passes.empty())
+      root_damage_rect = frame_data->render_passes.back()->damage_rect;
+
+    if (num_draws_ == 0 || num_draws_ == 3)
+      // First and last draw should expect full frame damage
+      EXPECT_RECT_EQ(gfx::Rect(bounds_), root_damage_rect);
+    else
+      EXPECT_RECT_EQ(gfx::Rect(0, 0, 0, 0), root_damage_rect);
+
+    return result;
+  }
+
+  virtual void DrawLayersOnThread(LayerTreeHostImpl* host_impl) OVERRIDE {
+    switch (num_draws_) {
+      case 0:
+      case 1:
+        // Cycle through a couple of empty commits to ensure we're observing the

[enne (OOO), 2013/10/01 19:15:30]

Hrm.  I was hoping you could add a commit -> draw -> activate -> draw test to
verify that the damage was attached to the right frame and didn't just happen on
the first draw after a commit, but this change here just repeats the commit ->
activate -> draw flow.

You can insert such a draw by something like:

On num_draws_ == 2 in DrawLayers, keep posting what's already there and if
you're in impl-side painting mode BlockNotifyReadyToActivateForTesting(true). 
If you're not in impl-side painting mode, then just increment num_draws_ again
to skip this next case.

Override CommitCompleteOnThread and only when num_draws_ == 2, set some fake
damage rect that's non-full and set needs redraw.

On num_draws_ == 3 in DrawLayers, verify it's the fake damage rect and
BlockNotifyReadyToActivateForTesting(false).

This will let the tree activate and you'll get num_draws_ == 4 with a full
damage rect.

+        // right behavior
+        PostSetNeedsCommitToMainThread();
+        break;
+      case 2:
+        // Should force full frame damage on the next commit
+        PostSetNextCommitForcesRedrawToMainThread();
+        PostSetNeedsCommitToMainThread();
+        break;
+      default:
+        EndTest();
+        break;
+    }
+    num_draws_++;
+  }
+
+  virtual void AfterTest() OVERRIDE {
+    EXPECT_EQ(4, num_draws_);
+  }
+
+ private:
+  int num_draws_;
+  const gfx::Size bounds_;
+  FakeContentLayerClient client_;
+  scoped_refptr<ContentLayer> root_layer_;
+};
+
+SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestSetNextCommitForcesRedraw);
+
 // If the layerTreeHost says it can't draw, Then we should not try to draw.
 class LayerTreeHostTestCanDrawBlocksDrawing : public LayerTreeHostTest {
  public:
   LayerTreeHostTestCanDrawBlocksDrawing() : num_commits_(0), done_(false) {}
 
   virtual void BeginTest() OVERRIDE { PostSetNeedsCommitToMainThread(); }
 
   virtual void DrawLayersOnThread(LayerTreeHostImpl* impl) OVERRIDE {
     if (done_)
       return;
@@ skipping 4126 matching lines @@
 
  private:
   int num_commits_;
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestMemoryLimits);
 
 }  // namespace
 
 }  // namespace cc