Revert of Remove SurfaceFactory::Create and SurfaceFactory::Destroy

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 57 matching lines @@
 
 class SurfaceFactoryTest : public testing::Test, public SurfaceObserver {
  public:
   SurfaceFactoryTest()
       : factory_(
             new SurfaceFactory(kArbitraryFrameSinkId, &manager_, &client_)),
         local_frame_id_(3, kArbitraryToken),
         frame_sync_token_(GenTestSyncToken(4)),
         consumer_sync_token_(GenTestSyncToken(5)) {
     manager_.AddObserver(this);
+    factory_->Create(local_frame_id_);
   }
 
   const SurfaceId& last_created_surface_id() const {
     return last_created_surface_id_;
   }
 
   // SurfaceObserver implementation.
   void OnSurfaceCreated(const SurfaceId& surface_id,
                         const gfx::Size& frame,
                         float device_scale_factor) override {
     EXPECT_EQ(kArbitraryFrameSinkId, surface_id.frame_sink_id());
     last_created_surface_id_ = surface_id;
   }
 
   void OnSurfaceDamaged(const SurfaceId& id, bool* changed) override {
     *changed = true;
   }
 
   ~SurfaceFactoryTest() override {
+    if (local_frame_id_.is_valid())
+      factory_->Destroy(local_frame_id_);
     manager_.RemoveObserver(this);
-    factory_->EvictSurface();
   }
 
   void SubmitCompositorFrameWithResources(ResourceId* resource_ids,
                                           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_;
@@ skipping 319 matching lines @@
     int expected_returned_counts[] = {2, 2};
     CheckReturnedResourcesMatchExpected(
         expected_returned_ids, expected_returned_counts,
         arraysize(expected_returned_counts), consumer_sync_token_);
   }
 }
 
 TEST_F(SurfaceFactoryTest, BlankNoIndexIncrement) {
   LocalFrameId local_frame_id(6, kArbitraryToken);
   SurfaceId surface_id(kArbitraryFrameSinkId, local_frame_id);
-  factory_->SubmitCompositorFrame(local_frame_id, CompositorFrame(),
-                                  SurfaceFactory::DrawCallback());
+  factory_->Create(local_frame_id);
   Surface* surface = manager_.GetSurfaceForId(surface_id);
   ASSERT_NE(nullptr, surface);
   EXPECT_EQ(2, surface->frame_index());
+
+  factory_->SubmitCompositorFrame(local_frame_id, CompositorFrame(),
+                                  SurfaceFactory::DrawCallback());
+  EXPECT_EQ(2, surface->frame_index());
   EXPECT_EQ(last_created_surface_id().local_frame_id(), local_frame_id);
+  factory_->Destroy(local_frame_id);
 }
 
 void CreateSurfaceDrawCallback(SurfaceFactory* factory,
                                uint32_t* execute_count) {
   LocalFrameId new_id(7, base::UnguessableToken::Create());
-  factory->SubmitCompositorFrame(new_id, CompositorFrame(),
-                                 SurfaceFactory::DrawCallback());
-  factory->EvictSurface();
+  factory->Create(new_id);
+  factory->Destroy(new_id);
   *execute_count += 1;
 }
 
