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

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

Issue 16988002: Revert 205970 "Revert 205481 "Virtual context MakeCurrent tweaks."" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 6 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 | trunk/src/content/common/gpu/image_transport_surface_mac.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/content/common/gpu/gpu_command_buffer_stub.cc
===================================================================
--- trunk/src/content/common/gpu/gpu_command_buffer_stub.cc (revision 206118)
+++ trunk/src/content/common/gpu/gpu_command_buffer_stub.cc (working copy)
@@ -359,23 +359,15 @@
destruction_observers_,
OnWillDestroyStub());
- scoped_refptr<gfx::GLContext> context;
if (decoder_) {
- context = decoder_->GetGLContext();
decoder_->Destroy(have_context);
decoder_.reset();
}
command_buffer_.reset();
- // Make sure that context_ is current while we destroy surface_, because
- // surface_ may have GL resources that it needs to destroy, and will need
- // context_ to be current in order to not leak these resources.
- if (context.get())
- context->MakeCurrent(surface_.get());
+ // Remove this after crbug.com/248395 is sorted out.
surface_ = NULL;
- if (context.get())
- context->ReleaseCurrent(NULL);
}
void GpuCommandBufferStub::OnInitializeFailed(IPC::Message* reply_message) {
« no previous file with comments | « no previous file | trunk/src/content/common/gpu/image_transport_surface_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698