Enable accelerated compositing of web pages when using webkit compositor

content/browser/renderer_host/accelerated_surface_container_linux.h

Index: content/browser/renderer_host/accelerated_surface_container_linux.h
diff --git a/content/browser/renderer_host/accelerated_surface_container_linux.h b/content/browser/renderer_host/accelerated_surface_container_linux.h
index b3261c4547e2b6db22c63d7446b6bc5ce1aea3d4..3dfbf2214a5e4058dfc01262b5cf47dc725c8a8b 100644
--- a/content/browser/renderer_host/accelerated_surface_container_linux.h
+++ b/content/browser/renderer_host/accelerated_surface_container_linux.h
@@ -7,22 +7,18 @@
 #pragma once
 
 #include "base/basictypes.h"
-#include "ui/gfx/compositor/compositor_gl.h"
+#include "ui/gfx/compositor/compositor.h"
 #include "ui/gfx/surface/transport_dib.h"
 
 // Helper class for storing image data from the GPU process renderered
 // on behalf of the RWHVV. It assumes that GL context that will display
 // the image data is current  when an instance of this object is created
 // or destroyed.
-class AcceleratedSurfaceContainerLinux : public ui::TextureGL {
+class AcceleratedSurfaceContainerLinux {
  public:
-  static AcceleratedSurfaceContainerLinux* CreateAcceleratedSurfaceContainer(
-      const gfx::Size& size);
-
-  // TextureGL implementation
-  virtual void SetCanvas(const SkCanvas& canvas,
-                         const gfx::Point& origin,
-                         const gfx::Size& overall_size) OVERRIDE;
+  virtual ~AcceleratedSurfaceContainerLinux() { }
+  virtual void AddRef() = 0;
+  virtual void Release() = 0;
 
   // Initialize the surface container, and returns an ID for it.
   // The |surface_id| given to this function may be modified, and the modified
@@ -31,14 +27,11 @@ class AcceleratedSurfaceContainerLinux : public ui::TextureGL {
 
   // Some implementations of this class use shared memory, this is the handle
   // to the shared buffer, which is part of the surface container.
-  virtual TransportDIB::Handle Handle() const;
+  virtual TransportDIB::Handle Handle() const = 0;
 
- protected:
-  explicit AcceleratedSurfaceContainerLinux(const gfx::Size& size);
+  virtual ui::Texture* GetTexture() = 0;
 
- private:
-  DISALLOW_COPY_AND_ASSIGN(AcceleratedSurfaceContainerLinux);
+  static AcceleratedSurfaceContainerLinux* Create(const gfx::Size& size);
 };
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_ACCELERATED_SURFACE_CONTAINER_LINUX_H_
-