Remove TextureImageTransportSurface

There is a lot of unreached image transport code due to
- TextureImageTransportSurface actually being unused
as a transport surface now (we either use delegated rendering
or composite-to-mailbox)
- Mac using delegated rendering

TBR=sky@chromium.org

Review URL: https://codereview.chromium.org/615503004

Cr-Commit-Position: refs/heads/master@{#297490}

2 files changed, 17 insertions, 108 deletions

diff --git a/content/browser/gpu/gpu_process_host_ui_shim.cc b/content/browser/gpu/gpu_process_host_ui_shim.cc
index 741368f..36e3986 100644
--- a/content/browser/gpu/gpu_process_host_ui_shim.cc
+++ b/content/browser/gpu/gpu_process_host_ui_shim.cc
@@ -204,19 +204,12 @@ bool GpuProcessHostUIShim::OnControlMessageReceived(
   IPC_BEGIN_MESSAGE_MAP(GpuProcessHostUIShim, message)
     IPC_MESSAGE_HANDLER(GpuHostMsg_OnLogMessage,
                         OnLogMessage)
-
     IPC_MESSAGE_HANDLER(GpuHostMsg_AcceleratedSurfaceInitialized,
                         OnAcceleratedSurfaceInitialized)
     IPC_MESSAGE_HANDLER(GpuHostMsg_AcceleratedSurfaceBuffersSwapped,
                         OnAcceleratedSurfaceBuffersSwapped)
-    IPC_MESSAGE_HANDLER(GpuHostMsg_AcceleratedSurfacePostSubBuffer,
-                        OnAcceleratedSurfacePostSubBuffer)
-    IPC_MESSAGE_HANDLER(GpuHostMsg_AcceleratedSurfaceSuspend,
-                        OnAcceleratedSurfaceSuspend)
     IPC_MESSAGE_HANDLER(GpuHostMsg_GraphicsInfoCollected,
                         OnGraphicsInfoCollected)
-    IPC_MESSAGE_HANDLER(GpuHostMsg_AcceleratedSurfaceRelease,
-                        OnAcceleratedSurfaceRelease)
     IPC_MESSAGE_HANDLER(GpuHostMsg_VideoMemoryUsageStats,
                         OnVideoMemoryUsageStatsReceived);
     IPC_MESSAGE_HANDLER(GpuHostMsg_FrameDrawn, OnFrameDrawn)
@@ -250,57 +243,35 @@ void GpuProcessHostUIShim::OnAcceleratedSurfaceInitialized(int32 surface_id,
       GetRenderWidgetHostViewFromSurfaceID(surface_id);
   if (!view)
     return;
-  view->AcceleratedSurfaceInitialized(host_id_, route_id);
+  view->AcceleratedSurfaceInitialized(route_id);
 }
 
 void GpuProcessHostUIShim::OnAcceleratedSurfaceBuffersSwapped(
     const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params) {
+#if defined(OS_MACOSX)
   TRACE_EVENT0("renderer",
       "GpuProcessHostUIShim::OnAcceleratedSurfaceBuffersSwapped");
   if (!ui::LatencyInfo::Verify(params.latency_info,
-                               "GpuHostMsg_AcceleratedSurfaceBuffersSwapped"))
+                               "GpuHostMsg_AcceleratedSurfaceBuffersSwapped")) {
     return;
+  }
 
-#if defined(OS_MACOSX)
   // On Mac with delegated rendering, accelerated surfaces are not necessarily
   // associated with a RenderWidgetHostViewBase.
-  if (IsDelegatedRendererEnabled()) {
-    gfx::AcceleratedWidget native_widget =
-        content::GpuSurfaceTracker::Get()->AcquireNativeWidget(
-            params.surface_id);
-    BrowserCompositorViewMac::GotAcceleratedFrame(
-        native_widget, params.surface_handle, params.surface_id,
-        params.latency_info, params.size, params.scale_factor,
-        host_id_, params.route_id);
-    return;
-  }
+  DCHECK(IsDelegatedRendererEnabled());
+  gfx::AcceleratedWidget native_widget =
+      content::GpuSurfaceTracker::Get()->AcquireNativeWidget(params.surface_id);
+  BrowserCompositorViewMac::GotAcceleratedFrame(native_widget,
+                                                params.surface_handle,
+                                                params.surface_id,
+                                                params.latency_info,
+                                                params.size,
+                                                params.scale_factor,
+                                                host_id_,
+                                                params.route_id);
+#else
+  NOTREACHED();
 #endif
-
-  AcceleratedSurfaceMsg_BufferPresented_Params ack_params;
-  ack_params.mailbox = params.mailbox;
-  ack_params.sync_point = 0;
-  ScopedSendOnIOThread delayed_send(
-      host_id_,
-      new AcceleratedSurfaceMsg_BufferPresented(params.route_id,
-                                                ack_params));
-
-  RenderWidgetHostViewBase* view = GetRenderWidgetHostViewFromSurfaceID(
-      params.surface_id);
-  if (!view)
-    return;
-
-  delayed_send.Cancel();
-
-  GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params view_params = params;
-
-  RenderWidgetHostImpl* impl =
-      RenderWidgetHostImpl::From(view->GetRenderWidgetHost());
-  for (size_t i = 0; i < view_params.latency_info.size(); i++)
-    impl->AddLatencyInfoComponentIds(&view_params.latency_info[i]);
-
-  // View must send ACK message after next composite.
-  view->AcceleratedSurfaceBuffersSwapped(view_params, host_id_);
-  view->DidReceiveRendererFrame();
 }
 
 void GpuProcessHostUIShim::OnFrameDrawn(
@@ -311,61 +282,6 @@ void GpuProcessHostUIShim::OnFrameDrawn(
   RenderWidgetHostImpl::CompositorFrameDrawn(latency_info);
 }
 
-void GpuProcessHostUIShim::OnAcceleratedSurfacePostSubBuffer(
-    const GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params& params) {
-  TRACE_EVENT0("renderer",
-      "GpuProcessHostUIShim::OnAcceleratedSurfacePostSubBuffer");
-  if (!ui::LatencyInfo::Verify(params.latency_info,
-                               "GpuHostMsg_AcceleratedSurfacePostSubBuffer"))
-    return;
-  AcceleratedSurfaceMsg_BufferPresented_Params ack_params;
-  ack_params.mailbox = params.mailbox;
-  ack_params.sync_point = 0;
-  ScopedSendOnIOThread delayed_send(
-      host_id_,
-      new AcceleratedSurfaceMsg_BufferPresented(params.route_id,
-                                                ack_params));
-
-  RenderWidgetHostViewBase* view =
-      GetRenderWidgetHostViewFromSurfaceID(params.surface_id);
-  if (!view)
-    return;
-
-  delayed_send.Cancel();
-
-  GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params view_params = params;
-
-  RenderWidgetHostImpl* impl =
-      RenderWidgetHostImpl::From(view->GetRenderWidgetHost());
-  for (size_t i = 0; i < view_params.latency_info.size(); i++)
-    impl->AddLatencyInfoComponentIds(&view_params.latency_info[i]);
-
-  // View must send ACK message after next composite.
-  view->AcceleratedSurfacePostSubBuffer(view_params, host_id_);
-  view->DidReceiveRendererFrame();
-}
-
-void GpuProcessHostUIShim::OnAcceleratedSurfaceSuspend(int32 surface_id) {
-  TRACE_EVENT0("renderer",
-      "GpuProcessHostUIShim::OnAcceleratedSurfaceSuspend");
-
-  RenderWidgetHostViewBase* view =
-      GetRenderWidgetHostViewFromSurfaceID(surface_id);
-  if (!view)
-    return;
-
-  view->AcceleratedSurfaceSuspend();
-}
-
-void GpuProcessHostUIShim::OnAcceleratedSurfaceRelease(
-    const GpuHostMsg_AcceleratedSurfaceRelease_Params& params) {
-  RenderWidgetHostViewBase* view = GetRenderWidgetHostViewFromSurfaceID(
-      params.surface_id);
-  if (!view)
-    return;
-  view->AcceleratedSurfaceRelease();
-}
-
 void GpuProcessHostUIShim::OnVideoMemoryUsageStatsReceived(
     const GPUVideoMemoryUsageStats& video_memory_usage_stats) {
   GpuDataManagerImpl::GetInstance()->UpdateVideoMemoryUsageStats(
diff --git a/content/browser/gpu/gpu_process_host_ui_shim.h b/content/browser/gpu/gpu_process_host_ui_shim.h
index a00adde..d5f55e9 100644
--- a/content/browser/gpu/gpu_process_host_ui_shim.h
+++ b/content/browser/gpu/gpu_process_host_ui_shim.h
@@ -25,8 +25,6 @@
 #include "ipc/ipc_sender.h"
 
 struct GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params;
-struct GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params;
-struct GpuHostMsg_AcceleratedSurfaceRelease_Params;
 
 namespace ui {
 struct LatencyInfo;
@@ -93,11 +91,6 @@ class GpuProcessHostUIShim : public IPC::Listener,
   void OnAcceleratedSurfaceInitialized(int32 surface_id, int32 route_id);
   void OnAcceleratedSurfaceBuffersSwapped(
       const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params);
-  void OnAcceleratedSurfacePostSubBuffer(
-      const GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params& params);
-  void OnAcceleratedSurfaceSuspend(int32 surface_id);
-  void OnAcceleratedSurfaceRelease(
-      const GpuHostMsg_AcceleratedSurfaceRelease_Params& params);
   void OnVideoMemoryUsageStatsReceived(
       const GPUVideoMemoryUsageStats& video_memory_usage_stats);
   void OnFrameDrawn(const std::vector<ui::LatencyInfo>& latency_info);