Rename DisplayCompositor to MojoFrameSinkManager.

services/ui/gpu/gpu_main.cc

 // Copyright 2016 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.
 
 #include "services/ui/gpu/gpu_main.h"
 
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/power_monitor/power_monitor_device_source.h"
@@ skipping 117 matching lines @@
   // base::Unretained here.
   gpu_thread_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&GpuMain::CreateGpuServiceOnGpuThread, base::Unretained(this),
                  base::Passed(std::move(request)),
                  base::Passed(gpu_host.PassInterface()), preferences,
                  base::Passed(
                      gpu::GpuProcessActivityFlags(std::move(activity_flags)))));
 }
 
-void GpuMain::CreateDisplayCompositor(
-    cc::mojom::DisplayCompositorRequest request,
-    cc::mojom::DisplayCompositorClientPtr client) {
+void GpuMain::CreateFrameSinkManager(
+    cc::mojom::FrameSinkManagerRequest request,
+    cc::mojom::FrameSinkManagerClientPtr client) {
   if (!gpu_service_) {
-    pending_display_compositor_request_ = std::move(request);
-    pending_display_compositor_client_info_ = client.PassInterface();
+    pending_frame_sink_manager_request_ = std::move(request);
+    pending_frame_sink_manager_client_info_ = client.PassInterface();
     return;
   }
-  CreateDisplayCompositorInternal(std::move(request), client.PassInterface());
+  CreateFrameSinkManagerInternal(std::move(request), client.PassInterface());
 }
 
 void GpuMain::InitOnGpuThread(
     scoped_refptr<base::SingleThreadTaskRunner> io_runner,
     scoped_refptr<base::SingleThreadTaskRunner> compositor_runner) {
   gpu_init_.reset(new gpu::GpuInit());
   gpu_init_->set_sandbox_helper(this);
   bool success = gpu_init_->InitializeAndStartSandbox(
       *base::CommandLine::ForCurrentProcess());
   if (!success)
     return;
 
   gpu_service_ = base::MakeUnique<GpuService>(
       gpu_init_->gpu_info(), gpu_init_->TakeWatchdogThread(), io_runner,
       gpu_init_->gpu_feature_info());
 }
 
-void GpuMain::CreateDisplayCompositorInternal(
-    cc::mojom::DisplayCompositorRequest request,
-    cc::mojom::DisplayCompositorClientPtrInfo client_info) {
+void GpuMain::CreateFrameSinkManagerInternal(
+    cc::mojom::FrameSinkManagerRequest request,
+    cc::mojom::FrameSinkManagerClientPtrInfo client_info) {
   DCHECK(!gpu_command_service_);
   gpu_command_service_ = new gpu::GpuInProcessThreadService(
       gpu_thread_task_runner_, gpu_service_->sync_point_manager(),
       gpu_service_->mailbox_manager(), gpu_service_->share_group());
 
   gpu::ImageFactory* image_factory = gpu_service_->gpu_image_factory();
   mojom::GpuServicePtr gpu_service;
   mojom::GpuServiceRequest gpu_service_request(&gpu_service);
 
   if (gpu_thread_task_runner_->BelongsToCurrentThread()) {
-    // If the DisplayCompositor creation was delayed because GpuService
-    // had not been created yet, then this is called, in gpu thread, right after
+    // If the FrameSinkManager creation was delayed because GpuService had not
+    // been created yet, then this is called, in gpu thread, right after
     // GpuService is created.
     BindGpuInternalOnGpuThread(std::move(gpu_service_request));
   } else {
     gpu_thread_task_runner_->PostTask(
         FROM_HERE,
         base::Bind(&GpuMain::BindGpuInternalOnGpuThread, base::Unretained(this),
                    base::Passed(std::move(gpu_service_request))));
   }
 
   compositor_thread_task_runner_->PostTask(
-      FROM_HERE, base::Bind(&GpuMain::CreateDisplayCompositorOnCompositorThread,
+      FROM_HERE, base::Bind(&GpuMain::CreateFrameSinkManagerOnCompositorThread,
                             base::Unretained(this), image_factory,
                             base::Passed(gpu_service.PassInterface()),
                             base::Passed(std::move(request)),
                             base::Passed(std::move(client_info))));
 }
 
-void GpuMain::CreateDisplayCompositorOnCompositorThread(
+void GpuMain::CreateFrameSinkManagerOnCompositorThread(
     gpu::ImageFactory* image_factory,
     mojom::GpuServicePtrInfo gpu_service_info,
-    cc::mojom::DisplayCompositorRequest request,
-    cc::mojom::DisplayCompositorClientPtrInfo client_info) {
-  DCHECK(!display_compositor_);
-  cc::mojom::DisplayCompositorClientPtr client;
+    cc::mojom::FrameSinkManagerRequest request,
+    cc::mojom::FrameSinkManagerClientPtrInfo client_info) {
+  DCHECK(!frame_sink_manager_);
+  cc::mojom::FrameSinkManagerClientPtr client;
   client.Bind(std::move(client_info));
 
   gpu_internal_.Bind(std::move(gpu_service_info));
 
   display_provider_ = base::MakeUnique<MusDisplayProvider>(
       gpu_command_service_,
       base::MakeUnique<ServerGpuMemoryBufferManager>(gpu_internal_.get(),
                                                      1 /* client_id */),
       image_factory);
 
-  display_compositor_ = base::MakeUnique<DisplayCompositor>(
+  frame_sink_manager_ = base::MakeUnique<MojoFrameSinkManager>(
       display_provider_.get(), std::move(request), std::move(client));
 }
 
 void GpuMain::TearDownOnCompositorThread() {
-  display_compositor_.reset();
+  frame_sink_manager_.reset();
   display_provider_.reset();
   gpu_internal_.reset();
 }
 
 void GpuMain::TearDownOnGpuThread() {
   gpu_service_.reset();
   gpu_memory_buffer_factory_.reset();
   gpu_init_.reset();
 }
 
 void GpuMain::CreateGpuServiceOnGpuThread(
     mojom::GpuServiceRequest request,
     mojom::GpuHostPtrInfo gpu_host_info,
     const gpu::GpuPreferences& preferences,
     gpu::GpuProcessActivityFlags activity_flags) {
   mojom::GpuHostPtr gpu_host;
   gpu_host.Bind(std::move(gpu_host_info));
   gpu_service_->UpdateGPUInfoFromPreferences(preferences);
   gpu_service_->InitializeWithHost(std::move(gpu_host),
                                    std::move(activity_flags));
   gpu_service_->Bind(std::move(request));
 
-  if (pending_display_compositor_request_.is_pending()) {
-    CreateDisplayCompositorInternal(
-        std::move(pending_display_compositor_request_),
-        std::move(pending_display_compositor_client_info_));
+  if (pending_frame_sink_manager_request_.is_pending()) {
+    CreateFrameSinkManagerInternal(
+        std::move(pending_frame_sink_manager_request_),
+        std::move(pending_frame_sink_manager_client_info_));
   }
 }
 
 void GpuMain::BindGpuInternalOnGpuThread(mojom::GpuServiceRequest request) {
   gpu_service_->Bind(std::move(request));
 }
 
 void GpuMain::PreSandboxStartup() {
   // TODO(sad): https://crbug.com/645602
 }
 
 bool GpuMain::EnsureSandboxInitialized(
     gpu::GpuWatchdogThread* watchdog_thread) {
   // TODO(sad): https://crbug.com/645602
   return true;
 }
 
 }  // namespace ui