Flag and adapter class for 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 3f4ed8837d989af14c3b495e3fc7c60207f3d4ff..d365b2d217befee611a69813644b15beb5ae24ef 100644
--- a/content/renderer/gpu/compositor_output_surface.h
+++ b/content/renderer/gpu/compositor_output_surface.h
@@ -11,6 +11,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/time.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebCompositorOutputCanvas2D.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebCompositorOutputSurface.h"
 
 namespace base {
@@ -33,7 +34,8 @@ class CompositorOutputSurface
       base::TaskRunner* target_task_runner);
 
   CompositorOutputSurface(int32 routing_id,
-                          WebKit::WebGraphicsContext3D* context3d);
+                          WebKit::WebGraphicsContext3D* context3d,
+                          WebKit::WebCompositorOutputCanvas2D* canvas2D);
   virtual ~CompositorOutputSurface();
 
   // WebCompositorOutputSurface implementation.
@@ -41,6 +43,7 @@ class CompositorOutputSurface
       WebKit::WebCompositorOutputSurfaceClient* client) OVERRIDE;
   virtual const Capabilities& capabilities() const OVERRIDE;
   virtual WebKit::WebGraphicsContext3D* context3D() const OVERRIDE;
+  virtual WebKit::WebCompositorOutputCanvas2D* canvas2D() OVERRIDE;
   virtual void sendFrameToParentCompositor(
       const WebKit::WebCompositorFrame&) OVERRIDE;
 
@@ -54,7 +57,7 @@ class CompositorOutputSurface
   int routing_id_;
   Capabilities capabilities_;
   scoped_ptr<WebKit::WebGraphicsContext3D> context3D_;
+  scoped_ptr<WebKit::WebCompositorOutputCanvas2D> canvas2D_;
 };
 
 #endif  // CONTENT_RENDERER_GPU_COMPOSITOR_OUTPUT_SURFACE_H_
-