Index: content/common/gpu/gpu_command_buffer_stub.cc |
=================================================================== |
--- content/common/gpu/gpu_command_buffer_stub.cc (revision 137438) |
+++ content/common/gpu/gpu_command_buffer_stub.cc (working copy) |
@@ -214,7 +214,7 @@ |
OnWillDestroyStub(this)); |
if (decoder_.get()) { |
- decoder_->Destroy(); |
+ decoder_->Destroy(true); |
decoder_.reset(); |
} |
@@ -296,9 +296,15 @@ |
return; |
} |
+ if (!context_->MakeCurrent(surface_.get())) { |
+ LOG(ERROR) << "Failed to make context current."; |
+ OnInitializeFailed(reply_message); |
+ return; |
+ } |
+ |
// Initialize the decoder with either the view or pbuffer GLContext. |
- if (!decoder_->Initialize(surface_.get(), |
- context_.get(), |
+ if (!decoder_->Initialize(surface_, |
+ context_, |
!surface_id(), |
initial_size_, |
disallowed_features_, |