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(const 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() {
+  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};
   return GLImageEGL::Initialize(
       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";
     return false;
   }
 
   if (target_ && target_ != target) {
     LOG(ERROR) << "EGLImage can only be bound to one target";
     return false;
   }
   target_ = target;
 
   // Defer ImageTargetTexture2D if not currently in use.
   if (!in_use_)
     return true;
 
   glEGLImageTargetTexture2DOES(target_, egl_image_);
   DCHECK_EQ(static_cast<GLenum>(GL_NO_ERROR), glGetError());
   return true;
 }
 
 void GLImageAndroidNativeBuffer::WillUseTexImage() {

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

this can also be called after the buffer has been destroyed

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

Done.

   DCHECK(egl_image_);
   DCHECK(!in_use_);
   in_use_ = true;
   glEGLImageTargetTexture2DOES(target_, egl_image_);
   DCHECK_EQ(static_cast<GLenum>(GL_NO_ERROR), glGetError());
 }
 
 void GLImageAndroidNativeBuffer::DidUseTexImage() {

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

and this

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

we use a new eglimage for unbinding, not controlled by image manager, do we
still need the check here ?

   DCHECK(in_use_);
   in_use_ = false;
 
   if (!release_after_use_)
     return;
 
   if (egl_image_for_unbind_ == EGL_NO_IMAGE_KHR) {
     DCHECK_EQ(0u, texture_id_for_unbind_);
     glGenTextures(1, &texture_id_for_unbind_);
 
@@ skipping 23 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