-TEST_F(SurfaceFactoryTest, AddDuringEviction) {
+TEST_F(SurfaceFactoryTest, AddDuringDestroy) {
   LocalFrameId local_frame_id(6, kArbitraryToken);
+  factory_->Create(local_frame_id);
 
   uint32_t execute_count = 0;
   factory_->SubmitCompositorFrame(
       local_frame_id, CompositorFrame(),
       base::Bind(&CreateSurfaceDrawCallback, base::Unretained(factory_.get()),
                  &execute_count));
   EXPECT_EQ(0u, execute_count);
-  factory_->EvictSurface();
+  factory_->Destroy(local_frame_id);
   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) {
+// Tests doing a DestroyAll before shutting down the factory;
+TEST_F(SurfaceFactoryTest, DestroyAll) {
   LocalFrameId id(7, kArbitraryToken);
+  factory_->Create(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(id, std::move(frame),
                                   base::Bind(&DrawCallback, &execute_count));
   EXPECT_EQ(last_created_surface_id().local_frame_id(), id);
   local_frame_id_ = LocalFrameId();
-  factory_->EvictSurface();
+  factory_->DestroyAll();
   EXPECT_EQ(1u, execute_count);
 }
 
 // Tests that SurfaceFactory doesn't return resources after Reset().
 TEST_F(SurfaceFactoryTest, Reset) {
   LocalFrameId id(7, kArbitraryToken);
+  factory_->Create(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(id, std::move(frame),
-                                  SurfaceFactory::DrawCallback());
+                                  base::Bind(&DrawCallback, &execute_count));
   EXPECT_EQ(last_created_surface_id().local_frame_id(), id);
 
   SurfaceId surface_id(kArbitraryFrameSinkId, id);
   manager_.AddSurfaceReference(manager_.GetRootSurfaceId(), surface_id);
   factory_->Reset();
   EXPECT_TRUE(client_.returned_resources().empty());
   manager_.RemoveSurfaceReference(manager_.GetRootSurfaceId(), surface_id);
   EXPECT_TRUE(client_.returned_resources().empty());
   local_frame_id_ = LocalFrameId();
 }
 
 TEST_F(SurfaceFactoryTest, DestroySequence) {
   LocalFrameId local_frame_id2(5, kArbitraryToken);
-  std::unique_ptr<SurfaceFactory> factory2(
-      new SurfaceFactory(kArbitraryFrameSinkId, &manager_, &client_));
   SurfaceId id2(kArbitraryFrameSinkId, local_frame_id2);
-  factory2->SubmitCompositorFrame(local_frame_id2, CompositorFrame(),
-                                  SurfaceFactory::DrawCallback());
+  factory_->Create(local_frame_id2);
 
   manager_.RegisterFrameSinkId(kArbitraryFrameSinkId);
 
   // Check that waiting before the sequence is satisfied works.
   manager_.GetSurfaceForId(id2)->AddDestructionDependency(
       SurfaceSequence(kArbitraryFrameSinkId, 4));
-  factory2->EvictSurface();
+  factory_->Destroy(local_frame_id2);
 
   CompositorFrame frame;
   frame.metadata.satisfies_sequences.push_back(6);
   frame.metadata.satisfies_sequences.push_back(4);
   DCHECK(manager_.GetSurfaceForId(id2));
   factory_->SubmitCompositorFrame(local_frame_id_, std::move(frame),
                                   SurfaceFactory::DrawCallback());
+  EXPECT_EQ(last_created_surface_id().local_frame_id(), local_frame_id_);
   DCHECK(!manager_.GetSurfaceForId(id2));
 
   // Check that waiting after the sequence is satisfied works.
-  factory2->SubmitCompositorFrame(local_frame_id2, CompositorFrame(),
-                                  SurfaceFactory::DrawCallback());
+  factory_->Create(local_frame_id2);
   DCHECK(manager_.GetSurfaceForId(id2));
   manager_.GetSurfaceForId(id2)->AddDestructionDependency(
       SurfaceSequence(kAnotherArbitraryFrameSinkId, 6));
-  factory2->EvictSurface();
+  factory_->Destroy(local_frame_id2);
   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);
 
   LocalFrameId local_frame_id(5, kArbitraryToken);
   SurfaceId id(factory_->frame_sink_id(), local_frame_id);
-  factory_->SubmitCompositorFrame(local_frame_id, CompositorFrame(),
-                                  SurfaceFactory::DrawCallback());
+  factory_->Create(local_frame_id);
 
   manager_.RegisterFrameSinkId(frame_sink_id);
   manager_.GetSurfaceForId(id)->AddDestructionDependency(
       SurfaceSequence(frame_sink_id, 4));
-
-  factory_->EvictSurface();
+  factory_->Destroy(local_frame_id);
 
   // Verify the dependency has prevented the surface from getting destroyed.
   EXPECT_TRUE(manager_.GetSurfaceForId(id));
 
   manager_.InvalidateFrameSinkId(frame_sink_id);
 
   // Verify that the invalidated namespace caused the unsatisfied sequence
   // to be ignored.
   EXPECT_FALSE(manager_.GetSurfaceForId(id));
 }
 
 TEST_F(SurfaceFactoryTest, DestroyCycle) {
   LocalFrameId local_frame_id2(5, kArbitraryToken);
   SurfaceId id2(kArbitraryFrameSinkId, local_frame_id2);
-  std::unique_ptr<SurfaceFactory> factory2(
-      new SurfaceFactory(kArbitraryFrameSinkId, &manager_, &client_));
+  factory_->Create(local_frame_id2);
+
   manager_.RegisterFrameSinkId(kAnotherArbitraryFrameSinkId);
+
+  manager_.GetSurfaceForId(id2)->AddDestructionDependency(
+      SurfaceSequence(kAnotherArbitraryFrameSinkId, 4));
+
   // Give id2 a frame that references local_frame_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_frame_id_));
-    factory2->SubmitCompositorFrame(local_frame_id2, std::move(frame),
+    factory_->SubmitCompositorFrame(local_frame_id2, std::move(frame),
                                     SurfaceFactory::DrawCallback());
     EXPECT_EQ(last_created_surface_id().local_frame_id(), local_frame_id2);
   }
-  manager_.GetSurfaceForId(id2)->AddDestructionDependency(
-      SurfaceSequence(kAnotherArbitraryFrameSinkId, 4));
-  factory2->EvictSurface();
+  factory_->Destroy(local_frame_id2);
+
   // Give local_frame_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_frame_id_, std::move(frame),
                                     SurfaceFactory::DrawCallback());
+    EXPECT_EQ(last_created_surface_id().local_frame_id(), local_frame_id_);
   }
-  factory_->EvictSurface();
+  factory_->Destroy(local_frame_id_);
   EXPECT_TRUE(manager_.GetSurfaceForId(id2));
   // local_frame_id_ should be retained by reference from id2.
   EXPECT_TRUE(manager_.GetSurfaceForId(
       SurfaceId(factory_->frame_sink_id(), local_frame_id_)));
 
   // Satisfy last destruction dependency for id2.
   std::vector<uint32_t> to_satisfy;
   to_satisfy.push_back(4);
   manager_.DidSatisfySequences(kAnotherArbitraryFrameSinkId, &to_satisfy);
 
@@ skipping 24 matching lines @@
   }
   void* source1 = &source1;
   void* source2 = &source2;
 
   bool called1 = false;
   std::unique_ptr<CopyOutputRequest> request;
   request = CopyOutputRequest::CreateRequest(
       base::Bind(&CopyRequestTestCallback, &called1));
   request->set_source(source1);
 
