RefCounted types should not have public destructors, content/browser part 2

content/common/gpu/image_transport_surface.cc

Index: content/common/gpu/image_transport_surface.cc
diff --git a/content/common/gpu/image_transport_surface.cc b/content/common/gpu/image_transport_surface.cc
index 6601637950ff48ccb058d56cb2244dc98df90ee8..e1fadf609f1e54d800bee89b96fe1f0ebacfd490 100644
--- a/content/common/gpu/image_transport_surface.cc
+++ b/content/common/gpu/image_transport_surface.cc
@@ -17,11 +17,9 @@
 #include "gpu/command_buffer/service/gpu_scheduler.h"
 #include "ui/gfx/gl/gl_switches.h"
 
-ImageTransportSurface::ImageTransportSurface() {
-}
+ImageTransportSurface::ImageTransportSurface() {}
 
-ImageTransportSurface::~ImageTransportSurface() {
-}
+ImageTransportSurface::~ImageTransportSurface() {}
 
 void ImageTransportSurface::GetRegionsToCopy(
     const gfx::Rect& previous_damage_rect,
@@ -87,8 +85,7 @@ bool ImageTransportHelper::Initialize() {
   return true;
 }
 
-void ImageTransportHelper::Destroy() {
-}
+void ImageTransportHelper::Destroy() {}
 
 bool ImageTransportHelper::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
@@ -105,13 +102,6 @@ bool ImageTransportHelper::OnMessageReceived(const IPC::Message& message) {
   return handled;
 }
 
-void ImageTransportHelper::SendAcceleratedSurfaceRelease(
-    GpuHostMsg_AcceleratedSurfaceRelease_Params params) {
-  params.surface_id = stub_->surface_id();
-  params.route_id = route_id_;
-  manager_->Send(new GpuHostMsg_AcceleratedSurfaceRelease(params));
-}
-
 void ImageTransportHelper::SendAcceleratedSurfaceNew(
     GpuHostMsg_AcceleratedSurfaceNew_Params params) {
   params.surface_id = stub_->surface_id();
@@ -142,6 +132,13 @@ void ImageTransportHelper::SendAcceleratedSurfacePostSubBuffer(
   manager_->Send(new GpuHostMsg_AcceleratedSurfacePostSubBuffer(params));
 }
 
+void ImageTransportHelper::SendAcceleratedSurfaceRelease(
+    GpuHostMsg_AcceleratedSurfaceRelease_Params params) {
+  params.surface_id = stub_->surface_id();
+  params.route_id = route_id_;
+  manager_->Send(new GpuHostMsg_AcceleratedSurfaceRelease(params));
+}
+
 void ImageTransportHelper::SendResizeView(const gfx::Size& size) {
   manager_->Send(new GpuHostMsg_ResizeView(stub_->surface_id(),
                                            route_id_,
@@ -168,12 +165,34 @@ void ImageTransportHelper::DeferToFence(base::Closure task) {
   scheduler->DeferToFence(task);
 }
 
-void ImageTransportHelper::OnBuffersSwappedACK() {
-  surface_->OnBuffersSwappedACK();
+bool ImageTransportHelper::MakeCurrent() {
+  gpu::gles2::GLES2Decoder* decoder = Decoder();
+  if (!decoder)
+    return false;
+  return decoder->MakeCurrent();
 }
 
-void ImageTransportHelper::OnPostSubBufferACK() {
-  surface_->OnPostSubBufferACK();
+void ImageTransportHelper::SetSwapInterval() {
+  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableGpuVsync))
+    Decoder()->GetGLContext()->SetSwapInterval(0);
+  else
+    Decoder()->GetGLContext()->SetSwapInterval(1);
+}
+
+void ImageTransportHelper::Suspend() {
+  manager_->Send(new GpuHostMsg_AcceleratedSurfaceSuspend(stub_->surface_id()));
+}
+
+gpu::GpuScheduler* ImageTransportHelper::Scheduler() {
+  if (!stub_.get())
+    return NULL;
+  return stub_->scheduler();
+}
+
+gpu::gles2::GLES2Decoder* ImageTransportHelper::Decoder() {
+  if (!stub_.get())
+    return NULL;
+  return stub_->decoder();
 }
 
 void ImageTransportHelper::OnNewSurfaceACK(
@@ -182,6 +201,14 @@ void ImageTransportHelper::OnNewSurfaceACK(
   surface_->OnNewSurfaceACK(surface_handle, shm_handle);
 }
 
+void ImageTransportHelper::OnBuffersSwappedACK() {
+  surface_->OnBuffersSwappedACK();
+}
+
+void ImageTransportHelper::OnPostSubBufferACK() {
+  surface_->OnPostSubBufferACK();
+}
+
 void ImageTransportHelper::OnResizeViewACK() {
   surface_->OnResizeViewACK();
 }
@@ -203,36 +230,6 @@ void ImageTransportHelper::Resize(gfx::Size size) {
 #endif
 }
 
-void ImageTransportHelper::SetSwapInterval() {
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableGpuVsync))
-    Decoder()->GetGLContext()->SetSwapInterval(0);
-  else
-    Decoder()->GetGLContext()->SetSwapInterval(1);
-}
-
-bool ImageTransportHelper::MakeCurrent() {
-  gpu::gles2::GLES2Decoder* decoder = Decoder();
-  if (!decoder)
-    return false;
-  return decoder->MakeCurrent();
-}
-
-void ImageTransportHelper::Suspend() {
-  manager_->Send(new GpuHostMsg_AcceleratedSurfaceSuspend(stub_->surface_id()));
-}
-
-gpu::GpuScheduler* ImageTransportHelper::Scheduler() {
-  if (!stub_.get())
-    return NULL;
-  return stub_->scheduler();
-}
-
-gpu::gles2::GLES2Decoder* ImageTransportHelper::Decoder() {
-  if (!stub_.get())
-    return NULL;
-  return stub_->decoder();
-}
-
 PassThroughImageTransportSurface::PassThroughImageTransportSurface(
     GpuChannelManager* manager,
     GpuCommandBufferStub* stub,
@@ -247,9 +244,6 @@ PassThroughImageTransportSurface::PassThroughImageTransportSurface(
                                          gfx::kNullPluginWindow));
 }
 
-PassThroughImageTransportSurface::~PassThroughImageTransportSurface() {
-}
-
 bool PassThroughImageTransportSurface::Initialize() {
   // The surface is assumed to have already been initialized.
   return helper_->Initialize();
@@ -260,10 +254,6 @@ void PassThroughImageTransportSurface::Destroy() {
   GLSurfaceAdapter::Destroy();
 }
 
-void PassThroughImageTransportSurface::OnNewSurfaceACK(
-    uint64 surface_handle, TransportDIB::Handle shm_handle) {
-}
-
 bool PassThroughImageTransportSurface::SwapBuffers() {
   bool result = gfx::GLSurfaceAdapter::SwapBuffers();
 
@@ -310,6 +300,11 @@ bool PassThroughImageTransportSurface::OnMakeCurrent(gfx::GLContext* context) {
   return true;
 }
 
+void PassThroughImageTransportSurface::OnNewSurfaceACK(
+    uint64 surface_handle,
+    TransportDIB::Handle shm_handle) {
+}
+
 void PassThroughImageTransportSurface::OnBuffersSwappedACK() {
   DCHECK(transport_);
   helper_->SetScheduled(true);
@@ -338,4 +333,6 @@ void PassThroughImageTransportSurface::OnResize(gfx::Size size) {
   }
 }
 
+PassThroughImageTransportSurface::~PassThroughImageTransportSurface() {}
+
 #endif  // defined(ENABLE_GPU)