Replace CompositorFrameSinkSupport::WillDrawSurface With RepeatingCallback

cc/surfaces/surface_factory_unittest.cc

 // Copyright 2014 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/surfaces/surface_factory.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <utility>
@@ skipping 96 matching lines @@
                                           size_t num_resource_ids) {
     CompositorFrame frame;
     for (size_t i = 0u; i < num_resource_ids; ++i) {
       TransferableResource resource;
       resource.id = resource_ids[i];
       resource.mailbox_holder.texture_target = GL_TEXTURE_2D;
       resource.mailbox_holder.sync_token = frame_sync_token_;
       frame.resource_list.push_back(resource);
     }
     factory_->SubmitCompositorFrame(local_surface_id_, std::move(frame),
-                                    SurfaceFactory::DrawCallback());
+                                    SurfaceFactory::DrawCallback(),
+                                    SurfaceFactory::WillDrawCallback());
     EXPECT_EQ(last_created_surface_id_.local_surface_id(), local_surface_id_);
   }
 
   void UnrefResources(ResourceId* ids_to_unref,
                       int* counts_to_unref,
                       size_t num_ids_to_unref) {
     ReturnedResourceArray unref_array;
     for (size_t i = 0; i < num_ids_to_unref; ++i) {
       ReturnedResource resource;
       resource.sync_token = consumer_sync_token_;
@@ skipping 330 matching lines @@
     CheckReturnedResourcesMatchExpected(
         expected_returned_ids, expected_returned_counts,
         arraysize(expected_returned_counts), consumer_sync_token_);
   }
 }
 
 TEST_F(SurfaceFactoryTest, BlankNoIndexIncrement) {
   LocalSurfaceId local_surface_id(6, kArbitraryToken);
   SurfaceId surface_id(kArbitraryFrameSinkId, local_surface_id);
   factory_->SubmitCompositorFrame(local_surface_id, CompositorFrame(),
-                                  SurfaceFactory::DrawCallback());
+                                  SurfaceFactory::DrawCallback(),
+                                  SurfaceFactory::WillDrawCallback());
   Surface* surface = manager_.GetSurfaceForId(surface_id);
   ASSERT_NE(nullptr, surface);
   EXPECT_EQ(2, surface->frame_index());
   EXPECT_EQ(last_created_surface_id().local_surface_id(), local_surface_id);
 }
 
 void CreateSurfaceDrawCallback(SurfaceFactory* factory,
                                uint32_t* execute_count) {
   LocalSurfaceId new_id(7, base::UnguessableToken::Create());
   factory->SubmitCompositorFrame(new_id, CompositorFrame(),
-                                 SurfaceFactory::DrawCallback());
+                                 SurfaceFactory::DrawCallback(),
+                                 SurfaceFactory::WillDrawCallback());
   factory->EvictSurface();
   *execute_count += 1;
 }
 
 TEST_F(SurfaceFactoryTest, AddDuringEviction) {
   LocalSurfaceId local_surface_id(6, kArbitraryToken);
 
   uint32_t execute_count = 0;
   factory_->SubmitCompositorFrame(
       local_surface_id, CompositorFrame(),
       base::Bind(&CreateSurfaceDrawCallback, base::Unretained(factory_.get()),
-                 &execute_count));
+                 &execute_count),
+      SurfaceFactory::WillDrawCallback());
   EXPECT_EQ(0u, execute_count);
   factory_->EvictSurface();
   EXPECT_EQ(1u, execute_count);
 }
 
 void DrawCallback(uint32_t* execute_count) {
   *execute_count += 1;
 }
 
 // Tests doing an EvictSurface before shutting down the factory.
 TEST_F(SurfaceFactoryTest, EvictSurface) {
   LocalSurfaceId local_surface_id(7, kArbitraryToken);
   SurfaceId id(kArbitraryFrameSinkId, local_surface_id);
 
   TransferableResource resource;
   resource.id = 1;
   resource.mailbox_holder.texture_target = GL_TEXTURE_2D;
   CompositorFrame frame;
   frame.resource_list.push_back(resource);
   uint32_t execute_count = 0;
   factory_->SubmitCompositorFrame(local_surface_id, std::move(frame),
-                                  base::Bind(&DrawCallback, &execute_count));
+                                  base::Bind(&DrawCallback, &execute_count),
+                                  SurfaceFactory::WillDrawCallback());
   EXPECT_EQ(last_created_surface_id().local_surface_id(), local_surface_id);
   local_surface_id_ = LocalSurfaceId();
 
   EXPECT_TRUE(manager_.GetSurfaceForId(id));
   EXPECT_TRUE(client_.returned_resources().empty());
   factory_->EvictSurface();
   EXPECT_FALSE(manager_.GetSurfaceForId(id));
   EXPECT_FALSE(client_.returned_resources().empty());
   EXPECT_EQ(1u, execute_count);
 }
 
 // Tests doing an EvictSurface which has unregistered dependency.
 TEST_F(SurfaceFactoryTest, EvictSurfaceDependencyUnRegistered) {
   LocalSurfaceId local_surface_id(7, kArbitraryToken);
 
   TransferableResource resource;
   resource.id = 1;
   resource.mailbox_holder.texture_target = GL_TEXTURE_2D;
   CompositorFrame frame;
   frame.resource_list.push_back(resource);
   uint32_t execute_count = 0;
   factory_->SubmitCompositorFrame(local_surface_id, std::move(frame),
-                                  base::Bind(&DrawCallback, &execute_count));
+                                  base::Bind(&DrawCallback, &execute_count),
+                                  SurfaceFactory::WillDrawCallback());
   EXPECT_EQ(last_created_surface_id().local_surface_id(), local_surface_id);
   local_surface_id_ = LocalSurfaceId();
 
   SurfaceId surface_id(kArbitraryFrameSinkId, local_surface_id);
   Surface* surface = manager_.GetSurfaceForId(surface_id);
   surface->AddDestructionDependency(
       SurfaceSequence(kAnotherArbitraryFrameSinkId, 4));
 
   EXPECT_TRUE(manager_.GetSurfaceForId(surface_id));
   EXPECT_TRUE(client_.returned_resources().empty());
   factory_->EvictSurface();
   EXPECT_FALSE(manager_.GetSurfaceForId(surface_id));
   EXPECT_FALSE(client_.returned_resources().empty());
   EXPECT_EQ(1u, execute_count);
 }
 
 // Tests doing an EvictSurface which has registered dependency.
 TEST_F(SurfaceFactoryTest, EvictSurfaceDependencyRegistered) {
   LocalSurfaceId local_surface_id(7, kArbitraryToken);
 
   TransferableResource resource;
   resource.id = 1;
   resource.mailbox_holder.texture_target = GL_TEXTURE_2D;
   CompositorFrame frame;
   frame.resource_list.push_back(resource);
   uint32_t execute_count = 0;
   factory_->SubmitCompositorFrame(local_surface_id, std::move(frame),
-                                  base::Bind(&DrawCallback, &execute_count));
+                                  base::Bind(&DrawCallback, &execute_count),
+                                  SurfaceFactory::WillDrawCallback());
   EXPECT_EQ(last_created_surface_id().local_surface_id(), local_surface_id);
   local_surface_id_ = LocalSurfaceId();
 
   manager_.RegisterFrameSinkId(kAnotherArbitraryFrameSinkId);
 
   SurfaceId surface_id(kArbitraryFrameSinkId, local_surface_id);
   Surface* surface = manager_.GetSurfaceForId(surface_id);
   surface->AddDestructionDependency(
       SurfaceSequence(kAnotherArbitraryFrameSinkId, 4));
 
   EXPECT_TRUE(manager_.GetSurfaceForId(surface_id));
   EXPECT_TRUE(client_.returned_resources().empty());
   factory_->EvictSurface();
   EXPECT_TRUE(manager_.GetSurfaceForId(surface_id));
   EXPECT_TRUE(client_.returned_resources().empty());
   EXPECT_EQ(0u, execute_count);
 
   manager_.SatisfySequence(SurfaceSequence(kAnotherArbitraryFrameSinkId, 4));
   EXPECT_FALSE(manager_.GetSurfaceForId(surface_id));
   EXPECT_FALSE(client_.returned_resources().empty());
 }
 
 TEST_F(SurfaceFactoryTest, DestroySequence) {
   LocalSurfaceId local_surface_id2(5, kArbitraryToken);
   std::unique_ptr<SurfaceFactory> factory2(
       new SurfaceFactory(kArbitraryFrameSinkId, &manager_, &client_));
   SurfaceId id2(kArbitraryFrameSinkId, local_surface_id2);
   factory2->SubmitCompositorFrame(local_surface_id2, CompositorFrame(),
-                                  SurfaceFactory::DrawCallback());
+                                  SurfaceFactory::DrawCallback(),
+                                  SurfaceFactory::WillDrawCallback());
 
   manager_.RegisterFrameSinkId(kArbitraryFrameSinkId);
 
   // Check that waiting before the sequence is satisfied works.
   manager_.GetSurfaceForId(id2)->AddDestructionDependency(
       SurfaceSequence(kArbitraryFrameSinkId, 4));
   factory2->EvictSurface();
 
   DCHECK(manager_.GetSurfaceForId(id2));
   manager_.SatisfySequence(SurfaceSequence(kArbitraryFrameSinkId, 4));
   manager_.SatisfySequence(SurfaceSequence(kArbitraryFrameSinkId, 6));
   DCHECK(!manager_.GetSurfaceForId(id2));
 
   // Check that waiting after the sequence is satisfied works.
   factory2->SubmitCompositorFrame(local_surface_id2, CompositorFrame(),
-                                  SurfaceFactory::DrawCallback());
+                                  SurfaceFactory::DrawCallback(),
+                                  SurfaceFactory::WillDrawCallback());
   DCHECK(manager_.GetSurfaceForId(id2));
   manager_.GetSurfaceForId(id2)->AddDestructionDependency(
       SurfaceSequence(kAnotherArbitraryFrameSinkId, 6));
   factory2->EvictSurface();
   DCHECK(!manager_.GetSurfaceForId(id2));
 }
 
 // Tests that Surface ID namespace invalidation correctly allows
 // Sequences to be ignored.
 TEST_F(SurfaceFactoryTest, InvalidFrameSinkId) {
   FrameSinkId frame_sink_id(1234, 5678);
 
   LocalSurfaceId local_surface_id(5, kArbitraryToken);
   SurfaceId id(factory_->frame_sink_id(), local_surface_id);
   factory_->SubmitCompositorFrame(local_surface_id, CompositorFrame(),
-                                  SurfaceFactory::DrawCallback());
+                                  SurfaceFactory::DrawCallback(),
+                                  SurfaceFactory::WillDrawCallback());
 
   manager_.RegisterFrameSinkId(frame_sink_id);
   manager_.GetSurfaceForId(id)->AddDestructionDependency(
       SurfaceSequence(frame_sink_id, 4));
 
   factory_->EvictSurface();
 
   // Verify the dependency has prevented the surface from getting destroyed.
   EXPECT_TRUE(manager_.GetSurfaceForId(id));
 
