[CLOSED] In-browser software compositing

content/renderer/gpu/compositor_output_surface.h

Index: content/renderer/gpu/compositor_output_surface.h
diff --git a/content/renderer/gpu/compositor_output_surface.h b/content/renderer/gpu/compositor_output_surface.h
index 57b344ae5ed9b2b773b5e1c6adbef1879ee3ccb5..ccab928b1ffe5815e4394f8af040152f9d469c09 100644
--- a/content/renderer/gpu/compositor_output_surface.h
+++ b/content/renderer/gpu/compositor_output_surface.h
@@ -11,8 +11,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/time.h"
-#include "cc/output_surface.h"
-#include "cc/software_output_device.h"
+#include "cc/output_surface_impl.h"
 
 namespace base {
 class TaskRunner;
@@ -28,7 +27,7 @@ namespace content {
 // This class can be created only on the main thread, but then becomes pinned
 // to a fixed thread when bindToClient is called.
 class CompositorOutputSurface
-    : NON_EXPORTED_BASE(public cc::OutputSurface),
+    : NON_EXPORTED_BASE(public cc::OutputSurfaceImpl),
       NON_EXPORTED_BASE(public base::NonThreadSafe) {
  public:
   static IPC::ForwardingMessageFilter* CreateFilter(
@@ -73,12 +72,8 @@ class CompositorOutputSurface
   bool Send(IPC::Message* message);
 
   scoped_refptr<IPC::ForwardingMessageFilter> output_surface_filter_;
-  cc::OutputSurfaceClient* client_;
   scoped_refptr<CompositorOutputSurfaceProxy> output_surface_proxy_;
   int routing_id_;
-  struct Capabilities capabilities_;
-  scoped_ptr<WebKit::WebGraphicsContext3D> context3D_;
-  scoped_ptr<cc::SoftwareOutputDevice> software_device_;
 };
 
 }  // namespace content