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

ui/gl/gl_image_memory.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_memory.h"
 
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/scoped_binders.h"
@@ skipping 63 matching lines @@
 #if defined(OS_WIN) || defined(USE_X11) || defined(OS_ANDROID) || \
     defined(USE_OZONE)
       ,
       egl_texture_id_(0u),
       egl_image_(EGL_NO_IMAGE_KHR)
 #endif
 {
 }
 
 GLImageMemory::~GLImageMemory() {
+#if defined(OS_WIN) || defined(USE_X11) || defined(OS_ANDROID) || \
+    defined(USE_OZONE)
+  DCHECK_EQ(EGL_NO_IMAGE_KHR, egl_image_);
+  DCHECK_EQ(0u, egl_texture_id_);
+#endif
 }
 
 bool GLImageMemory::Initialize(const unsigned char* memory) {
   if (!ValidFormat(internalformat_)) {
     DVLOG(0) << "Invalid format: " << internalformat_;
     return false;
   }
 
   DCHECK(memory);
   DCHECK(!memory_);
   memory_ = memory;
   return true;
 }
 
-void GLImageMemory::Destroy() {
+void GLImageMemory::Destroy(bool have_context) {
 #if defined(OS_WIN) || defined(USE_X11) || defined(OS_ANDROID) || \
     defined(USE_OZONE)
   if (egl_image_ != EGL_NO_IMAGE_KHR) {
     eglDestroyImageKHR(GLSurfaceEGL::GetHardwareDisplay(), egl_image_);
     egl_image_ = EGL_NO_IMAGE_KHR;
   }
 
   if (egl_texture_id_) {
-    glDeleteTextures(1, &egl_texture_id_);
+    if (have_context)
+      glDeleteTextures(1, &egl_texture_id_);
     egl_texture_id_ = 0u;
   }
 #endif
   memory_ = NULL;
 }
 
 gfx::Size GLImageMemory::GetSize() {
   return size_;
 }
 
 bool GLImageMemory::BindTexImage(unsigned target) {
   TRACE_EVENT0("gpu", "GLImageMemory::BindTexImage");
 
-  DCHECK(memory_);
+  if (!memory_) {
+    LOG(ERROR) << "Uninitialized image cannot be bound to texture";
+    return false;
+  }

[reveman, 2014/07/25 19:00:23]

Let's keep this as before. Sorry.

[sohanjg, 2014/07/26 10:42:23]

Done.

 #if defined(OS_WIN) || defined(USE_X11) || defined(OS_ANDROID) || \
     defined(USE_OZONE)
   if (target == GL_TEXTURE_EXTERNAL_OES) {
     if (egl_image_ == EGL_NO_IMAGE_KHR) {
       DCHECK_EQ(0u, egl_texture_id_);
       glGenTextures(1, &egl_texture_id_);
 
       {
         ScopedTextureBinder texture_binder(GL_TEXTURE_2D, egl_texture_id_);
 
@@ skipping 59 matching lines @@
 
 bool GLImageMemory::HasValidFormat() const {
   return ValidFormat(internalformat_);
 }
 
 size_t GLImageMemory::Bytes() const {
   return size_.GetArea() * BytesPerPixel(internalformat_);
 }
 
 }  // namespace gfx