Virtual context MakeCurrent tweaks.

gpu/command_buffer/service/gles2_cmd_decoder.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 "gpu/command_buffer/service/gles2_cmd_decoder.h"
 
 #include <stdio.h>
 
 #include <algorithm>
 #include <list>
@@ skipping 3177 matching lines @@
   offscreen_saved_frame_buffer_.reset();
   offscreen_saved_color_texture_.reset();
   offscreen_resolved_frame_buffer_.reset();
   offscreen_resolved_color_texture_.reset();
 
   if (group_) {
     group_->Destroy(this, have_context);
     group_ = NULL;
   }
 
+  // Keep the context current, since the surface destructor might clean up
+  // resources.
+  surface_ = NULL;

[epenner, 2013/05/28 23:36:56]

This looks good but see have_context above. It looks like we don't handle
!have_context (although I don't know the details of when that occurs or how the
other objects get cleaned up in that case).

Perhaps we could do decoder_->SetSurface(NULL) back in the other code location
where we know we have the context?

It would really help if we could do surface->Destroy(), but it's probably
reference-counting faux pas to determine if we have the last reference.

   if (context_.get()) {
     context_->ReleaseCurrent(NULL);
     context_ = NULL;
   }
 
 #if defined(OS_MACOSX)
   for (TextureToIOSurfaceMap::iterator it = texture_to_io_surface_map_.begin();
        it != texture_to_io_surface_map_.end(); ++it) {
     CFRelease(it->second);
   }
@@ skipping 7146 matching lines @@
   return error::kNoError;
 }
 
 // Include the auto-generated part of this file. We split this because it means
 // we can easily edit the non-auto generated parts right here in this file
 // instead of having to edit some template or the code generator.
 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu