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

ui/gl/gl_image_io_surface.cc

 // Copyright 2013 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_io_surface.h"
 
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/io_surface_support_mac.h"
 
 namespace gfx {
 
 GLImageIOSurface::GLImageIOSurface(gfx::Size size)
     : io_surface_support_(IOSurfaceSupport::Initialize()), size_(size) {
   CHECK(io_surface_support_);
 }
 
-GLImageIOSurface::~GLImageIOSurface() { Destroy(); }
+GLImageIOSurface::~GLImageIOSurface() {
+  DCHECK(!io_surface_);
+}
 
 bool GLImageIOSurface::Initialize(gfx::GpuMemoryBufferHandle buffer) {
   io_surface_.reset(io_surface_support_->IOSurfaceLookup(buffer.io_surface_id));
   if (!io_surface_) {
     LOG(ERROR) << "IOSurface lookup failed";
     return false;
   }
 
   return true;
 }
 
+void GLImageIOSurface::Destroy(bool have_context) {
+  DCHECK(io_surface_);

[reveman, 2014/05/31 05:05:06]

This DCHECK seems inconsistent with other implementations of the Destroy
function which seem to handle multiple calls to Destroy or Initialize not having
been called fine.

[sohanjg, 2014/06/02 13:59:42]

Done.

+  io_surface_.reset()
+}
+
 gfx::Size GLImageIOSurface::GetSize() { return size_; }
 
 bool GLImageIOSurface::BindTexImage(unsigned target) {
   if (target != GL_TEXTURE_RECTANGLE_ARB) {
     // This might be supported in the future. For now, perform strict
     // validation so we know what's going on.
     LOG(ERROR) << "IOSurface requires TEXTURE_RECTANGLE_ARB target";
     return false;
   }
 
@@ skipping 13 matching lines @@
                                                   0);
   if (cgl_error != kCGLNoError) {
     LOG(ERROR) << "Error in CGLTexImageIOSurface2D";
     return false;
   }
 
   return true;
 }
 
 }  // namespace gfx