ContextProvider in OutputSurface

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 ff598725e65decd7efb20b1ce3132df69c1b8139..3ba2745069bc4067d21f9be90a06d818ab04a9d7 100644
--- a/content/renderer/gpu/compositor_output_surface.h
+++ b/content/renderer/gpu/compositor_output_surface.h
@@ -31,7 +31,7 @@ class CompositorFrameAck;
 }
 
 namespace content {
-
+class ContextProviderCommandBuffer;
 class WebGraphicsContext3DCommandBufferImpl;
 
 // This class can be created only on the main thread, but then becomes pinned
@@ -43,11 +43,12 @@ class CompositorOutputSurface
   static IPC::ForwardingMessageFilter* CreateFilter(
       base::TaskRunner* target_task_runner);
 
-  CompositorOutputSurface(int32 routing_id,
-                          uint32 output_surface_id,
-                          WebGraphicsContext3DCommandBufferImpl* context3d,
-                          cc::SoftwareOutputDevice* software,
-                          bool use_swap_compositor_frame_message);
+  CompositorOutputSurface(
+      int32 routing_id,
+      uint32 output_surface_id,
+      const scoped_refptr<ContextProviderCommandBuffer>& context_provider,
+      scoped_ptr<cc::SoftwareOutputDevice> software,
+      bool use_swap_compositor_frame_message);
   virtual ~CompositorOutputSurface();
 
   // cc::OutputSurface implementation.
@@ -97,6 +98,7 @@ class CompositorOutputSurface
 
   bool use_swap_compositor_frame_message_;
 
+  WebGraphicsContext3DCommandBufferImpl* command_buffer_context_;
   scoped_refptr<IPC::ForwardingMessageFilter> output_surface_filter_;
   scoped_refptr<CompositorOutputSurfaceProxy> output_surface_proxy_;
   scoped_refptr<IPC::SyncMessageFilter> message_sender_;