Remove GPU relinquish resources infrastructure and stop GPU process.

content/browser/gpu/gpu_process_host_ui_shim.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_ui_shim.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 42 matching lines @@
     LAZY_INSTANCE_INITIALIZER;
 
 void SendOnIOThreadTask(int host_id, IPC::Message* msg) {
   GpuProcessHost* host = GpuProcessHost::FromID(host_id);
   if (host)
     host->Send(msg);
   else
     delete msg;
 }
 
+void StopGpuProcessOnIO(int host_id) {
+  GpuProcessHost* host = GpuProcessHost::FromID(host_id);
+  if (host)
+    host->StopGpuProcess();
+}
+
 class ScopedSendOnIOThread {
  public:
   ScopedSendOnIOThread(int host_id, IPC::Message* msg)
       : host_id_(host_id),
         msg_(msg),
         cancelled_(false) {
   }
 
   ~ScopedSendOnIOThread() {
     if (!cancelled_) {
@@ skipping 112 matching lines @@
           ->OnMessageReceived(message))
     return true;
 #endif
 
   if (message.routing_id() != MSG_ROUTING_CONTROL)
     return false;
 
   return OnControlMessageReceived(message);
 }
 
-void GpuProcessHostUIShim::RelinquishGpuResources(
-    const base::Closure& callback) {
-  DCHECK(relinquish_callback_.is_null());
-  relinquish_callback_ = callback;
-  Send(new GpuMsg_RelinquishResources());
+void GpuProcessHostUIShim::StopGpuProcess(base::Closure callback) {
+  // TODO(derekjchow): Make this API pretty
+  close_callback_ = callback;
+
+  BrowserThread::PostTask(BrowserThread::IO,
+                          FROM_HERE,
+                          base::Bind(&StopGpuProcessOnIO,
+                                     host_id_));
 }
 
 void GpuProcessHostUIShim::SimulateRemoveAllContext() {
   Send(new GpuMsg_Clean());
 }
 
 void GpuProcessHostUIShim::SimulateCrash() {
   Send(new GpuMsg_Crash());
 }
 
 void GpuProcessHostUIShim::SimulateHang() {
   Send(new GpuMsg_Hang());
 }
 
 GpuProcessHostUIShim::~GpuProcessHostUIShim() {
   DCHECK(CalledOnValidThread());
+  if (!close_callback_.is_null())
+    base::ResetAndReturn(&close_callback_).Run();
   g_hosts_by_id.Pointer()->Remove(host_id_);
 }
 
 bool GpuProcessHostUIShim::OnControlMessageReceived(
     const IPC::Message& message) {
   DCHECK(CalledOnValidThread());
 
   IPC_BEGIN_MESSAGE_MAP(GpuProcessHostUIShim, message)
     IPC_MESSAGE_HANDLER(GpuHostMsg_OnLogMessage,
                         OnLogMessage)
     IPC_MESSAGE_HANDLER(GpuHostMsg_AcceleratedSurfaceInitialized,
                         OnAcceleratedSurfaceInitialized)
 #if defined(OS_MACOSX)
     IPC_MESSAGE_HANDLER(GpuHostMsg_AcceleratedSurfaceBuffersSwapped,
                         OnAcceleratedSurfaceBuffersSwapped)
 #endif
     IPC_MESSAGE_HANDLER(GpuHostMsg_GraphicsInfoCollected,
                         OnGraphicsInfoCollected)
     IPC_MESSAGE_HANDLER(GpuHostMsg_VideoMemoryUsageStats,
                         OnVideoMemoryUsageStatsReceived);
-    IPC_MESSAGE_HANDLER(GpuHostMsg_ResourcesRelinquished,
-                        OnResourcesRelinquished)
     IPC_MESSAGE_HANDLER(GpuHostMsg_AddSubscription, OnAddSubscription);
     IPC_MESSAGE_HANDLER(GpuHostMsg_RemoveSubscription, OnRemoveSubscription);
 
     IPC_MESSAGE_UNHANDLED_ERROR()
   IPC_END_MESSAGE_MAP()
 
   return true;
 }
 
 void GpuProcessHostUIShim::OnLogMessage(
@@ skipping 59 matching lines @@
   Send(new AcceleratedSurfaceMsg_BufferPresented(params.route_id, ack_params));
 }
 #endif
 
 void GpuProcessHostUIShim::OnVideoMemoryUsageStatsReceived(
     const GPUVideoMemoryUsageStats& video_memory_usage_stats) {
   GpuDataManagerImpl::GetInstance()->UpdateVideoMemoryUsageStats(
       video_memory_usage_stats);
 }
 
-void GpuProcessHostUIShim::OnResourcesRelinquished() {
-  if (!relinquish_callback_.is_null()) {
-    base::ResetAndReturn(&relinquish_callback_).Run();
-  }
-}
-
 void GpuProcessHostUIShim::OnAddSubscription(
     int32 process_id, unsigned int target) {
   RenderProcessHost* rph = RenderProcessHost::FromID(process_id);
   if (rph) {
     rph->OnAddSubscription(target);
   }
 }
 
 void GpuProcessHostUIShim::OnRemoveSubscription(
     int32 process_id, unsigned int target) {
   RenderProcessHost* rph = RenderProcessHost::FromID(process_id);
   if (rph) {
     rph->OnRemoveSubscription(target);
   }
 }
 
 }  // namespace content