texture_image_transport: have a current context when we're releasing textures

content/common/gpu/texture_image_transport_surface.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 "content/common/gpu/texture_image_transport_surface.h"
 
 #include "content/common/gpu/gpu_channel.h"
 #include "content/common/gpu/gpu_channel_manager.h"
 #include "content/common/gpu/gpu_messages.h"
 #include "gpu/command_buffer/service/context_group.h"
@@ skipping 93 matching lines @@
   DCHECK(stub_destroyed_);
   Destroy();
 }
 
 bool TextureImageTransportSurface::Initialize() {
   return helper_->Initialize();
 }
 
 void TextureImageTransportSurface::Destroy() {
   if (parent_stub_) {
-    parent_stub_->RemoveDestructionObserver(this);
-    parent_stub_ = NULL;
-  }
-  for (int i = 0; i < 2; ++i) {
-    Texture& texture = textures_[i];
-    if (!texture.sent_to_client)
-      continue;
-    GpuHostMsg_AcceleratedSurfaceRelease_Params params;
-    params.identifier = texture.client_id;
-    helper_->SendAcceleratedSurfaceRelease(params);
-    texture.info = NULL;
+    parent_stub_->decoder()->MakeCurrent();
+    ReleaseParentStub();
   }
 
   helper_->Destroy();
 }
 
 bool TextureImageTransportSurface::Resize(const gfx::Size&) {
   return true;
 }
 
 bool TextureImageTransportSurface::IsOffscreen() {
@@ skipping 55 matching lines @@
 void* TextureImageTransportSurface::GetConfig() {
   return parent_stub_ ? parent_stub_->surface()->GetConfig() : NULL;
 }
 
 void TextureImageTransportSurface::OnResize(gfx::Size size) {
   CreateBackTexture(size);
 }
 
 void TextureImageTransportSurface::OnWillDestroyStub(
     GpuCommandBufferStub* stub) {
-  stub->RemoveDestructionObserver(this);
   if (stub == parent_stub_) {
-    // We are losing the parent stub, we need to clear the reference on the
-    // infos (they are not allowed to outlive the stub).
-    textures_[0].info = NULL;
-    textures_[1].info = NULL;
-    parent_stub_ = NULL;
+    ReleaseParentStub();
   } else {
+    stub->RemoveDestructionObserver(this);
     // We are losing the stub owning us, this is our last chance to clean up the
     // resources we allocated in the stub's context.
     glDeleteFramebuffersEXT(1, &fbo_id_);
     CHECK_GL_ERROR();
     fbo_id_ = 0;
 
     stub_destroyed_ = true;
   }
 }
 
@@ skipping 211 matching lines @@
   glFlush();
   CHECK_GL_ERROR();
 
 #ifndef NDEBUG
   GLenum status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER);
   if (status != GL_FRAMEBUFFER_COMPLETE) {
     DLOG(ERROR) << "Framebuffer incomplete.";
   }
 #endif
 }
+
+void TextureImageTransportSurface::ReleaseParentStub() {
+  DCHECK(parent_stub_);
+  parent_stub_->RemoveDestructionObserver(this);
+  for (int i = 0; i < 2; ++i) {
+    Texture& texture = textures_[i];
+    texture.info = NULL;
+    if (!texture.sent_to_client)
+      continue;
+    GpuHostMsg_AcceleratedSurfaceRelease_Params params;
+    params.identifier = texture.client_id;
+    helper_->SendAcceleratedSurfaceRelease(params);
+  }
+  parent_stub_ = NULL;
+}