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

 // 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 "content/browser/renderer_host/render_widget_host_view_aura.h"
 
 #include "base/logging.h"
 #include "content/browser/renderer_host/backing_store_skia.h"
 #include "content/browser/renderer_host/render_widget_host.h"
 #include "content/browser/renderer_host/web_input_event_aura.h"
@@ skipping 267 matching lines @@
   tooltip_ = tooltip_text;
 }
 
 BackingStore* RenderWidgetHostViewAura::AllocBackingStore(
     const gfx::Size& size) {
   return new BackingStoreSkia(host_, size);
 }
 
 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,
       int32 height,
       uint64* surface_id,
       TransportDIB::Handle* surface_handle) {
   scoped_refptr<AcceleratedSurfaceContainerLinux> surface(
       AcceleratedSurfaceContainerLinux::Create(gfx::Size(width, height)));
   if (!surface->Initialize(surface_id)) {
     LOG(ERROR) << "Failed to create AcceleratedSurfaceContainer";
     return;
   }
   *surface_handle = surface->Handle();
 
   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);
 }
 #endif
 
 void RenderWidgetHostViewAura::SetBackground(const SkBitmap& background) {
   RenderWidgetHostView::SetBackground(background);
   host_->SetBackground(background);
 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
   window_->layer()->SetFillsBoundsOpaquely(background.isOpaque());
@@ skipping 205 matching lines @@
 // static
 void RenderWidgetHostView::GetDefaultScreenInfo(
     WebKit::WebScreenInfo* results) {
   const gfx::Size size = gfx::Screen::GetPrimaryMonitorSize();
   results->rect = WebKit::WebRect(0, 0, size.width(), size.height());
   results->availableRect = results->rect;
   // TODO(derat): Don't hardcode this?
   results->depth = 24;
   results->depthPerComponent = 8;
 }