gpu: Introduce GpuChannelEstablishFactory.

content/browser/gpu/browser_gpu_channel_host_factory.cc

 // Copyright (c) 2012 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 "content/browser/gpu/browser_gpu_channel_host_factory.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/profiler/scoped_tracker.h"
@@ skipping 10 matching lines @@
 #include "content/browser/gpu/shader_disk_cache.h"
 #include "content/common/child_process_host_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/gpu_data_manager.h"
 #include "content/public/common/content_client.h"
 #include "gpu/command_buffer/service/gpu_switches.h"
 #include "gpu/ipc/common/gpu_messages.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/message_filter.h"
-
-#if defined(MOJO_RUNNER_CLIENT)
 #include "services/shell/runner/common/client_util.h"
-#endif
 
 namespace content {
 
 BrowserGpuChannelHostFactory* BrowserGpuChannelHostFactory::instance_ = NULL;
 
 class BrowserGpuChannelHostFactory::EstablishRequest
     : public base::RefCountedThreadSafe<EstablishRequest> {
  public:
   static scoped_refptr<EstablishRequest> Create(int gpu_client_id,
                                                 uint64_t gpu_client_tracing_id,
@@ skipping 157 matching lines @@
 }
 
 bool BrowserGpuChannelHostFactory::CanUseForTesting() {
   return GpuDataManager::GetInstance()->GpuAccessAllowed(NULL);
 }
 
 void BrowserGpuChannelHostFactory::Initialize(bool establish_gpu_channel) {
   DCHECK(!instance_);
   instance_ = new BrowserGpuChannelHostFactory();
   if (establish_gpu_channel) {
-    instance_->EstablishGpuChannel(base::Closure());
+    instance_->EstablishGpuChannel(gpu::GpuChannelEstablishedCallback());
   }
 }
 
 void BrowserGpuChannelHostFactory::Terminate() {
   DCHECK(instance_);
   delete instance_;
   instance_ = NULL;
 }
 
 BrowserGpuChannelHostFactory::BrowserGpuChannelHostFactory()
@@ skipping 19 matching lines @@
               gpu_client_id_, cache_dir));
     }
   }
 }
 
 BrowserGpuChannelHostFactory::~BrowserGpuChannelHostFactory() {
   DCHECK(IsMainThread());
   if (pending_request_.get())
     pending_request_->Cancel();
   for (size_t n = 0; n < established_callbacks_.size(); n++)
-    established_callbacks_[n].Run();
+    established_callbacks_[n].Run(nullptr);
   shutdown_event_->Signal();
   if (gpu_channel_) {
     gpu_channel_->DestroyChannel();
     gpu_channel_ = NULL;
   }
 }
 
 bool BrowserGpuChannelHostFactory::IsMainThread() {
   return BrowserThread::CurrentlyOn(BrowserThread::UI);
 }
 
 scoped_refptr<base::SingleThreadTaskRunner>
 BrowserGpuChannelHostFactory::GetIOThreadTaskRunner() {
   return BrowserThread::GetTaskRunnerForThread(BrowserThread::IO);
 }
 
 std::unique_ptr<base::SharedMemory>
 BrowserGpuChannelHostFactory::AllocateSharedMemory(size_t size) {
   std::unique_ptr<base::SharedMemory> shm(new base::SharedMemory());
   if (!shm->CreateAnonymous(size))
     return std::unique_ptr<base::SharedMemory>();
   return shm;
 }
 
-// Blocking the UI thread to open a GPU channel is not supported on Android.
-// (Opening the initial channel to a child process involves handling a reply
-// task on the UI thread first, so we cannot block here.)
-#if !defined(OS_ANDROID)
-scoped_refptr<gpu::GpuChannelHost>
-BrowserGpuChannelHostFactory::EstablishGpuChannelSync() {
-  EstablishGpuChannel(base::Closure());
-
-  if (pending_request_.get())
-    pending_request_->Wait();
-
-  return gpu_channel_;
-}
-#endif
-
 void BrowserGpuChannelHostFactory::EstablishGpuChannel(
-    const base::Closure& callback) {
-#if defined(MOJO_RUNNER_CLIENT)
+    const gpu::GpuChannelEstablishedCallback& callback) {
   DCHECK(!shell::ShellIsRemote());
-#endif
   if (gpu_channel_.get() && gpu_channel_->IsLost()) {
     DCHECK(!pending_request_.get());
     // Recreate the channel if it has been lost.
     gpu_channel_->DestroyChannel();
     gpu_channel_ = NULL;
   }
 
   if (!gpu_channel_.get() && !pending_request_.get()) {
     // We should only get here if the context was lost.
     pending_request_ = EstablishRequest::Create(
         gpu_client_id_, gpu_client_tracing_id_, gpu_host_id_);
   }
 
   if (!callback.is_null()) {
     if (gpu_channel_.get())
-      callback.Run();
+      callback.Run(gpu_channel_);
     else
       established_callbacks_.push_back(callback);
   }
 }
 
+// Blocking the UI thread to open a GPU channel is not supported on Android.
+// (Opening the initial channel to a child process involves handling a reply
+// task on the UI thread first, so we cannot block here.)
+scoped_refptr<gpu::GpuChannelHost>
+BrowserGpuChannelHostFactory::EstablishGpuChannelSync() {
+#if defined(OS_ANDROID)
+  NOTREACHED();
+  return nullptr;
+#endif
+  EstablishGpuChannel(gpu::GpuChannelEstablishedCallback());
+
+  if (pending_request_.get())
+    pending_request_->Wait();
+
+  return gpu_channel_;
+}
+
 gpu::GpuChannelHost* BrowserGpuChannelHostFactory::GetGpuChannel() {
   if (gpu_channel_.get() && !gpu_channel_->IsLost())
     return gpu_channel_.get();
 
   return NULL;
 }
 
 void BrowserGpuChannelHostFactory::GpuChannelEstablished() {
   DCHECK(IsMainThread());
   DCHECK(pending_request_.get());
@@ skipping 14 matching lines @@
   gpu_host_id_ = pending_request_->gpu_host_id();
   pending_request_ = NULL;
 
   // TODO(robliao): Remove ScopedTracker below once https://crbug.com/466866 is
   // fixed.
   tracked_objects::ScopedTracker tracking_profile2(
       FROM_HERE_WITH_EXPLICIT_FUNCTION(
           "466866 BrowserGpuChannelHostFactory::GpuChannelEstablished2"));
 
   for (size_t n = 0; n < established_callbacks_.size(); n++)
-    established_callbacks_[n].Run();
+    established_callbacks_[n].Run(gpu_channel_);
 
   established_callbacks_.clear();
 }
 
 // static
 void BrowserGpuChannelHostFactory::AddFilterOnIO(
     int host_id,
     scoped_refptr<IPC::MessageFilter> filter) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   GpuProcessHost* host = GpuProcessHost::FromID(host_id);
   if (host)
     host->AddFilter(filter.get());
 }
 
 // static
 void BrowserGpuChannelHostFactory::InitializeShaderDiskCacheOnIO(
     int gpu_client_id,
     const base::FilePath& cache_dir) {
   ShaderCacheFactory::GetInstance()->SetCacheInfo(gpu_client_id, cache_dir);
 }
 
 }  // namespace content