gpu: Introduce GpuChannelEstablishFactory.

services/ui/common/gpu_service.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/common/gpu_service.h"
 
 #include "base/command_line.h"
 #include "base/memory/singleton.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "mojo/public/cpp/bindings/sync_call_restrictions.h"
 #include "mojo/public/cpp/system/platform_handle.h"
 #include "services/shell/public/cpp/connector.h"
 #include "services/ui/common/gpu_type_converters.h"
 #include "services/ui/common/mojo_gpu_memory_buffer_manager.h"
 #include "services/ui/common/switches.h"
 #include "services/ui/public/interfaces/gpu_service.mojom.h"
 
 namespace ui {
 
 namespace {
 
 void PostTask(scoped_refptr<base::SingleThreadTaskRunner> runner,
               const tracked_objects::Location& from_here,
-              const base::Closure& callback) {
-  runner->PostTask(from_here, callback);
+              const gpu::GpuChannelEstablishedCallback& callback,
+              scoped_refptr<gpu::GpuChannelHost> established_channel_host) {
+  runner->PostTask(from_here,
+                   base::Bind(callback, std::move(established_channel_host)));
 }
 
 GpuService* g_gpu_service = nullptr;
 }
 
 GpuService::GpuService(shell::Connector* connector)
     : main_task_runner_(base::ThreadTaskRunnerHandle::Get()),
       connector_(connector),
       shutdown_event_(base::WaitableEvent::ResetPolicy::AUTOMATIC,
                       base::WaitableEvent::InitialState::NOT_SIGNALED),
@@ skipping 23 matching lines @@
   g_gpu_service = new GpuService(connector);
   return base::WrapUnique(g_gpu_service);
 }
 
 // static
 GpuService* GpuService::GetInstance() {
   DCHECK(g_gpu_service);
   return g_gpu_service;
 }
 
-void GpuService::EstablishGpuChannel(const base::Closure& callback) {
+void GpuService::EstablishGpuChannel(
+    const gpu::GpuChannelEstablishedCallback& callback) {
   base::AutoLock auto_lock(lock_);
   auto runner = base::ThreadTaskRunnerHandle::Get();
-  if (GetGpuChannelLocked()) {
-    runner->PostTask(FROM_HERE, callback);
+  scoped_refptr<gpu::GpuChannelHost> channel = GetGpuChannelLocked();
+  if (channel) {
+    PostTask(runner, FROM_HERE, callback, std::move(channel));
     return;
   }
   establish_callbacks_.push_back(
       base::Bind(PostTask, runner, FROM_HERE, callback));
   if (!is_establishing_) {
     is_establishing_ = true;
     main_task_runner_->PostTask(
         FROM_HERE, base::Bind(&GpuService::EstablishGpuChannelOnMainThread,
                               base::Unretained(this)));
   }
@@ skipping 17 matching lines @@
     }
 
     // Wait until the pending establishing task is finished.
     do {
       establishing_condition_.Wait();
     } while (is_establishing_);
   }
   return gpu_channel_;
 }
 
-scoped_refptr<gpu::GpuChannelHost> GpuService::GetGpuChannel() {
-  base::AutoLock auto_lock(lock_);
-  return GetGpuChannelLocked();
-}
-
 scoped_refptr<gpu::GpuChannelHost> GpuService::GetGpuChannelLocked() {
   if (gpu_channel_ && gpu_channel_->IsLost()) {
     main_task_runner_->PostTask(
         FROM_HERE,
         base::Bind(&gpu::GpuChannelHost::DestroyChannel, gpu_channel_));
     gpu_channel_ = nullptr;
   }
   return gpu_channel_;
 }
 
@@ skipping 69 matching lines @@
       locked ? nullptr : new base::AutoLock(lock_));
   DCHECK(is_establishing_);
   DCHECK(!gpu_channel_);
 
   is_establishing_ = false;
   gpu_channel_ = gpu_channel;
   establishing_condition_.Broadcast();
   gpu_service_.reset();
 
   for (const auto& i : establish_callbacks_)
-    i.Run();
+    i.Run(gpu_channel_);
   establish_callbacks_.clear();
 }
 
 bool GpuService::IsMainThread() {
   return main_task_runner_->BelongsToCurrentThread();
 }
 
 scoped_refptr<base::SingleThreadTaskRunner>
 GpuService::GetIOThreadTaskRunner() {
   return io_thread_.task_runner();
@@ skipping 12 matching lines @@
   MojoResult result = mojo::UnwrapSharedMemoryHandle(
       std::move(handle), &platform_handle, &shared_memory_size, &readonly);
   if (result != MOJO_RESULT_OK)
     return nullptr;
   DCHECK_EQ(shared_memory_size, size);
 
   return base::MakeUnique<base::SharedMemory>(platform_handle, readonly);
 }
 
 }  // namespace ui