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

ui/gl/gl_image_shm.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_shm.h"
 
 #include "base/debug/trace_event.h"
 #include "base/process/process_handle.h"
+#include "ui/gl/gl_context.h"

[reveman, 2014/05/29 16:30:34]

do we need this?

 #include "ui/gl/scoped_binders.h"
 
 #if defined(OS_WIN) || defined(USE_X11) || defined(OS_ANDROID) || \
     defined(USE_OZONE)
 #include "ui/gl/gl_surface_egl.h"
 #endif
 
 namespace gfx {
 
 namespace {
@@ skipping 53 matching lines @@
       internalformat_(internalformat)
 #if defined(OS_WIN) || defined(USE_X11) || defined(OS_ANDROID) || \
     defined(USE_OZONE)
       ,
       egl_texture_id_(0u),
       egl_image_(EGL_NO_IMAGE_KHR)
 #endif
 {
 }
 
-GLImageShm::~GLImageShm() { Destroy(); }
+GLImageShm::~GLImageShm() {

[reveman, 2014/05/29 16:30:34]

Verify that Destroy has been called.

+}
 
 bool GLImageShm::Initialize(gfx::GpuMemoryBufferHandle buffer) {
   if (!ValidFormat(internalformat_)) {
     DVLOG(0) << "Invalid format: " << internalformat_;
     return false;
   }
 
   if (!base::SharedMemory::IsHandleValid(buffer.handle))
     return false;
 
   base::SharedMemory shared_memory(buffer.handle, true);
 
   // Duplicate the handle.
   base::SharedMemoryHandle duped_shared_memory_handle;
   if (!shared_memory.ShareToProcess(base::GetCurrentProcessHandle(),
                                     &duped_shared_memory_handle)) {
     DVLOG(0) << "Failed to duplicate shared memory handle.";
     return false;
   }
 
   shared_memory_.reset(
       new base::SharedMemory(duped_shared_memory_handle, true));
   return true;
 }
 
-void GLImageShm::Destroy() {
+void GLImageShm::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_) {
+  if (egl_texture_id_ && have_context) {

[reveman, 2014/05/29 16:30:34]

I think you should set egl_texture_id_ to 0 even if have_context is false so you
can verify that Destroy was called in the dtor.

     glDeleteTextures(1, &egl_texture_id_);
     egl_texture_id_ = 0u;
   }
 #endif

[reveman, 2014/05/29 16:30:34]

Please add shared_memory_.reset() to this function. Destroy should undo all the
work that Initialize has done and we want to make sure BindTexImage fails
predictably in a debug build if ever called after Destroy.

 }
 
 gfx::Size GLImageShm::GetSize() { return size_; }
 
 bool GLImageShm::BindTexImage(unsigned target) {
   TRACE_EVENT0("gpu", "GLImageShm::BindTexImage");
   DCHECK(shared_memory_);
   DCHECK(ValidFormat(internalformat_));
 
   size_t size = size_.GetArea() * BytesPerPixel(internalformat_);
@@ skipping 71 matching lines @@
                0,  // border
                DataFormat(internalformat_),
                DataType(internalformat_),
                shared_memory_->memory());
 
   shared_memory_->Unmap();
   return true;
 }
 
 }  // namespace gfx