cc: Force commit on the frame after a copy request

cc/trees/layer_tree_host_unittest_copyrequest.cc

 // Copyright 2013 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/layers/layer_iterator.h"
 #include "cc/output/copy_output_request.h"
 #include "cc/output/copy_output_result.h"
 #include "cc/test/fake_content_layer_client.h"
 #include "cc/test/fake_output_surface.h"
 #include "cc/test/fake_picture_layer.h"
@@ skipping 157 matching lines @@
   use_gl_renderer_ = false;
   RunTest(false, false);
 }
 
 TEST_F(LayerTreeHostCopyRequestTestMultipleRequests,
        SoftwareRenderer_RunMultiThread) {
   use_gl_renderer_ = false;
   RunTest(true, false);
 }
 
+class LayerTreeHostCopyRequestCompletionCausesCommit

[danakj, 2015/12/02 23:07:52]

can you leave a comment to the bug here too so it's obvious this test can go
away if we fix said bug, and test for something else instead?

+    : public LayerTreeHostCopyRequestTest {
+ protected:
+  void SetupTree() override {
+    root_ = FakePictureLayer::Create(layer_settings(), &client_);
+    root_->SetBounds(gfx::Size(20, 20));
+
+    layer_ = FakePictureLayer::Create(layer_settings(), &client_);
+    layer_->SetBounds(gfx::Size(15, 15));
+    root_->AddChild(layer_);
+
+    layer_tree_host()->SetRootLayer(root_);
+    LayerTreeHostCopyRequestTest::SetupTree();
+    client_.set_bounds(root_->bounds());
+  }
+
+  void BeginTest() override {
+    callback_count_ = 0;
+    PostSetNeedsCommitToMainThread();
+  }
+
+  void DidCommit() override {
+    int frame = layer_tree_host()->source_frame_number();
+    switch (frame) {
+      case 1:
+        layer_->RequestCopyOfOutput(CopyOutputRequest::CreateBitmapRequest(
+            base::Bind(&LayerTreeHostCopyRequestCompletionCausesCommit::
+                           CopyOutputCallback,
+                       base::Unretained(this))));
+        EXPECT_EQ(0, callback_count_);
+        break;
+      case 2:
+        // This commit was triggered by the copy request.
+        break;
+      case 3:
+        // This commit was triggered by the completion of the copy request.
+        EXPECT_EQ(1, callback_count_);
+        EndTest();
+        break;
+    }
+  }
+
+  void CopyOutputCallback(scoped_ptr<CopyOutputResult> result) {
+    EXPECT_FALSE(result->IsEmpty());
+    ++callback_count_;
+  }
+
+  void AfterTest() override {}
+
+  int callback_count_;
+  FakeContentLayerClient client_;
+  scoped_refptr<FakePictureLayer> root_;
+  scoped_refptr<FakePictureLayer> layer_;
+};
+
+SINGLE_AND_MULTI_THREAD_DIRECT_RENDERER_TEST_F(
+    LayerTreeHostCopyRequestCompletionCausesCommit);
+
 class LayerTreeHostCopyRequestTestLayerDestroyed
     : public LayerTreeHostCopyRequestTest {
  protected:
   void SetupTree() override {
     root_ = FakePictureLayer::Create(layer_settings(), &client_);
     root_->SetBounds(gfx::Size(20, 20));
 
     main_destroyed_ = FakePictureLayer::Create(layer_settings(), &client_);
     main_destroyed_->SetBounds(gfx::Size(15, 15));
     root_->AddChild(main_destroyed_);
@@ skipping 232 matching lines @@
     LayerImpl* parent = grand_parent->children()[0].get();
     LayerImpl* copy_layer = parent->children()[0].get();
 
     // |parent| owns a surface, but it was hidden and not part of the copy
     // request so it should not allocate any resource.
     EXPECT_FALSE(renderer->HasAllocatedResourcesForTesting(
         parent->render_surface()->GetRenderPassId()));
 
     // |copy_layer| should have been rendered to a texture since it was needed
     // for a copy request.
-    EXPECT_TRUE(renderer->HasAllocatedResourcesForTesting(
-        copy_layer->render_surface()->GetRenderPassId()));
+    if (did_draw_) {
+      // Ignore the extra frame that occurs due to copy completion.
+      EXPECT_FALSE(copy_layer->render_surface());
+    } else {
+      EXPECT_TRUE(renderer->HasAllocatedResourcesForTesting(
+          copy_layer->render_surface()->GetRenderPassId()));
+    }
 
     did_draw_ = true;
   }
 
   void AfterTest() override { EXPECT_TRUE(did_draw_); }
 
   FakeContentLayerClient client_;
   bool did_draw_;
   scoped_refptr<FakePictureLayer> root_;
   scoped_refptr<FakePictureLayer> grand_parent_layer_;
@@ skipping 745 matching lines @@
   int num_draws_;
   bool copy_happened_;
   bool draw_happened_;
 };
 
 SINGLE_AND_MULTI_THREAD_DIRECT_RENDERER_TEST_F(
     LayerTreeHostCopyRequestTestMultipleDrawsHiddenCopyRequest);
 
 }  // namespace
 }  // namespace cc