@@ skipping 11 matching lines @@
       new SurfaceFactory(kArbitraryFrameSinkId, &manager_, &client_));
   manager_.RegisterFrameSinkId(kAnotherArbitraryFrameSinkId);
   // Give id2 a frame that references local_surface_id_.
   {
     std::unique_ptr<RenderPass> render_pass(RenderPass::Create());
     CompositorFrame frame;
     frame.render_pass_list.push_back(std::move(render_pass));
     frame.metadata.referenced_surfaces.push_back(
         SurfaceId(factory_->frame_sink_id(), local_surface_id_));
     factory2->SubmitCompositorFrame(local_surface_id2, std::move(frame),
-                                    SurfaceFactory::DrawCallback());
+                                    SurfaceFactory::DrawCallback(),
+                                    SurfaceFactory::WillDrawCallback());
     EXPECT_EQ(last_created_surface_id().local_surface_id(), local_surface_id2);
   }
   manager_.GetSurfaceForId(id2)->AddDestructionDependency(
       SurfaceSequence(kAnotherArbitraryFrameSinkId, 4));
   factory2->EvictSurface();
   // Give local_surface_id_ a frame that references id2.
   {
     std::unique_ptr<RenderPass> render_pass(RenderPass::Create());
     CompositorFrame frame;
     frame.render_pass_list.push_back(std::move(render_pass));
     frame.metadata.referenced_surfaces.push_back(id2);
     factory_->SubmitCompositorFrame(local_surface_id_, std::move(frame),
-                                    SurfaceFactory::DrawCallback());
+                                    SurfaceFactory::DrawCallback(),
+                                    SurfaceFactory::WillDrawCallback());
   }
   factory_->EvictSurface();
   EXPECT_TRUE(manager_.GetSurfaceForId(id2));
   // local_surface_id_ should be retained by reference from id2.
   EXPECT_TRUE(manager_.GetSurfaceForId(
       SurfaceId(factory_->frame_sink_id(), local_surface_id_)));
 
   // Satisfy last destruction dependency for id2.
   manager_.SatisfySequence(SurfaceSequence(kAnotherArbitraryFrameSinkId, 4));
 
