Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(887)

Unified Diff: content/common/gpu/gpu_command_buffer_stub.cc

Issue 10388131: Allow GLES2CmdDecoder to change the GLSurface associated with the default FBO. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/common/gpu/image_transport_surface.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_,
« no previous file with comments | « no previous file | content/common/gpu/image_transport_surface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698