mus/gpu: Introduce the GpuServiceHost mojom interface.

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/message_loop/message_loop.h"
 #include "gpu/ipc/common/gpu_memory_buffer_support.h"
 #include "gpu/ipc/gpu_in_process_thread_service.h"
@@ skipping 93 matching lines @@
 void GpuMain::OnStart() {
   // |this| will outlive the gpu thread and so it's safe to use
   // base::Unretained here.
   gpu_thread_.task_runner()->PostTask(
       FROM_HERE,
       base::Bind(&GpuMain::InitOnGpuThread, base::Unretained(this),
                  io_thread_.task_runner(), compositor_thread_.task_runner()));
 }
 
 void GpuMain::CreateGpuService(mojom::GpuServiceInternalRequest request,
-                               const CreateGpuServiceCallback& callback) {
+                               mojom::GpuServiceHostPtr gpu_host) {
   // |this| will outlive the gpu thread and so it's safe to use
   // base::Unretained here.
   gpu_thread_.task_runner()->PostTask(
       FROM_HERE,
       base::Bind(&GpuMain::CreateGpuServiceOnGpuThread, base::Unretained(this),
                  base::Passed(std::move(request)),
-                 base::ThreadTaskRunnerHandle::Get(), callback));
+                 base::Passed(gpu_host.PassInterface())));
 }
 
 void GpuMain::CreateDisplayCompositor(
     cc::mojom::DisplayCompositorRequest request,
     cc::mojom::DisplayCompositorClientPtr client) {
   if (!gpu_service_internal_) {
     pending_display_compositor_request_ = std::move(request);
     pending_display_compositor_client_info_ = client.PassInterface();
     return;
   }
@@ skipping 11 matching lines @@
     return;
 
   if (gpu::GetNativeGpuMemoryBufferType() != gfx::EMPTY_BUFFER) {
     gpu_memory_buffer_factory_ =
         gpu::GpuMemoryBufferFactory::CreateNativeType();
   }
 
   gpu_service_internal_ = base::MakeUnique<GpuServiceInternal>(
       gpu_init_->gpu_info(), gpu_init_->TakeWatchdogThread(),
       gpu_memory_buffer_factory_.get(), io_runner);
-  gpu_service_internal_->Initialize();
 }
 
 void GpuMain::CreateDisplayCompositorInternal(
     cc::mojom::DisplayCompositorRequest request,
     cc::mojom::DisplayCompositorClientPtrInfo client_info) {
   DCHECK(!gpu_command_service_);
   gpu_command_service_ = new gpu::GpuInProcessThreadService(
       gpu_thread_.task_runner(), gpu_service_internal_->sync_point_manager(),
       gpu_service_internal_->mailbox_manager(),
       gpu_service_internal_->share_group());
 
   // |gpu_memory_buffer_factory_| is null in tests.
   gpu::ImageFactory* image_factory =
       gpu_memory_buffer_factory_ ? gpu_memory_buffer_factory_->AsImageFactory()
                                  : nullptr;
 
   mojom::GpuServiceInternalPtr gpu_service;
   mojom::GpuServiceInternalRequest gpu_service_request =
       mojo::GetProxy(&gpu_service);
 
-  CreateGpuService(std::move(gpu_service_request), CreateGpuServiceCallback());
+  if (gpu_thread_.task_runner()->BelongsToCurrentThread()) {
+    // If the DisplayCompositor creation was delayed because GpuServiceInternal
+    // had not been created yet, then this is called, in gpu thread, right after
+    // GpuServiceInternal 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,
                             base::Unretained(this), image_factory,
                             base::Passed(gpu_service.PassInterface()),
                             base::Passed(std::move(request)),
                             base::Passed(std::move(client_info))));
 }
 
 void GpuMain::CreateDisplayCompositorOnCompositorThread(
@@ skipping 19 matching lines @@
 }
 
 void GpuMain::TearDownOnGpuThread() {
   gpu_service_internal_.reset();
   gpu_memory_buffer_factory_.reset();
   gpu_init_.reset();
 }
 
 void GpuMain::CreateGpuServiceOnGpuThread(
     mojom::GpuServiceInternalRequest request,
-    scoped_refptr<base::SingleThreadTaskRunner> origin_runner,
-    const CreateGpuServiceCallback& callback) {
+    mojom::GpuServiceHostPtrInfo gpu_host_info) {
+  mojom::GpuServiceHostPtr gpu_host;
+  gpu_host.Bind(std::move(gpu_host_info));
+  gpu_service_internal_->InitializeWithHost(std::move(gpu_host));
   gpu_service_internal_->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 (!callback.is_null()) {
-    origin_runner->PostTask(
-        FROM_HERE, base::Bind(callback, gpu_service_internal_->gpu_info()));
-  }
+void GpuMain::BindGpuInternalOnGpuThread(
+    mojom::GpuServiceInternalRequest request) {
+  gpu_service_internal_->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