-  factory_->RequestCopyOfSurface(std::move(request));
+  factory_->RequestCopyOfSurface(local_frame_id_, std::move(request));
   EXPECT_FALSE(called1);
 
   bool called2 = false;
   request = CopyOutputRequest::CreateRequest(
       base::Bind(&CopyRequestTestCallback, &called2));
   request->set_source(source2);
 
-  factory_->RequestCopyOfSurface(std::move(request));
+  factory_->RequestCopyOfSurface(local_frame_id_, std::move(request));
   // Callbacks have different sources so neither should be called.
   EXPECT_FALSE(called1);
   EXPECT_FALSE(called2);
 
   bool called3 = false;
   request = CopyOutputRequest::CreateRequest(
       base::Bind(&CopyRequestTestCallback, &called3));
   request->set_source(source1);
 
-  factory_->RequestCopyOfSurface(std::move(request));
+  factory_->RequestCopyOfSurface(local_frame_id_, std::move(request));
   // Two callbacks are from source1, so the first should be called.
   EXPECT_TRUE(called1);
   EXPECT_FALSE(called2);
   EXPECT_FALSE(called3);
 
-  factory_->EvictSurface();
+  factory_->Destroy(local_frame_id_);
   local_frame_id_ = LocalFrameId();
   EXPECT_TRUE(called1);
   EXPECT_TRUE(called2);
   EXPECT_TRUE(called3);
 }
 
 }  // namespace
 }  // namespace cc