| Index: gpu/command_buffer/service/gles2_cmd_decoder.cc
|
| diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
|
| index 54b6fbe1f08c1fbec22eebf48fefcdea38f25c02..6934e8bc58baacbe074b94a54cc01b6e8f939737 100644
|
| --- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
|
| +++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
|
| @@ -591,8 +591,7 @@
|
|
|
| ErrorState* GetErrorState() override;
|
| const ContextState* GetContextState() override { return &state_; }
|
| - scoped_refptr<ShaderTranslatorInterface> GetTranslator(
|
| - GLenum type) const override;
|
| + scoped_refptr<ShaderTranslatorInterface> GetTranslator(GLenum type) override;
|
|
|
| void SetShaderCacheCallback(const ShaderCacheCallback& callback) override;
|
| void SetFenceSyncReleaseCallback(
|
| @@ -3610,8 +3609,7 @@
|
| if (workarounds().gl_clear_broken) {
|
| DCHECK(!clear_framebuffer_blit_.get());
|
| LOCAL_COPY_REAL_GL_ERRORS_TO_WRAPPER("glClearWorkaroundInit");
|
| - clear_framebuffer_blit_.reset(
|
| - new ClearFramebufferResourceManager(this, gl_version_info()));
|
| + clear_framebuffer_blit_.reset(new ClearFramebufferResourceManager(this));
|
| if (LOCAL_PEEK_GL_ERROR("glClearWorkaroundInit") != GL_NO_ERROR)
|
| return false;
|
| }
|
| @@ -10454,7 +10452,7 @@
|
| }
|
|
|
| scoped_refptr<ShaderTranslatorInterface> GLES2DecoderImpl::GetTranslator(
|
| - GLenum type) const {
|
| + GLenum type) {
|
| return type == GL_VERTEX_SHADER ? vertex_translator_ : fragment_translator_;
|
| }
|
|
|
|
|