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

content/common/gpu/gpu_command_buffer_stub.cc

Index: content/common/gpu/gpu_command_buffer_stub.cc
diff --git a/content/common/gpu/gpu_command_buffer_stub.cc b/content/common/gpu/gpu_command_buffer_stub.cc
index 189215122af0bff2aeb71e88d7364c1a7ad0fe21..a3ff54edfd01ffe7afbae8f767e270894ea43a3e 100644
--- a/content/common/gpu/gpu_command_buffer_stub.cc
+++ b/content/common/gpu/gpu_command_buffer_stub.cc
@@ -929,6 +929,16 @@ void GpuCommandBufferStub::OnRegisterGpuMemoryBuffer(
   }
 #endif
 
+  if (!decoder_)
+    return;
+
+  gpu::gles2::ImageManager* image_manager = decoder_->GetImageManager();
+  DCHECK(image_manager);
+  if (image_manager->LookupImage(id)) {
+    LOG(ERROR) << "Image already exists with same ID.";
+    return;
+  }
+
   GpuChannelManager* manager = channel_->gpu_channel_manager();
   scoped_refptr<gfx::GLImage> image =
       manager->gpu_memory_buffer_factory()->CreateImageForGpuMemoryBuffer(
@@ -943,21 +953,21 @@ void GpuCommandBufferStub::OnRegisterGpuMemoryBuffer(
   if (context_group_->feature_info()->workarounds().release_image_after_use)
     image->SetReleaseAfterUse();
 
-  if (decoder_) {
-    gpu::gles2::ImageManager* image_manager = decoder_->GetImageManager();
-    DCHECK(image_manager);
-    image_manager->AddImage(image.get(), id);
-  }
+  image_manager->AddImage(image.get(), id);
 }
 
 void GpuCommandBufferStub::OnDestroyGpuMemoryBuffer(int32 id) {
   TRACE_EVENT0("gpu", "GpuCommandBufferStub::OnDestroyGpuMemoryBuffer");
 
-  if (decoder_) {
-    gpu::gles2::ImageManager* image_manager = decoder_->GetImageManager();
-    DCHECK(image_manager);
-    image_manager->RemoveImage(id);
+  if (!decoder_)
+    return;

[reveman, 2014/07/30 16:00:04]

nit: blank line here for consistency

[sohanjg, 2014/07/30 16:04:38]

Done.

+  gpu::gles2::ImageManager* image_manager = decoder_->GetImageManager();
+  DCHECK(image_manager);
+  if (!image_manager->LookupImage(id)) {
+    LOG(ERROR) << "Image with ID doesn't exist.";
+    return;
   }

[reveman, 2014/07/30 16:00:04]

nit: I would add a blank line here too

[sohanjg, 2014/07/30 16:04:38]

Done.

+  image_manager->RemoveImage(id);
 }
 
 void GpuCommandBufferStub::SendConsoleMessage(