GpuDisplayCompositorFrameSink => GpuRootCompositorFrameSink

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 51 matching lines @@
 
   cc::SurfaceManager* manager() { return &manager_; }
 
   // display_compositor::GpuCompositorFrameSinkDelegate implementation.
   void OnClientConnectionLost(const cc::FrameSinkId& frame_sink_id,
                               bool destroy_compositor_frame_sink) override;
   void OnPrivateConnectionLost(const cc::FrameSinkId& frame_sink_id,
                                bool destroy_compositor_frame_sink) override;
 
   // cc::mojom::DisplayCompositor implementation:
-  void CreateDisplayCompositorFrameSink(
+  void CreateRootCompositorFrameSink(
       const cc::FrameSinkId& frame_sink_id,
       gpu::SurfaceHandle surface_handle,
       cc::mojom::MojoCompositorFrameSinkAssociatedRequest request,
       cc::mojom::MojoCompositorFrameSinkPrivateRequest private_request,
       cc::mojom::MojoCompositorFrameSinkClientPtr client,
       cc::mojom::DisplayPrivateAssociatedRequest display_private_request)
       override;
-  void CreateOffscreenCompositorFrameSink(
+  void CreateCompositorFrameSink(
       const cc::FrameSinkId& frame_sink_id,
       cc::mojom::MojoCompositorFrameSinkRequest request,
       cc::mojom::MojoCompositorFrameSinkPrivateRequest private_request,
       cc::mojom::MojoCompositorFrameSinkClientPtr client) override;
 
  private:
   std::unique_ptr<cc::Display> CreateDisplay(
       const cc::FrameSinkId& frame_sink_id,
       gpu::SurfaceHandle surface_handle,
       cc::SyntheticBeginFrameSource* begin_frame_source);
@@ skipping 22 matching lines @@
 
   // SurfaceManager should be the first object constructed and the last object
   // destroyed in order to ensure that all other objects that depend on it have
   // access to a valid pointer for the entirety of their liftimes.
   cc::SurfaceManager manager_;
 
   scoped_refptr<gpu::InProcessCommandBuffer::Service> gpu_service_;
   std::unique_ptr<gpu::GpuMemoryBufferManager> gpu_memory_buffer_manager_;
   gpu::ImageFactory* image_factory_;
 
-  std::unordered_map<
-      cc::FrameSinkId,
-      std::unique_ptr<display_compositor::GpuCompositorFrameSink>,
-      cc::FrameSinkIdHash>
+  std::unordered_map<cc::FrameSinkId,
+                     std::unique_ptr<cc::mojom::MojoCompositorFrameSink>,
+                     cc::FrameSinkIdHash>
       compositor_frame_sinks_;
 
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
 
   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_