| 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 ec5b2abd19fde36ab46ebf8054cd5a048e70db81..1e32eefc1b587fdd051d5b1cae67f118ba6796fe 100644
|
| --- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
|
| +++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
|
| @@ -9992,7 +9992,7 @@ void GLES2DecoderImpl::DoProduceTextureCHROMIUM(GLenum target,
|
| target,
|
| *reinterpret_cast<const MailboxName*>(mailbox),
|
| definition,
|
| - texture_manager())) {
|
| + MailboxManager::TexturePoolNone)) {
|
| bool success = texture_manager()->Restore(
|
| "glProductTextureCHROMIUM", this, texture, definition);
|
| DCHECK(success);
|
| @@ -10019,11 +10019,11 @@ void GLES2DecoderImpl::DoConsumeTextureCHROMIUM(GLenum target,
|
| return;
|
| }
|
|
|
| - scoped_ptr<TextureDefinition> definition(
|
| + TextureDefinition* definition(
|
| group_->mailbox_manager()->ConsumeTexture(
|
| target,
|
| *reinterpret_cast<const MailboxName*>(mailbox)));
|
| - if (!definition.get()) {
|
| + if (!definition) {
|
| LOCAL_SET_GL_ERROR(
|
| GL_INVALID_OPERATION,
|
| "glConsumeTextureCHROMIUM", "invalid mailbox name");
|
| @@ -10031,7 +10031,7 @@ void GLES2DecoderImpl::DoConsumeTextureCHROMIUM(GLenum target,
|
| }
|
|
|
| if (!texture_manager()->Restore(
|
| - "glConsumeTextureCHROMIUM", this, texture, definition.release())) {
|
| + "glConsumeTextureCHROMIUM", this, texture, definition)) {
|
| LOCAL_SET_GL_ERROR(
|
| GL_INVALID_OPERATION,
|
| "glConsumeTextureCHROMIUM", "invalid texture");
|
|
|