Move WakeUpGpu logic to GpuChannelManager

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 48 matching lines @@
   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_) {
-      BrowserThread::PostTask(BrowserThread::IO,
-                              FROM_HERE,
-                              base::Bind(&SendOnIOThreadTask,
-                                         host_id_,
-                                         msg_.release()));
-    }
-  }
-
-  void Cancel() { cancelled_ = true; }
-
- private:
-  int host_id_;
-  scoped_ptr<IPC::Message> msg_;
-  bool cancelled_;
-};
-
-RenderWidgetHostViewBase* GetRenderWidgetHostViewFromSurfaceID(
-    int surface_id) {
-  int render_process_id = 0;
-  int render_widget_id = 0;
-  if (!GpuSurfaceTracker::Get()->GetRenderWidgetIDForSurface(
-        surface_id, &render_process_id, &render_widget_id))
-    return NULL;
-
-  RenderWidgetHost* host =
-      RenderWidgetHost::FromID(render_process_id, render_widget_id);
-  return host ? static_cast<RenderWidgetHostViewBase*>(host->GetView()) : NULL;
-}
-
 }  // namespace
 
 void RouteToGpuProcessHostUIShimTask(int host_id, const IPC::Message& msg) {
   GpuProcessHostUIShim* ui_shim = GpuProcessHostUIShim::FromID(host_id);
   if (ui_shim)
     ui_shim->OnMessageReceived(msg);
 }
 
 GpuProcessHostUIShim::GpuProcessHostUIShim(int host_id)
     : host_id_(host_id) {
@@ skipping 106 matching lines @@
   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_AddSubscription, OnAddSubscription);
     IPC_MESSAGE_HANDLER(GpuHostMsg_RemoveSubscription, OnRemoveSubscription);
@@ skipping 14 matching lines @@
 
 void GpuProcessHostUIShim::OnGraphicsInfoCollected(
     const gpu::GPUInfo& gpu_info) {
   // OnGraphicsInfoCollected is sent back after the GPU process successfully
   // initializes GL.
   TRACE_EVENT0("test_gpu", "OnGraphicsInfoCollected");
 
   GpuDataManagerImpl::GetInstance()->UpdateGpuInfo(gpu_info);
 }
 
-void GpuProcessHostUIShim::OnAcceleratedSurfaceInitialized(int32 surface_id,
-                                                           int32 route_id) {
-  RenderWidgetHostViewBase* view =
-      GetRenderWidgetHostViewFromSurfaceID(surface_id);
-  if (!view)
-    return;
-  view->AcceleratedSurfaceInitialized(route_id);
-}
-
 #if defined(OS_MACOSX)
 void GpuProcessHostUIShim::OnAcceleratedSurfaceBuffersSwapped(
     const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params) {
   TRACE_EVENT0("renderer",
       "GpuProcessHostUIShim::OnAcceleratedSurfaceBuffersSwapped");
   if (!ui::LatencyInfo::Verify(params.latency_info,
                                "GpuHostMsg_AcceleratedSurfaceBuffersSwapped")) {
     return;
   }
 
@@ skipping 41 matching lines @@
 
 void GpuProcessHostUIShim::OnRemoveSubscription(
     int32 process_id, unsigned int target) {
   RenderProcessHost* rph = RenderProcessHost::FromID(process_id);
   if (rph) {
     rph->OnRemoveSubscription(target);
   }
 }
 
 }  // namespace content