Add/remove surface references via MojoCompositorFrameSink.

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 42 matching lines @@
                           public cc::mojom::DisplayCompositor {
  public:
   DisplayCompositor(
       scoped_refptr<gpu::InProcessCommandBuffer::Service> gpu_service,
       std::unique_ptr<gpu::GpuMemoryBufferManager> gpu_memory_buffer_manager,
       gpu::ImageFactory* image_factory,
       cc::mojom::DisplayCompositorRequest request,
       cc::mojom::DisplayCompositorClientPtr client);
   ~DisplayCompositor() override;
 
-  // cc::mojom::DisplayCompositor implementation:
-  void CreateCompositorFrameSink(
-      const cc::FrameSinkId& frame_sink_id,
-      gpu::SurfaceHandle surface_handle,
-      cc::mojom::MojoCompositorFrameSinkRequest request,
-      cc::mojom::MojoCompositorFrameSinkPrivateRequest private_request,
-      cc::mojom::MojoCompositorFrameSinkClientPtr client) override;
-  void AddRootSurfaceReference(const cc::SurfaceId& child_id) override;
-  void AddSurfaceReference(const cc::SurfaceId& parent_id,
-                           const cc::SurfaceId& child_id) override;
-  void RemoveRootSurfaceReference(const cc::SurfaceId& child_id) override;
-  void RemoveSurfaceReference(const cc::SurfaceId& parent_id,
-                              const cc::SurfaceId& child_id) override;
+  cc::SurfaceManager* manager() { return &manager_; }
 
-  cc::SurfaceManager* manager() { return &manager_; }
+  // Adds surface references. For each reference added, this will remove the
+  // temporary reference to the child surface if one exists.
+  void AddSurfaceReferences(
+      const std::vector<cc::SurfaceReference>& references);
+
+  // Removes surface references.
+  void RemoveSurfaceReferences(
+      const std::vector<cc::SurfaceReference>& references);
 
   // We must avoid destroying a GpuCompositorFrameSink until both the display
   // compositor host and the client drop their connection to avoid getting into
   // a state where surfaces references are inconsistent.
   void OnCompositorFrameSinkClientConnectionLost(
       const cc::FrameSinkId& frame_sink_id,
       bool destroy_compositor_frame_sink);
   void OnCompositorFrameSinkPrivateConnectionLost(
       const cc::FrameSinkId& frame_sink_id,
       bool destroy_compositor_frame_sink);
 
+  // cc::mojom::DisplayCompositor implementation:
+  void CreateCompositorFrameSink(
+      const cc::FrameSinkId& frame_sink_id,
+      gpu::SurfaceHandle surface_handle,
+      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);
 
   const cc::SurfaceId& GetRootSurfaceId() const;
 
   // cc::SurfaceObserver implementation.
   void OnSurfaceCreated(const cc::SurfaceId& surface_id,
                         const gfx::Size& frame_size,
                         float device_scale_factor) override;
@@ skipping 34 matching lines @@
 
   cc::mojom::DisplayCompositorClientPtr client_;
   mojo::Binding<cc::mojom::DisplayCompositor> binding_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayCompositor);
 };
 
 }  // namespace ui
 
 #endif  //  SERVICES_UI_SURFACES_DISPLAY_COMPOSITOR_H_