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

content/browser/renderer_host/render_widget_host_view_mac.mm

 // 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_mac.h"
 
 #include <QuartzCore/QuartzCore.h>
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
@@ skipping 847 matching lines @@
     TransportDIB::Handle transport_dib) {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   plugin_container_manager_.SetSizeAndTransportDIB(window,
                                                    width,
                                                    height,
                                                    transport_dib);
   UpdatePluginGeometry(window, width, height);
 }
 
 void RenderWidgetHostViewMac::AcceleratedSurfaceBuffersSwapped(
-    const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params,
+    gfx::PluginWindowHandle window,
+    uint64 surface_id,
+    int renderer_id,
+    int32 route_id,
     int gpu_host_id) {
   TRACE_EVENT0("browser",
       "RenderWidgetHostViewMac::AcceleratedSurfaceBuffersSwapped");
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  AcceleratedPluginView* view = ViewForPluginWindowHandle(params.window);
+  AcceleratedPluginView* view = ViewForPluginWindowHandle(window);
   DCHECK(view);
   if (view) {
-    plugin_container_manager_.SetSurfaceWasPaintedTo(params.window,
-                                                     params.surface_id);
+    plugin_container_manager_.SetSurfaceWasPaintedTo(window, surface_id);
 
     // The surface is hidden until its first paint, to not show gargabe.
-    if (plugin_container_manager_.SurfaceShouldBeVisible(params.window))
+    if (plugin_container_manager_.SurfaceShouldBeVisible(window))
       [view setHidden:NO];
     [view drawView];
   }
 
-  if (params.renderer_id != 0 || params.route_id != 0) {
-    AcknowledgeSwapBuffers(params.renderer_id,
-                           params.route_id,
+  if (renderer_id != 0 || route_id != 0) {
+    AcknowledgeSwapBuffers(renderer_id,
+                           route_id,
                            gpu_host_id);
   }
 }
 
 void RenderWidgetHostViewMac::UpdateRootGpuViewVisibility(
     bool show_gpu_widget) {
   // Plugins are destroyed on page navigate. The compositor layer on the other
   // hand is created on demand and then stays alive until its renderer process
   // dies (usually on cross-domain navigation). Instead, only a flag
   // |is_accelerated_compositing_active()| is flipped when the compositor output
@@ skipping 1845 matching lines @@
   if (!string) return NO;
 
   // If the user is currently using an IME, confirm the IME input,
   // and then insert the text from the service, the same as TextEdit and Safari.
   [self confirmComposition];
   [self insertText:string];
   return YES;
 }
 
 @end