| 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 4d32625ea62668c0876ac3c0e0eb30c40b1a3ed4..ffc4f8bac337c08c84a3ff8accc8ac428f11a4d7 100644
|
| --- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
|
| +++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
|
| @@ -2519,7 +2519,7 @@ void GLES2DecoderImpl::DoCopyTextureToParentTextureCHROMIUM(
|
| }
|
|
|
| void GLES2DecoderImpl::DoResizeCHROMIUM(GLuint width, GLuint height) {
|
| -#if defined(OS_POSIX) && !defined(OS_MACOSX)
|
| +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(TOUCH_UI)
|
| // Make sure that we are done drawing to the back buffer before resizing.
|
| glFinish();
|
| #endif
|
| @@ -2731,7 +2731,7 @@ void GLES2DecoderImpl::DoBindFramebuffer(GLenum target, GLuint client_id) {
|
| }
|
| info->MarkAsValid();
|
| } else {
|
| - service_id = 0;
|
| + service_id = surface_->GetBackingFrameBufferObject();
|
| }
|
|
|
| if (target == GL_FRAMEBUFFER || target == GL_DRAW_FRAMEBUFFER_EXT) {
|
|
|