| Index: content/renderer/gpu/compositor_output_surface.cc
|
| diff --git a/content/renderer/gpu/compositor_output_surface.cc b/content/renderer/gpu/compositor_output_surface.cc
|
| index 4e2874c053f8656f8903640aaef7480686aba412..0ce2973d05ca2052ef4f9ca01dd5a15837e20ca3 100644
|
| --- a/content/renderer/gpu/compositor_output_surface.cc
|
| +++ b/content/renderer/gpu/compositor_output_surface.cc
|
| @@ -33,10 +33,13 @@ CompositorOutputSurface::CompositorOutputSurface(
|
| int32 routing_id,
|
| uint32 output_surface_id,
|
| const scoped_refptr<ContextProviderCommandBuffer>& context_provider,
|
| + const scoped_refptr<ContextProviderCommandBuffer>& worker_context_provider,
|
| scoped_ptr<cc::SoftwareOutputDevice> software_device,
|
| scoped_refptr<FrameSwapMessageQueue> swap_frame_message_queue,
|
| bool use_swap_compositor_frame_message)
|
| - : OutputSurface(context_provider, software_device.Pass()),
|
| + : OutputSurface(context_provider,
|
| + worker_context_provider,
|
| + software_device.Pass()),
|
| output_surface_id_(output_surface_id),
|
| use_swap_compositor_frame_message_(use_swap_compositor_frame_message),
|
| output_surface_filter_(
|
|
|