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

ui/gl/gl_image_glx.cc

 // Copyright (c) 2012 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.
 
 extern "C" {
 #include <X11/Xlib.h>
 }
 
 #include "ui/gl/gl_image_glx.h"
 
@@ skipping 93 matching lines @@
 
   return size;
 }
 
 }  // namespace anonymous
 
 GLImageGLX::GLImageGLX(const gfx::Size& size, unsigned internalformat)
     : glx_pixmap_(0), size_(size), internalformat_(internalformat) {
 }
 
-GLImageGLX::~GLImageGLX() { Destroy(); }
+GLImageGLX::~GLImageGLX() {
+  DCHECK_EQ(0u, glx_pixmap_);
+}
 
 bool GLImageGLX::Initialize(XID pixmap) {
   if (!GLSurfaceGLX::IsTextureFromPixmapSupported()) {
     DVLOG(0) << "GLX_EXT_texture_from_pixmap not supported.";
     return false;
   }
 
   if (!ValidFormat(internalformat_)) {
     DVLOG(0) << "Invalid format: " << internalformat_;
     return false;
@@ skipping 28 matching lines @@
   glx_pixmap_ = glXCreatePixmap(
       gfx::GetXDisplay(), *config.get(), pixmap, pixmap_attribs);
   if (!glx_pixmap_) {
     DVLOG(0) << "glXCreatePixmap failed.";
     return false;
   }
 
   return true;
 }
 
-void GLImageGLX::Destroy() {
+void GLImageGLX::Destroy(bool have_context) {
   if (glx_pixmap_) {
     glXDestroyGLXPixmap(gfx::GetXDisplay(), glx_pixmap_);
     glx_pixmap_ = 0;
   }
 }
 
 gfx::Size GLImageGLX::GetSize() { return size_; }
 
 bool GLImageGLX::BindTexImage(unsigned target) {
-  if (!glx_pixmap_)
+  if (!glx_pixmap_) {
+    DVLOG(0) << "No GLXPixMap to bind";

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

"Uninitialized image cannot be bound to texture"

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

Done.

     return false;
+  }
 
   // Requires TEXTURE_2D target.
   if (target != GL_TEXTURE_2D)
     return false;
 
   glXBindTexImageEXT(gfx::GetXDisplay(), glx_pixmap_, GLX_FRONT_LEFT_EXT, 0);
   return true;
 }
 
 void GLImageGLX::ReleaseTexImage(unsigned target) {
-  DCHECK(glx_pixmap_);
+  if (!glx_pixmap_) {
+    DVLOG(0) << "No GLXPixMap to release";

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

"Uninitialized image cannot be released from texture"

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

Done.

+    return false;
+  }
   DCHECK_EQ(static_cast<GLenum>(GL_TEXTURE_2D), target);
 
   glXReleaseTexImageEXT(gfx::GetXDisplay(), glx_pixmap_, GLX_FRONT_LEFT_EXT);
 }
 
 }  // namespace gfx