Rename DisplayCompositor to MojoFrameSinkManager.

services/ui/gpu/gpu_main.h

Index: services/ui/gpu/gpu_main.h
diff --git a/services/ui/gpu/gpu_main.h b/services/ui/gpu/gpu_main.h
index 82accf9b3ab6f4d8147252df95de5cb3f32a6c57..e60db82069c31833e62ccc3d94d47c6fbde06d22 100644
--- a/services/ui/gpu/gpu_main.h
+++ b/services/ui/gpu/gpu_main.h
@@ -11,8 +11,8 @@
 #include "gpu/ipc/service/gpu_init.h"
 #include "services/ui/gpu/interfaces/gpu_main.mojom.h"
 #include "services/ui/gpu/interfaces/gpu_service.mojom.h"
-#include "services/ui/surfaces/display_compositor.h"
 #include "services/ui/surfaces/display_provider.h"
+#include "services/ui/surfaces/mojo_frame_sink_manager.h"
 
 namespace gpu {
 class GpuMemoryBufferFactory;
@@ -33,9 +33,9 @@ class GpuMain : public gpu::GpuSandboxHelper, public mojom::GpuMain {
                         mojom::GpuHostPtr gpu_host,
                         const gpu::GpuPreferences& preferences,
                         mojo::ScopedSharedBufferHandle activity_flags) override;
-  void CreateDisplayCompositor(
-      cc::mojom::DisplayCompositorRequest request,
-      cc::mojom::DisplayCompositorClientPtr client) override;
+  void CreateFrameSinkManager(
+      cc::mojom::FrameSinkManagerRequest request,
+      cc::mojom::FrameSinkManagerClientPtr client) override;
 
   void OnStart();
 
@@ -46,14 +46,14 @@ class GpuMain : public gpu::GpuSandboxHelper, public mojom::GpuMain {
       scoped_refptr<base::SingleThreadTaskRunner> io_runner,
       scoped_refptr<base::SingleThreadTaskRunner> compositor_runner);
 
-  void CreateDisplayCompositorInternal(
-      cc::mojom::DisplayCompositorRequest request,
-      cc::mojom::DisplayCompositorClientPtrInfo client_info);
-  void CreateDisplayCompositorOnCompositorThread(
+  void CreateFrameSinkManagerInternal(
+      cc::mojom::FrameSinkManagerRequest request,
+      cc::mojom::FrameSinkManagerClientPtrInfo client_info);
+  void CreateFrameSinkManagerOnCompositorThread(
       gpu::ImageFactory* image_factory,
       mojom::GpuServicePtrInfo gpu_service_info,
-      cc::mojom::DisplayCompositorRequest request,
-      cc::mojom::DisplayCompositorClientPtrInfo client_info);
+      cc::mojom::FrameSinkManagerRequest request,
+      cc::mojom::FrameSinkManagerClientPtrInfo client_info);
   void CreateGpuServiceOnGpuThread(mojom::GpuServiceRequest request,
                                    mojom::GpuHostPtrInfo gpu_host_info,
                                    const gpu::GpuPreferences& preferences,
@@ -71,7 +71,7 @@ class GpuMain : public gpu::GpuSandboxHelper, public mojom::GpuMain {
   std::unique_ptr<gpu::GpuInit> gpu_init_;
   std::unique_ptr<GpuService> gpu_service_;
 
-  // The message-pipe used by the DisplayCompositor to request gpu memory
+  // The message-pipe used by the FrameSinkManager to request gpu memory
   // buffers.
   mojom::GpuServicePtr gpu_internal_;
 
@@ -80,11 +80,11 @@ class GpuMain : public gpu::GpuSandboxHelper, public mojom::GpuMain {
 
   // If the gpu service is not yet ready then we stash pending MessagePipes in
   // these member variables.
-  cc::mojom::DisplayCompositorRequest pending_display_compositor_request_;
-  cc::mojom::DisplayCompositorClientPtrInfo
+  cc::mojom::FrameSinkManagerRequest pending_display_compositor_request_;

[msw, 2017/04/03 19:22:13]

Update these member names? Also grep services/ui (and clients) for references to
'display compositor'/'display_compositor'/'DisplayCompositor' and update those?
Ditto for docs, bugs, etc. that live outside the codebase.

[kylechar, 2017/04/03 19:54:15]

Done.

+  cc::mojom::FrameSinkManagerClientPtrInfo
       pending_display_compositor_client_info_;
 
-  std::unique_ptr<DisplayCompositor> display_compositor_;
+  std::unique_ptr<MojoFrameSinkManager> frame_sink_manager_;

[msw, 2017/04/03 19:22:13]

nit: add a comment

[kylechar, 2017/04/03 19:54:15]

Done.

   std::unique_ptr<DisplayProvider> display_provider_;
 
   std::unique_ptr<gpu::GpuMemoryBufferFactory> gpu_memory_buffer_factory_;