| Index: gpu/gles2_conform_support/egl/display.cc
|
| diff --git a/gpu/gles2_conform_support/egl/display.cc b/gpu/gles2_conform_support/egl/display.cc
|
| index 59b34b80a12e47de86a1b15b05efb003fca0f160..405879c487a5c6b8bb514ae2f7f0d209d41eec5b 100644
|
| --- a/gpu/gles2_conform_support/egl/display.cc
|
| +++ b/gpu/gles2_conform_support/egl/display.cc
|
| @@ -113,7 +113,7 @@ EGLSurface Display::CreateWindowSurface(EGLConfig config,
|
| return NULL;
|
|
|
| scoped_refptr<gpu::gles2::ContextGroup> group(new gpu::gles2::ContextGroup(
|
| - NULL, NULL, NULL, new gpu::gles2::ShaderTranslatorCache, NULL, true));
|
| + NULL, NULL, new gpu::gles2::ShaderTranslatorCache, NULL, true));
|
|
|
| decoder_.reset(gpu::gles2::GLES2Decoder::Create(group.get()));
|
| if (!decoder_.get())
|
| @@ -169,8 +169,6 @@ EGLSurface Display::CreateWindowSurface(EGLConfig config,
|
| return EGL_NO_SURFACE;
|
| }
|
|
|
| - gpu_control_service_.reset(new gpu::GpuControlService(NULL, NULL));
|
| -
|
| command_buffer->SetPutOffsetChangeCallback(
|
| base::Bind(&gpu::GpuScheduler::PutChanged,
|
| base::Unretained(gpu_scheduler_.get())));
|
|
|