| Index: gpu/command_buffer/client/gl_in_process_context.h
|
| diff --git a/gpu/command_buffer/client/gl_in_process_context.h b/gpu/command_buffer/client/gl_in_process_context.h
|
| index 36484cef18e7bb628e6eb9e8d88abbcca3d5b310..8a78f8ee4da64cff0e6105cb79f17e054ec4f0b2 100644
|
| --- a/gpu/command_buffer/client/gl_in_process_context.h
|
| +++ b/gpu/command_buffer/client/gl_in_process_context.h
|
| @@ -55,8 +55,6 @@ class GL_IN_PROCESS_CONTEXT_EXPORT GLInProcessContext {
|
| // service must run on the same thread as this client because GLSurface is
|
| // not thread safe. If |surface| is NULL, then the other parameters are used
|
| // to correctly create a surface.
|
| - // Only one of |share_context| and |use_global_share_group| can be used at
|
| - // the same time.
|
| static GLInProcessContext* Create(
|
| scoped_refptr<gpu::InProcessCommandBuffer::Service> service,
|
| scoped_refptr<gfx::GLSurface> surface,
|
| @@ -64,15 +62,12 @@ class GL_IN_PROCESS_CONTEXT_EXPORT GLInProcessContext {
|
| gfx::AcceleratedWidget window,
|
| const gfx::Size& size,
|
| GLInProcessContext* share_context,
|
| - bool use_global_share_group,
|
| const gpu::gles2::ContextCreationAttribHelper& attribs,
|
| gfx::GpuPreference gpu_preference,
|
| const GLInProcessContextSharedMemoryLimits& memory_limits,
|
| GpuMemoryBufferManager* gpu_memory_buffer_manager,
|
| ImageFactory* image_factory);
|
|
|
| - virtual void SetContextLostCallback(const base::Closure& callback) = 0;
|
| -
|
| // Allows direct access to the GLES2 implementation so a GLInProcessContext
|
| // can be used without making it current.
|
| virtual gles2::GLES2Implementation* GetImplementation() = 0;
|
|
|