Revert 110626 - Reland 110355 - Use shared D3D9 texture to transport the compositor's backing buf...

content/browser/renderer_host/render_widget_host_view_aura.cc

Index: content/browser/renderer_host/render_widget_host_view_aura.cc
===================================================================
--- content/browser/renderer_host/render_widget_host_view_aura.cc	(revision 110637)
+++ content/browser/renderer_host/render_widget_host_view_aura.cc	(working copy)
@@ -285,33 +285,7 @@
 
 void RenderWidgetHostViewAura::OnAcceleratedCompositingStateChange() {
 }
-void RenderWidgetHostViewAura::AcceleratedSurfaceBuffersSwapped(
-      const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params,
-      int gpu_host_id) {
-#if defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
-  window_->layer()->SetExternalTexture(
-      accelerated_surface_containers_[params.surface_id]->GetTexture());
-  glFlush();
 
-  if (!window_->layer()->GetCompositor()) {
-    // We have no compositor, so we have no way to display the surface
-    // Must still send the ACK.
-    AcknowledgeSwapBuffers(params.route_id, gpu_host_id);
-  } else {
-    window_->layer()->ScheduleDraw();
-
-    // Add sending an ACK to the list of things to do OnCompositingEnded
-    on_compositing_ended_callbacks_.push_back(
-        base::Bind(AcknowledgeSwapBuffers, params.route_id, gpu_host_id));
-    ui::Compositor* compositor = window_->layer()->GetCompositor();
-    if (!compositor->HasObserver(this))
-      compositor->AddObserver(this);
-  }
-#else
-  NOTREACHED();
-#endif
-}
-
 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
 void RenderWidgetHostViewAura::AcceleratedSurfaceNew(
       int32 width,
@@ -329,6 +303,29 @@
   accelerated_surface_containers_[*surface_id] = surface;
 }
 
+void RenderWidgetHostViewAura::AcceleratedSurfaceBuffersSwapped(
+      uint64 surface_id,
+      int32 route_id,
+      int gpu_host_id) {
+  window_->layer()->SetExternalTexture(
+      accelerated_surface_containers_[surface_id]->GetTexture());
+  glFlush();
+
+  if (!window_->layer()->GetCompositor()) {
+    // We have no compositor, so we have no way to display the surface
+    AcknowledgeSwapBuffers(route_id, gpu_host_id);  // Must still send the ACK
+  } else {
+    window_->layer()->ScheduleDraw();
+
+    // Add sending an ACK to the list of things to do OnCompositingEnded
+    on_compositing_ended_callbacks_.push_back(
+        base::Bind(AcknowledgeSwapBuffers, route_id, gpu_host_id));
+    ui::Compositor* compositor = window_->layer()->GetCompositor();
+    if (!compositor->HasObserver(this))
+      compositor->AddObserver(this);
+  }
+}
+
 void RenderWidgetHostViewAura::AcceleratedSurfaceRelease(uint64 surface_id) {
   accelerated_surface_containers_.erase(surface_id);
 }