Fix race with short-lived TextureImageTransportSurfaces

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 <string>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 96 matching lines @@
 }
 
 bool TextureImageTransportSurface::OnMakeCurrent(gfx::GLContext* context) {
   if (stub_destroyed_) {
     // Early-exit so that we don't recreate the fbo. We still want to return
     // true, so that the context is made current and the GLES2DecoderImpl can
     // release its own resources.
     return true;
   }
 
-  if (!context_.get()) {
-    DCHECK(helper_->stub());
-    context_ = helper_->stub()->decoder()->GetGLContext();
-  }
+  context_ = context;
 
   if (!fbo_id_) {
     glGenFramebuffersEXT(1, &fbo_id_);
     glBindFramebufferEXT(GL_FRAMEBUFFER, fbo_id_);
     current_size_ = gfx::Size(1, 1);
     helper_->stub()->AddDestructionObserver(this);
   }
 
   // We could be receiving non-deferred GL commands, that is anything that does
   // not need a framebuffer.
@@ skipping 348 matching lines @@
       GL_TEXTURE_2D,
       texture->mailbox_name,
       definition.release(),
       NULL);
   DCHECK(success);
   texture->service_id = 0;
   texture->mailbox_name = MailboxName();
 }
 
 }  // namespace content