gpu: Use mus gpu interface in non-mus chrome.

content/browser/gpu/gpu_process_host.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/gpu_process_host.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <list>
@@ skipping 443 matching lines @@
   return NULL;
 }
 
 GpuProcessHost::GpuProcessHost(int host_id, GpuProcessKind kind)
     : host_id_(host_id),
       valid_(true),
       in_process_(false),
       swiftshader_rendering_(false),
       kind_(kind),
       process_launched_(false),
-      initialized_(false) {
+      initialized_(false),
+      gpu_host_binding_(this) {
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kSingleProcess) ||
       base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kInProcessGPU)) {
     in_process_ = true;
   }
 
   // If the 'single GPU process' policy ever changes, we still want to maintain
   // it for 'gpu thread' mode and only create one instance of host and thread.
   DCHECK(!in_process_ || g_gpu_process_hosts[kind] == NULL);
@@ skipping 137 matching lines @@
     in_process_gpu_thread_->StartWithOptions(options);
 
     OnProcessLaunched();  // Fake a callback that the process is ready.
   } else if (!LaunchGpuProcess(&gpu_preferences)) {
     return false;
   }
 
   process_->child_channel()
       ->GetAssociatedInterfaceSupport()
       ->GetRemoteAssociatedInterface(&gpu_main_ptr_);
-
-  if (!Send(new GpuMsg_Initialize(gpu_preferences)))
-    return false;
+  ui::mojom::GpuServiceRequest request(&gpu_service_ptr_);
+  gpu_main_ptr_->CreateGpuService(std::move(request),
+                                  gpu_host_binding_.CreateInterfacePtrAndBind(),
+                                  gpu_preferences);
 
 #if defined(USE_OZONE)
   // Ozone needs to send the primary DRM device to GPU process as early as
   // possible to ensure the latter always has a valid device. crbug.com/608839
   ui::OzonePlatform::GetInstance()
       ->GetGpuPlatformSupportHost()
       ->OnGpuProcessLaunched(
           host_id_, BrowserThread::GetTaskRunnerForThread(BrowserThread::IO),
           base::Bind(&SendGpuProcessMessageByHostId, host_id_));
 #endif
@@ skipping 34 matching lines @@
   DCHECK(CalledOnValidThread());
   IPC_BEGIN_MESSAGE_MAP(GpuProcessHost, message)
     IPC_MESSAGE_HANDLER(GpuHostMsg_Initialized, OnInitialized)
     IPC_MESSAGE_HANDLER(GpuHostMsg_ChannelEstablished, OnChannelEstablished)
     IPC_MESSAGE_HANDLER(GpuHostMsg_GpuMemoryBufferCreated,
                         OnGpuMemoryBufferCreated)
 #if defined(OS_ANDROID)
     IPC_MESSAGE_HANDLER(GpuHostMsg_DestroyingVideoSurfaceAck,
                         OnDestroyingVideoSurfaceAck)
 #endif
-    IPC_MESSAGE_HANDLER(GpuHostMsg_DidCreateOffscreenContext,
-                        OnDidCreateOffscreenContext)
-    IPC_MESSAGE_HANDLER(GpuHostMsg_DidLoseContext, OnDidLoseContext)
-    IPC_MESSAGE_HANDLER(GpuHostMsg_DidDestroyOffscreenContext,
-                        OnDidDestroyOffscreenContext)
-    IPC_MESSAGE_HANDLER(GpuHostMsg_DestroyChannel, OnDestroyChannel)
-    IPC_MESSAGE_HANDLER(GpuHostMsg_CacheShader, OnCacheShader)
-#if defined(OS_WIN)
-    IPC_MESSAGE_HANDLER(GpuHostMsg_AcceleratedSurfaceCreatedChildWindow,
-                        OnAcceleratedSurfaceCreatedChildWindow)
-#endif
     IPC_MESSAGE_HANDLER(GpuHostMsg_FieldTrialActivated, OnFieldTrialActivated);
     IPC_MESSAGE_UNHANDLED(RouteOnUIThread(message))
   IPC_END_MESSAGE_MAP()
 
   return true;
 }
 
 #if defined(OS_WIN)
 void GpuProcessHost::OnAcceleratedSurfaceCreatedChildWindow(
     gpu::SurfaceHandle parent_handle,
@@ skipping 256 matching lines @@
   RecordProcessCrash();
 }
 
 void GpuProcessHost::OnProcessCrashed(int exit_code) {
   SendOutstandingReplies();
   RecordProcessCrash();
   GpuDataManagerImpl::GetInstance()->ProcessCrashed(
       process_->GetTerminationStatus(true /* known_dead */, NULL));
 }
 
+void GpuProcessHost::DidInitialize(const gpu::GPUInfo& gpu_info) {
+  // TODO(sad): This should call OnInitialized().
+}
+
+void GpuProcessHost::DidCreateOffscreenContext(const GURL& url) {
+  OnDidCreateOffscreenContext(url);

[sadrul, 2017/01/21 05:35:56]

Note that I have deliberately kept the old ipc-message handlers, and call into
those functions from these mojom callbacks. This is to make it clear that there
are no functional changes in this code. I plan to remove the old message-handler
functions, and move them into these callbacks in a no-op follow-on CL. If you
prefer that I do that in this CL, let me know.

+}
+
+void GpuProcessHost::DidDestroyOffscreenContext(const GURL& url) {
+  OnDidDestroyOffscreenContext(url);
+}
+
+void GpuProcessHost::DidDestroyChannel(int32_t client_id) {
+  OnDestroyChannel(client_id);
+}
+
+void GpuProcessHost::DidLoseContext(bool offscreen,
+                                    gpu::error::ContextLostReason reason,
+                                    const GURL& active_url) {
+  OnDidLoseContext(offscreen, reason, active_url);
+}
+
+void GpuProcessHost::SetChildSurface(gpu::SurfaceHandle parent,
+                                     gpu::SurfaceHandle child) {
+#if defined(OS_WIN)
+  OnAcceleratedSurfaceCreatedChildWindow(parent, child);
+#endif
+}
+
+void GpuProcessHost::StoreShaderToDisk(int32_t client_id,
+                                       const std::string& key,
+                                       const std::string& shader) {
+  OnCacheShader(client_id, key, shader);
+}
+
 GpuProcessHost::GpuProcessKind GpuProcessHost::kind() {
   return kind_;
 }
 
 void GpuProcessHost::ForceShutdown() {
   // This is only called on the IO thread so no race against the constructor
   // for another GpuProcessHost.
   if (g_gpu_process_hosts[kind_] == this)
     g_gpu_process_hosts[kind_] = NULL;
 
@@ skipping 234 matching lines @@
   TRACE_EVENT0("gpu", "GpuProcessHost::OnCacheShader");
   ClientIdToShaderCacheMap::iterator iter =
       client_id_to_shader_cache_.find(client_id);
   // If the cache doesn't exist then this is an off the record profile.
   if (iter == client_id_to_shader_cache_.end())
     return;
   iter->second->Cache(GetShaderPrefixKey(shader) + ":" + key, shader);
 }
 
 }  // namespace content