Rename uses of GPUPlugin in class names and IPC to AcceleratedSurface.

BUG=none
TEST=Purely cleanup, no functional changes.
Review URL: http://codereview.chromium.org/855003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41435 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 62 insertions, 59 deletions

diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 12394b2..f726243 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -4615,23 +4615,25 @@ void RenderView::DestroyFakePluginWindowHandle(gfx::PluginWindowHandle window) {
     Send(new ViewHostMsg_DestroyFakePluginWindowHandle(routing_id(), window));
 }
 
-void RenderView::GPUPluginSetIOSurface(gfx::PluginWindowHandle window,
-                                       int32 width,
-                                       int32 height,
-                                       uint64 io_surface_identifier) {
-  Send(new ViewHostMsg_GPUPluginSetIOSurface(
+void RenderView::AcceleratedSurfaceSetIOSurface(gfx::PluginWindowHandle window,
+                                                int32 width,
+                                                int32 height,
+                                                uint64 io_surface_identifier) {
+  Send(new ViewHostMsg_AcceleratedSurfaceSetIOSurface(
       routing_id(), window, width, height, io_surface_identifier));
 }
 
-void RenderView::GPUPluginSetTransportDIB(gfx::PluginWindowHandle window,
-                                          int32 width,
-                                          int32 height,
-                                          TransportDIB::Handle transport_dib) {
-  Send(new ViewHostMsg_GPUPluginSetTransportDIB(
+void RenderView::AcceleratedSurfaceSetTransportDIB(
+    gfx::PluginWindowHandle window,
+    int32 width,
+    int32 height,
+    TransportDIB::Handle transport_dib) {
+  Send(new ViewHostMsg_AcceleratedSurfaceSetTransportDIB(
       routing_id(), window, width, height, transport_dib));
 }
 
-TransportDIB::Handle RenderView::GPUPluginAllocTransportDIB(size_t size) {
+TransportDIB::Handle RenderView::AcceleratedSurfaceAllocTransportDIB(
+    size_t size) {
   TransportDIB::Handle dib_handle;
   // Assume this is a synchronous RPC.
   if (Send(new ViewHostMsg_AllocTransportDIB(size, &dib_handle)))
@@ -4640,12 +4642,13 @@ TransportDIB::Handle RenderView::GPUPluginAllocTransportDIB(size_t size) {
   return TransportDIB::DefaultHandleValue();
 }
 
-void RenderView::GPUPluginFreeTransportDIB(TransportDIB::Id dib_id) {
+void RenderView::AcceleratedSurfaceFreeTransportDIB(TransportDIB::Id dib_id) {
   Send(new ViewHostMsg_FreeTransportDIB(dib_id));
 }
 
-void RenderView::GPUPluginBuffersSwapped(gfx::PluginWindowHandle window) {
-  Send(new ViewHostMsg_GPUPluginBuffersSwapped(routing_id(), window));
+void RenderView::AcceleratedSurfaceBuffersSwapped(
+    gfx::PluginWindowHandle window) {
+  Send(new ViewHostMsg_AcceleratedSurfaceBuffersSwapped(routing_id(), window));
 }
 #endif
 
diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
index d32ce57..0cfc4d1 100644
--- a/chrome/renderer/render_view.h
+++ b/chrome/renderer/render_view.h
@@ -483,17 +483,17 @@ class RenderView : public RenderWidget,
   // WebPluginDelegateProxy, which has a pointer to the RenderView.
   gfx::PluginWindowHandle AllocateFakePluginWindowHandle();
   void DestroyFakePluginWindowHandle(gfx::PluginWindowHandle window);
-  void GPUPluginSetIOSurface(gfx::PluginWindowHandle window,
-                             int32 width,
-                             int32 height,
-                             uint64 io_surface_identifier);
-  TransportDIB::Handle GPUPluginAllocTransportDIB(size_t size);
-  void GPUPluginFreeTransportDIB(TransportDIB::Id dib_id);
-  void GPUPluginSetTransportDIB(gfx::PluginWindowHandle window,
-                                int32 width,
-                                int32 height,
-                                TransportDIB::Handle transport_dib);
-  void GPUPluginBuffersSwapped(gfx::PluginWindowHandle window);
+  void AcceleratedSurfaceSetIOSurface(gfx::PluginWindowHandle window,
+                                      int32 width,
+                                      int32 height,
+                                      uint64 io_surface_identifier);
+  TransportDIB::Handle AcceleratedSurfaceAllocTransportDIB(size_t size);
+  void AcceleratedSurfaceFreeTransportDIB(TransportDIB::Id dib_id);
+  void AcceleratedSurfaceSetTransportDIB(gfx::PluginWindowHandle window,
+                                         int32 width,
+                                         int32 height,
+                                         TransportDIB::Handle transport_dib);
+  void AcceleratedSurfaceBuffersSwapped(gfx::PluginWindowHandle window);
 #endif
 
  protected:
diff --git a/chrome/renderer/webplugin_delegate_proxy.cc b/chrome/renderer/webplugin_delegate_proxy.cc
index 532d26f..5c51b35 100644
--- a/chrome/renderer/webplugin_delegate_proxy.cc
+++ b/chrome/renderer/webplugin_delegate_proxy.cc
@@ -407,17 +407,17 @@ void WebPluginDelegateProxy::OnMessageReceived(const IPC::Message& msg) {
     IPC_MESSAGE_HANDLER(PluginHostMsg_UpdateGeometry_ACK,
                         OnUpdateGeometry_ACK)
     // Used only on 10.6 and later.
-    IPC_MESSAGE_HANDLER(PluginHostMsg_GPUPluginSetIOSurface,
-                        OnGPUPluginSetIOSurface)
+    IPC_MESSAGE_HANDLER(PluginHostMsg_AcceleratedSurfaceSetIOSurface,
+                        OnAcceleratedSurfaceSetIOSurface)
     // Used on 10.5 and earlier.
-    IPC_MESSAGE_HANDLER(PluginHostMsg_GPUPluginSetTransportDIB,
-                        OnGPUPluginSetTransportDIB)
+    IPC_MESSAGE_HANDLER(PluginHostMsg_AcceleratedSurfaceSetTransportDIB,
+                        OnAcceleratedSurfaceSetTransportDIB)
     IPC_MESSAGE_HANDLER(PluginHostMsg_AllocTransportDIB,
-                        OnGPUPluginAllocTransportDIB)
+                        OnAcceleratedSurfaceAllocTransportDIB)
     IPC_MESSAGE_HANDLER(PluginHostMsg_FreeTransportDIB,
-                        OnGPUPluginFreeTransportDIB)
-    IPC_MESSAGE_HANDLER(PluginHostMsg_GPUPluginBuffersSwapped,
-                        OnGPUPluginBuffersSwapped)
+                        OnAcceleratedSurfaceFreeTransportDIB)
+    IPC_MESSAGE_HANDLER(PluginHostMsg_AcceleratedSurfaceBuffersSwapped,
+                        OnAcceleratedSurfaceBuffersSwapped)
 #endif
 
     IPC_MESSAGE_UNHANDLED_ERROR()
@@ -1275,8 +1275,8 @@ bool WebPluginDelegateProxy::BindFakePluginWindowHandle() {
   if (!fake_window)
     return false;
   OnSetWindow(fake_window);
-  if (!Send(new PluginMsg_SetFakeGPUPluginWindowHandle(instance_id_,
-                                                       fake_window))) {
+  if (!Send(new PluginMsg_SetFakeAcceleratedSurfaceWindowHandle(instance_id_,
+                                                                fake_window))) {
     return false;
   }
 
@@ -1367,44 +1367,44 @@ void WebPluginDelegateProxy::OnUpdateGeometry_ACK(int ack_key) {
   old_transport_dibs_.erase(iterator);
 }
 
-void WebPluginDelegateProxy::OnGPUPluginSetIOSurface(
+void WebPluginDelegateProxy::OnAcceleratedSurfaceSetIOSurface(
     gfx::PluginWindowHandle window,
     int32 width,
     int32 height,
     uint64 io_surface_identifier) {
   if (render_view_)
-    render_view_->GPUPluginSetIOSurface(window, width, height,
-                                        io_surface_identifier);
+    render_view_->AcceleratedSurfaceSetIOSurface(window, width, height,
+                                                 io_surface_identifier);
 }
 
-void WebPluginDelegateProxy::OnGPUPluginSetTransportDIB(
+void WebPluginDelegateProxy::OnAcceleratedSurfaceSetTransportDIB(
     gfx::PluginWindowHandle window,
     int32 width,
     int32 height,
     TransportDIB::Handle transport_dib) {
   if (render_view_)
-    render_view_->GPUPluginSetTransportDIB(window, width, height,
-                                           transport_dib);
+    render_view_->AcceleratedSurfaceSetTransportDIB(window, width, height,
+                                                    transport_dib);
 }
 
-void WebPluginDelegateProxy::OnGPUPluginAllocTransportDIB(
+void WebPluginDelegateProxy::OnAcceleratedSurfaceAllocTransportDIB(
     size_t size,
     TransportDIB::Handle* dib_handle) {
   if (render_view_)
-    *dib_handle = render_view_->GPUPluginAllocTransportDIB(size);
+    *dib_handle = render_view_->AcceleratedSurfaceAllocTransportDIB(size);
   else
     *dib_handle = TransportDIB::DefaultHandleValue();
 }
 
-void WebPluginDelegateProxy::OnGPUPluginFreeTransportDIB(
+void WebPluginDelegateProxy::OnAcceleratedSurfaceFreeTransportDIB(
     TransportDIB::Id dib_id) {
   if (render_view_)
-    render_view_->GPUPluginFreeTransportDIB(dib_id);
+    render_view_->AcceleratedSurfaceFreeTransportDIB(dib_id);
 }
 
-void WebPluginDelegateProxy::OnGPUPluginBuffersSwapped(
+void WebPluginDelegateProxy::OnAcceleratedSurfaceBuffersSwapped(
     gfx::PluginWindowHandle window) {
   if (render_view_)
-    render_view_->GPUPluginBuffersSwapped(window);
+    render_view_->AcceleratedSurfaceBuffersSwapped(window);
 }
 #endif
diff --git a/chrome/renderer/webplugin_delegate_proxy.h b/chrome/renderer/webplugin_delegate_proxy.h
index cdeb62a..71b7b6f 100644
--- a/chrome/renderer/webplugin_delegate_proxy.h
+++ b/chrome/renderer/webplugin_delegate_proxy.h
@@ -151,18 +151,18 @@ class WebPluginDelegateProxy
 #if defined(OS_MACOSX)
   void OnBindFakePluginWindowHandle();
   void OnUpdateGeometry_ACK(int ack_key);
-  void OnGPUPluginSetIOSurface(gfx::PluginWindowHandle window,
-                               int32 width,
-                               int32 height,
-                               uint64 io_surface_identifier);
-  void OnGPUPluginSetTransportDIB(gfx::PluginWindowHandle window,
-                                  int32 width,
-                                  int32 height,
-                                  TransportDIB::Handle transport_dib);
-  void OnGPUPluginAllocTransportDIB(size_t size,
-                                    TransportDIB::Handle* dib_handle);
-  void OnGPUPluginFreeTransportDIB(TransportDIB::Id dib_id);
-  void OnGPUPluginBuffersSwapped(gfx::PluginWindowHandle window);
+  void OnAcceleratedSurfaceSetIOSurface(gfx::PluginWindowHandle window,
+                                        int32 width,
+                                        int32 height,
+                                        uint64 io_surface_identifier);
+  void OnAcceleratedSurfaceSetTransportDIB(gfx::PluginWindowHandle window,
+                                           int32 width,
+                                           int32 height,
+                                           TransportDIB::Handle transport_dib);
+  void OnAcceleratedSurfaceAllocTransportDIB(size_t size,
+                                             TransportDIB::Handle* dib_handle);
+  void OnAcceleratedSurfaceFreeTransportDIB(TransportDIB::Id dib_id);
+  void OnAcceleratedSurfaceBuffersSwapped(gfx::PluginWindowHandle window);
 #endif
 
   // Draw a graphic indicating a crashed plugin.