Enable accelerated compositing of web pages when using webkit compositor

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/command_line.h"
@@ skipping 1101 matching lines @@
   // (created by the GPU process), which is later displayed by the browser.
   // As the GPU process creates this surface, we can return any non-zero value.
   return 1;
 }
 
 void RenderWidgetHostViewViews::AcceleratedSurfaceNew(
     int32 width,
     int32 height,
     uint64* surface_id,
     TransportDIB::Handle* surface_handle) {
-  scoped_ptr<AcceleratedSurfaceContainerLinux> surface(
-      AcceleratedSurfaceContainerLinux::CreateAcceleratedSurfaceContainer(
-          gfx::Size(width, height)));
+  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.release();
 }
 
 void RenderWidgetHostViewViews::AcceleratedSurfaceRelease(uint64 surface_id) {
   accelerated_surface_containers_.erase(surface_id);
 }
 
 void RenderWidgetHostViewViews::AcceleratedSurfaceBuffersSwapped(
     uint64 surface_id,
     int32 route_id,
     int gpu_host_id) {
-  SetExternalTexture(accelerated_surface_containers_[surface_id].get());
+  SetExternalTexture(accelerated_surface_containers_[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
   } 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));
     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);
 }
 
 #endif