Reland 110355 - Use shared D3D9 texture to transport the compositor's backing buffer to the brows...

chrome/browser/renderer_host/render_widget_host_view_views.cc

 // Copyright (c) 2011 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 "chrome/browser/renderer_host/render_widget_host_view_views.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 1125 matching lines @@
   *surface_handle = surface->Handle();
 
   accelerated_surface_containers_[*surface_id] = surface;
 }
 
 void RenderWidgetHostViewViews::AcceleratedSurfaceRelease(uint64 surface_id) {
   accelerated_surface_containers_.erase(surface_id);
 }
 
 void RenderWidgetHostViewViews::AcceleratedSurfaceBuffersSwapped(
-    uint64 surface_id,
-    int32 route_id,
+    const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params,
     int gpu_host_id) {
-  SetExternalTexture(accelerated_surface_containers_[surface_id]->GetTexture());
+  SetExternalTexture(
+      accelerated_surface_containers_[params.surface_id]->GetTexture());
   glFlush();
 
   if (!GetWidget() || !GetWidget()->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
+    // Must still send the ACK
+    AcknowledgeSwapBuffers(params.route_id, gpu_host_id);
   } else {
     // 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));
+        base::Bind(AcknowledgeSwapBuffers, params.route_id, gpu_host_id));
     ui::Compositor *compositor = GetWidget()->GetCompositor();
     if (!compositor->HasObserver(this))
       compositor->AddObserver(this);
   }
 }
 
 void RenderWidgetHostViewViews::OnCompositingEnded(ui::Compositor* compositor) {
   for (std::vector< base::Callback<void(void)> >::const_iterator
       it = on_compositing_ended_callbacks_.begin();
       it != on_compositing_ended_callbacks_.end(); ++it) {
     it->Run();
   }
   on_compositing_ended_callbacks_.clear();
   compositor->RemoveObserver(this);
 }
 
+#else
+
+void RenderWidgetHostViewViews::AcceleratedSurfaceBuffersSwapped(
+    const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params,
+    int gpu_host_id) {
+  NOTREACHED();
+}
+
 #endif