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

ui/gl/gl_image_android_native_buffer.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_android_native_buffer.h"
 
 #include "ui/gl/gl_surface_egl.h"
 #include "ui/gl/scoped_binders.h"
 
 namespace gfx {
 
 GLImageAndroidNativeBuffer::GLImageAndroidNativeBuffer(gfx::Size size)
     : GLImageEGL(size),
       release_after_use_(false),
       in_use_(false),
       target_(0),
       egl_image_for_unbind_(EGL_NO_IMAGE_KHR),
       texture_id_for_unbind_(0) {}
 
-GLImageAndroidNativeBuffer::~GLImageAndroidNativeBuffer() { Destroy(); }
+GLImageAndroidNativeBuffer::~GLImageAndroidNativeBuffer() {
+  Destroy(false);

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

I don't think any GLImage dtor should be calling Destroy anymore. It's a bug if
Destroy has not been called after a successful call to Initialize.

Please add DCHECKs to verify that the work done by Destroy has happened at this
point. ie. DCHECK_EQ(EGL_NO_IMAGE_KHR, egl_image_for_unbind_)...

+}
 
 bool GLImageAndroidNativeBuffer::Initialize(gfx::GpuMemoryBufferHandle buffer) {
   DCHECK(buffer.native_buffer);
 
   EGLint attrs[] = {EGL_IMAGE_PRESERVED_KHR, EGL_TRUE, EGL_NONE};
   return GLImageEGL::Initialize(
       EGL_NATIVE_BUFFER_ANDROID, buffer.native_buffer, attrs);
 }
 
-void GLImageAndroidNativeBuffer::Destroy() {
+void GLImageAndroidNativeBuffer::Destroy(bool have_context) {
   if (egl_image_for_unbind_ != EGL_NO_IMAGE_KHR) {
     eglDestroyImageKHR(GLSurfaceEGL::GetHardwareDisplay(),
                        egl_image_for_unbind_);
     egl_image_for_unbind_ = EGL_NO_IMAGE_KHR;
   }
   if (texture_id_for_unbind_) {
     glDeleteTextures(1, &texture_id_for_unbind_);

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

This should only be called if have_context is true.

     texture_id_for_unbind_ = 0;
   }
 
-  GLImageEGL::Destroy();
+  GLImageEGL::Destroy(have_context);
 }
 
 bool GLImageAndroidNativeBuffer::BindTexImage(unsigned target) {
   DCHECK_NE(EGL_NO_IMAGE_KHR, egl_image_);
 
   if (target == GL_TEXTURE_RECTANGLE_ARB) {
     LOG(ERROR) << "EGLImage cannot be bound to TEXTURE_RECTANGLE_ARB target";
     return false;
   }
 
@@ skipping 57 matching lines @@
 
   glEGLImageTargetTexture2DOES(target_, egl_image_for_unbind_);
   DCHECK_EQ(static_cast<GLenum>(GL_NO_ERROR), glGetError());
 }
 
 void GLImageAndroidNativeBuffer::SetReleaseAfterUse() {
   release_after_use_ = true;
 }
 
 }  // namespace gfx