gpu: Remove Create/DeleteImage IPC by adding an X11_PIXMAP_BUFFER GpuMemoryBuffer type.

gpu/command_buffer/service/image_manager.cc

Index: gpu/command_buffer/service/image_manager.cc
diff --git a/gpu/command_buffer/service/image_manager.cc b/gpu/command_buffer/service/image_manager.cc
index a3ac4350c875fabb11f6e53375bfeef68d158e6f..953e3bcb5731b3b98bfaeef8d6b7bae11c96d376 100644
--- a/gpu/command_buffer/service/image_manager.cc
+++ b/gpu/command_buffer/service/image_manager.cc
@@ -9,63 +9,27 @@
 namespace gpu {
 namespace gles2 {
 
-ImageManager::ImageManager() : release_after_use_(false) {
+ImageManager::ImageManager() {
 }
 
 ImageManager::~ImageManager() {
 }
 
-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;
-  }
-
-  if (LookupImage(id)) {
-    DVLOG(0) << "GPU memory buffer ID already in use.";
-    return;
-  }
-
-  scoped_refptr<gfx::GLImage> gl_image =
-      gfx::GLImage::CreateGLImageForGpuMemoryBuffer(buffer,
-                                                    gfx::Size(width, height),
-                                                    internalformat);
-  if (!gl_image)
-    return;
-
-  if (release_after_use_)
-    gl_image->SetReleaseAfterUse();
-
-  AddImage(gl_image.get(), id);
-}
-
-void ImageManager::UnregisterGpuMemoryBuffer(int32 id) {
-  RemoveImage(id);
-}
-
 void ImageManager::AddImage(gfx::GLImage* image, int32 service_id) {
-  gl_images_[service_id] = image;
+  images_[service_id] = image;
 }
 
 void ImageManager::RemoveImage(int32 service_id) {
-  gl_images_.erase(service_id);
+  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())
+  GLImageMap::const_iterator iter = images_.find(service_id);
+  if (iter != images_.end())
     return iter->second.get();
 
   return NULL;
 }
 
-void ImageManager::SetReleaseAfterUse() {
-  release_after_use_ = true;
-}
-
 }  // namespace gles2
 }  // namespace gpu