Moving temporary reference logic to SurfaceManager

services/ui/surfaces/display_compositor.h

 // Copyright 2015 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.
 
 #ifndef SERVICES_UI_SURFACES_DISPLAY_COMPOSITOR_H_
 #define SERVICES_UI_SURFACES_DISPLAY_COMPOSITOR_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 20 matching lines @@
 }
 
 namespace cc {
 class Display;
 class SurfaceManager;
 class SyntheticBeginFrameSource;
 }
 
 namespace ui {
 
 namespace test {

[kylechar, 2017/01/17 16:15:35]

Remove the forward def for the test.

[Saman Sami, 2017/01/17 18:29:05]

Done.

 class DisplayCompositorTest;
 }
 
-class DisplayCompositorClient;
 class GpuCompositorFrameSink;
 
 // The DisplayCompositor object is an object global to the Window Server app
 // that holds the SurfaceServer and allocates new Surfaces namespaces.
 // This object lives on the main thread of the Window Server.
 // TODO(rjkroege, fsamuel): This object will need to change to support multiple
 // displays.
 class DisplayCompositor : public cc::SurfaceObserver,
                           public cc::mojom::DisplayCompositor {
  public:
@@ skipping 36 matching lines @@
       cc::mojom::DisplayPrivateRequest display_request) override;
   void CreateOffscreenCompositorFrameSink(
       const cc::FrameSinkId& frame_sink_id,
       cc::mojom::MojoCompositorFrameSinkRequest request,
       cc::mojom::MojoCompositorFrameSinkPrivateRequest private_request,
       cc::mojom::MojoCompositorFrameSinkClientPtr client) override;
 
  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,
       cc::SyntheticBeginFrameSource* begin_frame_source);
 
   void CreateCompositorFrameSinkInternal(
       const cc::FrameSinkId& frame_sink_id,
       gpu::SurfaceHandle surface_handle,
       std::unique_ptr<cc::Display> display,
       std::unique_ptr<cc::SyntheticBeginFrameSource> begin_frame_source,
@@ skipping 22 matching lines @@
   std::unique_ptr<gpu::GpuMemoryBufferManager> gpu_memory_buffer_manager_;
   gpu::ImageFactory* image_factory_;
 
   std::unordered_map<cc::FrameSinkId,
                      std::unique_ptr<GpuCompositorFrameSink>,
                      cc::FrameSinkIdHash>
       compositor_frame_sinks_;
 
   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_;
   mojo::Binding<cc::mojom::DisplayCompositor> binding_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayCompositor);
 };
 
 }  // namespace ui
 
 #endif  //  SERVICES_UI_SURFACES_DISPLAY_COMPOSITOR_H_