Remove SurfaceReferenceManager interface.

cc/surfaces/surface_manager_ref_unittest.cc

 // Copyright 2016 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 <stddef.h>
 
 #include <unordered_map>
 #include <vector>
 
 #include "base/memory/ptr_util.h"
@@ skipping 40 matching lines @@
         .SubmitCompositorFrame(local_frame_id, CompositorFrame(),
                                SurfaceFactory::DrawCallback());
     return SurfaceId(frame_sink_id, local_frame_id);
   }
 
   // Destroy Surface with |surface_id|.
   void DestroySurface(const SurfaceId& surface_id) {
     GetFactory(surface_id.frame_sink_id()).EvictSurface();
   }
 
- protected:
   SurfaceFactory& GetFactory(const FrameSinkId& frame_sink_id) {
     auto& factory_ptr = factories_[frame_sink_id];
     if (!factory_ptr)
       factory_ptr = base::MakeUnique<SurfaceFactory>(frame_sink_id,
                                                      manager_.get(), &client_);
     return *factory_ptr;
   }
 
-  // testing::Test:
-  void SetUp() override {
-    // Start each test with a fresh SurfaceManager instance.
-    manager_ = base::MakeUnique<SurfaceManager>(
-        SurfaceManager::LifetimeType::REFERENCES);
-  }
-  void TearDown() override {
-    for (auto& factory : factories_)
-      factory.second->EvictSurface();
-    factories_.clear();
-    manager_.reset();
+  void RemoveSurfaceReference(const SurfaceId& parent_id,
+                              const SurfaceId& child_id) {
+    manager_->RemoveSurfaceReferences({SurfaceReference(parent_id, child_id)});
   }
 
   // Returns all the references where |surface_id| is the parent.
   const SurfaceManager::SurfaceIdSet& GetReferencesFrom(
       const SurfaceId& surface_id) {
     return manager().parent_to_child_refs_[surface_id];
   }
 
   // Returns all the references where |surface_id| is the child.
   const SurfaceManager::SurfaceIdSet& GetReferencesFor(
@@ skipping 15 matching lines @@
   // converts the map to a vector.
   std::vector<SurfaceId> GetAllTempReferences() {
     std::vector<SurfaceId> temp_references;
     for (auto& map_entry : manager().temp_references_) {
       for (auto local_frame_id : map_entry.second)
         temp_references.push_back(SurfaceId(map_entry.first, local_frame_id));
     }
     return temp_references;
   }
 
+ protected:
+  // testing::Test:
+  void SetUp() override {
+    // Start each test with a fresh SurfaceManager instance.
+    manager_ = base::MakeUnique<SurfaceManager>(
+        SurfaceManager::LifetimeType::REFERENCES);
+  }
+  void TearDown() override {
+    for (auto& factory : factories_)
+      factory.second->EvictSurface();
+    factories_.clear();
+    manager_.reset();
+  }
+
   std::unordered_map<FrameSinkId,
                      std::unique_ptr<SurfaceFactory>,
                      FrameSinkIdHash>
       factories_;
   std::unique_ptr<SurfaceManager> manager_;
   StubSurfaceFactoryClient client_;
 };
 
 TEST_F(SurfaceManagerRefTest, AddReference) {
   SurfaceId id1 = CreateSurface(kFrameSink1, 1);
   manager().AddSurfaceReference(manager().GetRootSurfaceId(), id1);
 
   EXPECT_THAT(GetReferencesFor(id1),
               UnorderedElementsAre(manager().GetRootSurfaceId()));
   EXPECT_THAT(GetReferencesFrom(id1), IsEmpty());
 }
 
 TEST_F(SurfaceManagerRefTest, AddRemoveReference) {
   SurfaceId id1 = CreateSurface(kFrameSink1, 1);
   SurfaceId id2 = CreateSurface(kFrameSink2, 1);
   manager().AddSurfaceReference(manager().GetRootSurfaceId(), id1);
   manager().AddSurfaceReference(id1, id2);
 
   EXPECT_THAT(GetReferencesFor(id1),
               UnorderedElementsAre(manager().GetRootSurfaceId()));
   EXPECT_THAT(GetReferencesFor(id2), UnorderedElementsAre(id1));
   EXPECT_THAT(GetReferencesFrom(id1), UnorderedElementsAre(id2));
   EXPECT_THAT(GetReferencesFrom(id2), IsEmpty());
 
-  manager().RemoveSurfaceReference(id1, id2);
+  RemoveSurfaceReference(id1, id2);
   EXPECT_THAT(GetReferencesFor(id1), SizeIs(1));
   EXPECT_THAT(GetReferencesFor(id2), IsEmpty());
   EXPECT_THAT(GetReferencesFrom(id1), IsEmpty());
   EXPECT_THAT(GetReferencesFrom(id2), IsEmpty());
 }
 
 TEST_F(SurfaceManagerRefTest, NewSurfaceFromFrameSink) {
   SurfaceId id1 = CreateSurface(kFrameSink1, 1);
   SurfaceId id2 = CreateSurface(kFrameSink2, 1);
   SurfaceId id3 = CreateSurface(kFrameSink3, 1);
 
   manager().AddSurfaceReference(manager().GetRootSurfaceId(), id1);
   manager().AddSurfaceReference(id1, id2);
   manager().AddSurfaceReference(id2, id3);
 
   // |kFramesink2| received a CompositorFrame with a new size, so it destroys
   // |id2| and creates |id2_next|. No reference have been removed yet.
   SurfaceId id2_next = CreateSurface(kFrameSink2, 2);
   EXPECT_NE(nullptr, manager().GetSurfaceForId(id2));
   EXPECT_NE(nullptr, manager().GetSurfaceForId(id2_next));
 
   // Add references to and from |id2_next|.
   manager().AddSurfaceReference(id1, id2_next);
   manager().AddSurfaceReference(id2_next, id3);
   EXPECT_THAT(GetReferencesFor(id2), UnorderedElementsAre(id1));
   EXPECT_THAT(GetReferencesFor(id2_next), UnorderedElementsAre(id1));
   EXPECT_THAT(GetReferencesFor(id3), UnorderedElementsAre(id2, id2_next));
 
-  manager().RemoveSurfaceReference(id1, id2);
+  RemoveSurfaceReference(id1, id2);
   EXPECT_THAT(GetReferencesFor(id2), IsEmpty());
   EXPECT_THAT(GetReferencesFor(id2_next), UnorderedElementsAre(id1));
   EXPECT_THAT(GetReferencesFor(id3), UnorderedElementsAre(id2_next));
 
   // |id2| should be deleted during GC but other surfaces shouldn't.
   EXPECT_EQ(nullptr, manager().GetSurfaceForId(id2));
   EXPECT_NE(nullptr, manager().GetSurfaceForId(id2_next));
   EXPECT_NE(nullptr, manager().GetSurfaceForId(id3));
 }
 
 TEST_F(SurfaceManagerRefTest, ReferenceCycleGetsDeleted) {
   SurfaceId id1 = CreateSurface(kFrameSink1, 1);
   SurfaceId id2 = CreateSurface(kFrameSink2, 1);
   SurfaceId id3 = CreateSurface(kFrameSink3, 1);
 
   manager().AddSurfaceReference(manager().GetRootSurfaceId(), id1);
   manager().AddSurfaceReference(id1, id2);
   manager().AddSurfaceReference(id2, id3);
 
   // This reference forms a cycle between id2 and id3.
   manager().AddSurfaceReference(id3, id2);
 
   DestroySurface(id3);
   DestroySurface(id2);
   DestroySurface(id1);
 
-  manager().RemoveSurfaceReference(manager().GetRootSurfaceId(), id1);
+  RemoveSurfaceReference(manager().GetRootSurfaceId(), id1);
 
   // Removing the reference from the root to id1 should allow all three surfaces
   // to be deleted during GC even with a cycle between 2 and 3.
   EXPECT_EQ(nullptr, manager().GetSurfaceForId(id1));
   EXPECT_EQ(nullptr, manager().GetSurfaceForId(id2));
   EXPECT_EQ(nullptr, manager().GetSurfaceForId(id3));
 }
 
 TEST_F(SurfaceManagerRefTest, CheckGC) {
   SurfaceId id1 = CreateSurface(kFrameSink1, 1);
   SurfaceId id2 = CreateSurface(kFrameSink2, 1);
 
   manager().AddSurfaceReference(manager().GetRootSurfaceId(), id1);
   manager().AddSurfaceReference(id1, id2);
 
   EXPECT_NE(nullptr, manager().GetSurfaceForId(id1));
   EXPECT_NE(nullptr, manager().GetSurfaceForId(id2));
 
   // Destroying the surfaces shouldn't delete them yet, since there is still an
   // active reference on all surfaces.
   DestroySurface(id1);
   DestroySurface(id2);
   EXPECT_NE(nullptr, manager().GetSurfaceForId(id1));
   EXPECT_NE(nullptr, manager().GetSurfaceForId(id2));
 
   // Should delete |id2| when the only reference to it is removed.
-  manager().RemoveSurfaceReference(id1, id2);
+  RemoveSurfaceReference(id1, id2);
   EXPECT_EQ(nullptr, manager().GetSurfaceForId(id2));
 
   // Should delete |id1| when the only reference to it is removed.
-  manager().RemoveSurfaceReference(manager().GetRootSurfaceId(), id1);
+  RemoveSurfaceReference(manager().GetRootSurfaceId(), id1);
   EXPECT_EQ(nullptr, manager().GetSurfaceForId(id1));
 }
 
 TEST_F(SurfaceManagerRefTest, CheckGCRecusiveFull) {
   SurfaceId id1 = CreateSurface(kFrameSink1, 1);
   SurfaceId id2 = CreateSurface(kFrameSink2, 1);
   SurfaceId id3 = CreateSurface(kFrameSink3, 1);
 
   manager().AddSurfaceReference(manager().GetRootSurfaceId(), id1);
   manager().AddSurfaceReference(id1, id2);
   manager().AddSurfaceReference(id2, id3);
 
   DestroySurface(id3);
   DestroySurface(id2);
   DestroySurface(id1);
 
   // Destroying the surfaces shouldn't delete them yet, since there is still an
   // active reference on all surfaces.
   EXPECT_NE(nullptr, manager().GetSurfaceForId(id3));
   EXPECT_NE(nullptr, manager().GetSurfaceForId(id2));
   EXPECT_NE(nullptr, manager().GetSurfaceForId(id1));
 
-  manager().RemoveSurfaceReference(manager().GetRootSurfaceId(), id1);
+  RemoveSurfaceReference(manager().GetRootSurfaceId(), id1);
 
   // Removing the reference from the root to id1 should allow all three surfaces
   // to be deleted during GC.
   EXPECT_EQ(nullptr, manager().GetSurfaceForId(id1));
   EXPECT_EQ(nullptr, manager().GetSurfaceForId(id2));
   EXPECT_EQ(nullptr, manager().GetSurfaceForId(id3));
 }
 
 TEST_F(SurfaceManagerRefTest, TryAddReferenceToBadSurface) {
   // Not creating an accompanying Surface and SurfaceFactory.
@@ skipping 36 matching lines @@
   // The temporary reference to |id1| must still exist.
   EXPECT_THAT(GetReferencesFor(id1), SizeIs(1));
 }
 
 TEST_F(SurfaceManagerRefTest, TryRemoveBadReference) {
   SurfaceId id1 = CreateSurface(kFrameSink1, 1);
   SurfaceId id2 = CreateSurface(kFrameSink2, 1);
 
   // Removing non-existent reference should be ignored.
   manager().AddSurfaceReference(id1, id2);
-  manager().RemoveSurfaceReference(id2, id1);
+  RemoveSurfaceReference(id2, id1);
   EXPECT_THAT(GetReferencesFrom(id1), SizeIs(1));
   EXPECT_THAT(GetReferencesFor(id2), SizeIs(1));
 }
 
 TEST_F(SurfaceManagerRefTest, AddSurfaceThenReference) {
   // Create a new surface.
   const SurfaceId surface_id = CreateSurface(kFrameSink2, 1);
 
   // A temporary reference must be added to |surface_id|.
   EXPECT_THAT(GetAllTempReferences(), ElementsAre(surface_id));
@@ skipping 105 matching lines @@
   // reference should be removed. The temporary reference for |surface_id2|
   // should remain. A temporary reference must be added for |parent_id|.
   EXPECT_THAT(GetAllTempReferences(),
               UnorderedElementsAre(parent_id, surface_id2));
   EXPECT_THAT(GetReferencesFromRoot(),
               UnorderedElementsAre(parent_id, surface_id2));
   EXPECT_THAT(GetReferencesFrom(parent_id), ElementsAre(surface_id1));
 }
 
 }  // namespace cc