Revert 205481 "Virtual context MakeCurrent tweaks."

trunk/src/content/common/gpu/gpu_command_buffer_stub.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/hash.h"
 #include "base/shared_memory.h"
@@ skipping 341 matching lines @@
   // destroy it before those.
   scheduler_.reset();
 
   bool have_context = false;
   if (decoder_)
     have_context = decoder_->MakeCurrent();
   FOR_EACH_OBSERVER(DestructionObserver,
                     destruction_observers_,
                     OnWillDestroyStub());
 
+  scoped_refptr<gfx::GLContext> context;
   if (decoder_) {
+    context = decoder_->GetGLContext();
     decoder_->Destroy(have_context);
     decoder_.reset();
   }
 
   command_buffer_.reset();
 
-  // Remove this after crbug.com/248395 is sorted out.
+  // 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());
   surface_ = NULL;
+  if (context.get())
+    context->ReleaseCurrent(NULL);
 }
 
 void GpuCommandBufferStub::OnInitializeFailed(IPC::Message* reply_message) {
   Destroy();
   GpuCommandBufferMsg_Initialize::WriteReplyParams(reply_message, false);
   Send(reply_message);
 }
 
 void GpuCommandBufferStub::OnInitialize(
     base::SharedMemoryHandle shared_state_handle,
@@ skipping 522 matching lines @@
     if (surface_.get() && MakeCurrent())
       surface_->SetFrontbufferAllocation(
           allocation.browser_allocation.suggest_have_frontbuffer);
   }
 
   last_memory_allocation_valid_ = true;
   last_memory_allocation_ = allocation;
 }
 
 }  // namespace content