During image destroy, delete textures only if we have a GL context.

ui/gl/gl_image_surface_texture.cc

 // Copyright 2014 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 "ui/gl/gl_image_surface_texture.h"
 
 #include "base/debug/trace_event.h"
 #include "ui/gl/android/surface_texture.h"
 #include "ui/gl/android/surface_texture_tracker.h"
 
 namespace gfx {
 
 GLImageSurfaceTexture::GLImageSurfaceTexture(gfx::Size size)
     : size_(size), texture_id_(0) {}
 
-GLImageSurfaceTexture::~GLImageSurfaceTexture() { Destroy(); }
+GLImageSurfaceTexture::~GLImageSurfaceTexture() {
+  Destroy(false);

[reveman, 2014/05/29 16:30:34]

No call to Destroy in dtor please. Instead verify that Destroy has been called.

+}
 
 bool GLImageSurfaceTexture::Initialize(gfx::GpuMemoryBufferHandle buffer) {
   DCHECK(!surface_texture_);
   surface_texture_ =
       SurfaceTextureTracker::GetInstance()->AcquireSurfaceTexture(
           buffer.surface_texture_id.primary_id,
           buffer.surface_texture_id.secondary_id);
   return !!surface_texture_;
 }
 
-void GLImageSurfaceTexture::Destroy() {
+void GLImageSurfaceTexture::Destroy(bool have_context) {
   surface_texture_ = NULL;
   texture_id_ = 0;
 }
 
 gfx::Size GLImageSurfaceTexture::GetSize() { return size_; }
 
 bool GLImageSurfaceTexture::BindTexImage(unsigned target) {
   TRACE_EVENT0("gpu", "GLImageSurfaceTexture::BindTexImage");
 
   if (target != GL_TEXTURE_EXTERNAL_OES) {
@@ skipping 28 matching lines @@
     // GL_TEXTURE_EXTERNAL_OES target.
     surface_texture_->AttachToGLContext();
     texture_id_ = texture_id;
   }
 
   surface_texture_->UpdateTexImage();
   return true;
 }
 
 }  // namespace gfx