| Index: gpu/command_buffer/client/gl_in_process_context.cc
|
| diff --git a/gpu/command_buffer/client/gl_in_process_context.cc b/gpu/command_buffer/client/gl_in_process_context.cc
|
| index cf9faab689693eabd5ff32679d0c3760dac3e1a7..72e1eaf715a568042a037dcb2d62d632784656a7 100644
|
| --- a/gpu/command_buffer/client/gl_in_process_context.cc
|
| +++ b/gpu/command_buffer/client/gl_in_process_context.cc
|
| @@ -50,13 +50,13 @@ class GLInProcessContextImpl
|
| GLInProcessContextImpl();
|
| ~GLInProcessContextImpl() override;
|
|
|
| - bool Initialize(scoped_refptr<gfx::GLSurface> surface,
|
| + bool Initialize(scoped_refptr<gl::GLSurface> surface,
|
| bool is_offscreen,
|
| GLInProcessContext* share_context,
|
| gfx::AcceleratedWidget window,
|
| const gfx::Size& size,
|
| const gpu::gles2::ContextCreationAttribHelper& attribs,
|
| - gfx::GpuPreference gpu_preference,
|
| + gl::GpuPreference gpu_preference,
|
| const scoped_refptr<InProcessCommandBuffer::Service>& service,
|
| const SharedMemoryLimits& mem_limits,
|
| GpuMemoryBufferManager* gpu_memory_buffer_manager,
|
| @@ -93,13 +93,13 @@ void GLInProcessContextImpl::SetLock(base::Lock* lock) {
|
| }
|
|
|
| bool GLInProcessContextImpl::Initialize(
|
| - scoped_refptr<gfx::GLSurface> surface,
|
| + scoped_refptr<gl::GLSurface> surface,
|
| bool is_offscreen,
|
| GLInProcessContext* share_context,
|
| gfx::AcceleratedWidget window,
|
| const gfx::Size& size,
|
| const gles2::ContextCreationAttribHelper& attribs,
|
| - gfx::GpuPreference gpu_preference,
|
| + gl::GpuPreference gpu_preference,
|
| const scoped_refptr<InProcessCommandBuffer::Service>& service,
|
| const SharedMemoryLimits& mem_limits,
|
| GpuMemoryBufferManager* gpu_memory_buffer_manager,
|
| @@ -191,13 +191,13 @@ void GLInProcessContextImpl::Destroy() {
|
| // static
|
| GLInProcessContext* GLInProcessContext::Create(
|
| scoped_refptr<gpu::InProcessCommandBuffer::Service> service,
|
| - scoped_refptr<gfx::GLSurface> surface,
|
| + scoped_refptr<gl::GLSurface> surface,
|
| bool is_offscreen,
|
| gfx::AcceleratedWidget window,
|
| const gfx::Size& size,
|
| GLInProcessContext* share_context,
|
| const ::gpu::gles2::ContextCreationAttribHelper& attribs,
|
| - gfx::GpuPreference gpu_preference,
|
| + gl::GpuPreference gpu_preference,
|
| const SharedMemoryLimits& memory_limits,
|
| GpuMemoryBufferManager* gpu_memory_buffer_manager,
|
| ImageFactory* image_factory) {
|
|
|