summaryrefslogtreecommitdiffstats
path: root/gpu
diff options
context:
space:
mode:
Diffstat (limited to 'gpu')
-rw-r--r--gpu/command_buffer/service/gles2_cmd_decoder.cc8
1 files changed, 2 insertions, 6 deletions
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index 10e2a44..eef54c3 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -2555,13 +2555,9 @@ error::Error GLES2DecoderImpl::HandleResizeCHROMIUM(
if (resize_callback_.get()) {
resize_callback_->Run(gfx::Size(width, height));
-#if defined(OS_MACOSX)
- // On OSX, the resize callback clobbers the currently-active GL context.
- // TODO(kbr): remove this MakeCurrent once the AcceleratedSurface code
- // becomes able to restore its context.
- if (!context_->MakeCurrent(surface_.get()))
+ DCHECK(context_->IsCurrent(surface_.get()));
+ if (!context_->IsCurrent(surface_.get()))
return error::kLostContext;
-#endif
}
return error::kNoError;