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

gpu/command_buffer/service/image_manager.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.
 
 #include "gpu/command_buffer/service/image_manager.h"
 
 #include "ui/gl/gl_image.h"
 
 namespace gpu {
 namespace gles2 {
 
 ImageManager::ImageManager() : release_after_use_(false) {
 }
 
 ImageManager::~ImageManager() {
 }
 
+void ImageManager::Destroy(bool have_context) {
+  for (GLImageMap::const_iterator iter = gl_images_.begin();
+       iter != gl_images_.end();
+       ++iter)
+    iter->second.get()->Destroy(have_context);
+}

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

If we clear the hash map here, we would need to ensure Unregister doesnt do the
same, as Unregister will be invoked before Destroy and we would end up leaking
and having problems.

[reveman, 2014/06/02 14:34:47]

I'm not following. How can this cause a leak?

+
 void ImageManager::RegisterGpuMemoryBuffer(int32 id,
                                            gfx::GpuMemoryBufferHandle buffer,
                                            size_t width,
                                            size_t height,
                                            unsigned internalformat) {
   if (id <= 0) {
     DVLOG(0) << "Cannot register GPU memory buffer with non-positive ID.";
     return;
   }
 
@@ skipping 16 matching lines @@
 }
 
 void ImageManager::UnregisterGpuMemoryBuffer(int32 id) {
   RemoveImage(id);
 }
 
 void ImageManager::AddImage(gfx::GLImage* image, int32 service_id) {
   gl_images_[service_id] = image;
 }
 
 void ImageManager::RemoveImage(int32 service_id) {

[reveman, 2014/06/02 14:34:47]

Don't you need to call Destroy here too?

   gl_images_.erase(service_id);
 }
 
 gfx::GLImage* ImageManager::LookupImage(int32 service_id) {
   GLImageMap::const_iterator iter = gl_images_.find(service_id);
   if (iter != gl_images_.end())
     return iter->second.get();
 
   return NULL;
 }
 
 void ImageManager::SetReleaseAfterUse() {
   release_after_use_ = true;
 }
 
 }  // namespace gles2
 }  // namespace gpu