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

ui/gl/gl_image_android_native_buffer.cc

Index: ui/gl/gl_image_android_native_buffer.cc
diff --git a/ui/gl/gl_image_android_native_buffer.cc b/ui/gl/gl_image_android_native_buffer.cc
index 5e311eeef785a3934fc7604e35942498d81cc650..c053c34fd7f5f782f342182d443c5c4abeacb754 100644
--- a/ui/gl/gl_image_android_native_buffer.cc
+++ b/ui/gl/gl_image_android_native_buffer.cc
@@ -18,7 +18,10 @@ GLImageAndroidNativeBuffer::GLImageAndroidNativeBuffer(const gfx::Size& size)
       texture_id_for_unbind_(0) {
 }
 
-GLImageAndroidNativeBuffer::~GLImageAndroidNativeBuffer() { Destroy(); }
+GLImageAndroidNativeBuffer::~GLImageAndroidNativeBuffer() {
+  DCHECK_EQ(EGL_NO_IMAGE_KHR, egl_image_);
+  DCHECK_EQ(0u, texture_id_for_unbind_);
+}
 
 bool GLImageAndroidNativeBuffer::Initialize(EGLClientBuffer native_buffer) {
   EGLint attrs[] = {EGL_IMAGE_PRESERVED_KHR, EGL_TRUE, EGL_NONE};
@@ -26,22 +29,27 @@ bool GLImageAndroidNativeBuffer::Initialize(EGLClientBuffer native_buffer) {
       EGL_NATIVE_BUFFER_ANDROID, 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_);
-    texture_id_for_unbind_ = 0;
+    if (have_context)
+      glDeleteTextures(1, &texture_id_for_unbind_);
+    texture_id_for_unbind_ = 0u;
   }
 
-  GLImageEGL::Destroy();
+  GLImageEGL::Destroy(have_context);
 }
 
 bool GLImageAndroidNativeBuffer::BindTexImage(unsigned target) {
-  DCHECK_NE(EGL_NO_IMAGE_KHR, egl_image_);
+  if (egl_image_ == EGL_NO_IMAGE_KHR) {
+    LOG(ERROR) << "No EGLImage to bind";

[reveman, 2014/07/24 16:22:03]

nit: "Uninitialized image cannot be bound to texture" might be a bit more
descriptive and you can then also use that same message in all implementations.

[sohanjg, 2014/07/25 10:54:21]

Done.

+    return false;
+  }
 
   if (target == GL_TEXTURE_RECTANGLE_ARB) {
     LOG(ERROR) << "EGLImage cannot be bound to TEXTURE_RECTANGLE_ARB target";