Moving temporary reference logic to SurfaceManager

services/ui/surfaces/display_compositor.h

Index: services/ui/surfaces/display_compositor.h
diff --git a/services/ui/surfaces/display_compositor.h b/services/ui/surfaces/display_compositor.h
index fca74d8a19cde7f871ecb6ad92a848e36ded099f..2555493622ea10d07ad9cd6a14713c154ee11916 100644
--- a/services/ui/surfaces/display_compositor.h
+++ b/services/ui/surfaces/display_compositor.h
@@ -42,7 +42,6 @@ namespace test {
 class DisplayCompositorTest;
 }
 
-class DisplayCompositorClient;
 class GpuCompositorFrameSink;
 
 // The DisplayCompositor object is an object global to the Window Server app
@@ -99,9 +98,6 @@ class DisplayCompositor : public cc::SurfaceObserver,
  private:
   friend class test::DisplayCompositorTest;
 
-  void AddSurfaceReference(const cc::SurfaceReference& ref);
-  void RemoveSurfaceReference(const cc::SurfaceReference& ref);
-
   std::unique_ptr<cc::Display> CreateDisplay(
       const cc::FrameSinkId& frame_sink_id,
       gpu::SurfaceHandle surface_handle,
@@ -144,16 +140,6 @@ class DisplayCompositor : public cc::SurfaceObserver,
 
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
 
-  // SurfaceIds that have temporary references from top level root so they
-  // aren't GC'd before DisplayCompositorClient can add a real reference. This
-  // is basically a collection of surface ids, for example:
-  //   cc::SurfaceId surface_id(key, value[index]);
-  // The LocalFrameIds are stored in the order the surfaces are created in.
-  std::unordered_map<cc::FrameSinkId,
-                     std::vector<cc::LocalFrameId>,
-                     cc::FrameSinkIdHash>
-      temp_references_;
-
   base::ThreadChecker thread_checker_;
 
   cc::mojom::DisplayCompositorClientPtr client_;