@@ skipping 12 matching lines @@
 }
 
 TEST_F(SurfaceFactoryTest, DuplicateCopyRequest) {
   {
     std::unique_ptr<RenderPass> render_pass(RenderPass::Create());
     CompositorFrame frame;
     frame.render_pass_list.push_back(std::move(render_pass));
     frame.metadata.referenced_surfaces.push_back(
         SurfaceId(factory_->frame_sink_id(), local_surface_id_));
     factory_->SubmitCompositorFrame(local_surface_id_, std::move(frame),
-                                    SurfaceFactory::DrawCallback());
+                                    SurfaceFactory::DrawCallback(),
+                                    SurfaceFactory::WillDrawCallback());
     EXPECT_EQ(last_created_surface_id().local_surface_id(), local_surface_id_);
   }
 
   bool called1 = false;
   std::unique_ptr<CopyOutputRequest> request;
   request = CopyOutputRequest::CreateRequest(
       base::Bind(&CopyRequestTestCallback, &called1));
   request->set_source(kArbitrarySourceId1);
 
   factory_->RequestCopyOfSurface(std::move(request));
@@ skipping 36 matching lines @@
   render_pass->SetNew(1, gfx::Rect(5, 6), gfx::Rect(), gfx::Transform());
   frame.render_pass_list.push_back(std::move(render_pass));
 
   render_pass = RenderPass::Create();
   render_pass->SetNew(2, gfx::Rect(7, 8), gfx::Rect(), gfx::Transform());
   frame.render_pass_list.push_back(std::move(render_pass));
 
   frame.metadata.device_scale_factor = 2.5f;
 
   factory_->SubmitCompositorFrame(local_surface_id_, std::move(frame),
-                                  SurfaceFactory::DrawCallback());
+                                  SurfaceFactory::DrawCallback(),
+                                  SurfaceFactory::WillDrawCallback());
   SurfaceId expected_surface_id(factory_->frame_sink_id(), local_surface_id_);
   EXPECT_EQ(expected_surface_id, last_surface_info_.id());
   EXPECT_EQ(2.5f, last_surface_info_.device_scale_factor());
   EXPECT_EQ(gfx::Size(7, 8), last_surface_info_.size_in_pixels());
 }
 
 }  // namespace
 }  // namespace cc