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

content/common/gpu/client/command_buffer_proxy_impl.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 "content/common/gpu/client/command_buffer_proxy_impl.h"
 
 #include "base/callback.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/memory/shared_memory.h"
@@ skipping 283 matching lines @@
 
 gpu::Capabilities CommandBufferProxyImpl::GetCapabilities() {
   return capabilities_;
 }
 
 gfx::GpuMemoryBuffer* CommandBufferProxyImpl::CreateGpuMemoryBuffer(
     size_t width,
     size_t height,
     unsigned internalformat,
     unsigned usage,
     int32* id) {

[reveman, 2014/07/10 22:33:11]

Note: changes to this function and DestroyGpuMemoryBuffer are only to make
content::CommandBufferProxyImpl::CreateGpuMemoryBuffer and
gpu::InProcessCommandBuffer::CreateGpuMemoryBuffer more consistent.

   *id = -1;
 
   if (last_state_.error != gpu::error::kNoError)
     return NULL;
 
+  scoped_ptr<gfx::GpuMemoryBuffer> buffer(
+      channel_->factory()->AllocateGpuMemoryBuffer(
+          width, height, internalformat, usage));
+  if (!buffer)
+    return NULL;
+
+  DCHECK(GpuChannelHost::IsValidGpuMemoryBuffer(buffer->GetHandle()));
+
   int32 new_id = channel_->ReserveGpuMemoryBufferId();
   DCHECK(gpu_memory_buffers_.find(new_id) == gpu_memory_buffers_.end());
 
-  scoped_ptr<gfx::GpuMemoryBuffer> gpu_memory_buffer(
-      channel_->factory()->AllocateGpuMemoryBuffer(
-          width, height, internalformat, usage));
-  if (!gpu_memory_buffer)
-    return NULL;
-
-  DCHECK(GpuChannelHost::IsValidGpuMemoryBuffer(
-             gpu_memory_buffer->GetHandle()));
-
   // This handle is owned by the GPU process and must be passed to it or it
   // will leak. In otherwords, do not early out on error between here and the
   // sending of the RegisterGpuMemoryBuffer IPC below.
   gfx::GpuMemoryBufferHandle handle =
-      channel_->ShareGpuMemoryBufferToGpuProcess(
-          gpu_memory_buffer->GetHandle());
+      channel_->ShareGpuMemoryBufferToGpuProcess(buffer->GetHandle());
 
   if (!Send(new GpuCommandBufferMsg_RegisterGpuMemoryBuffer(
                 route_id_,
                 new_id,
                 handle,
                 width,
                 height,
                 internalformat))) {
     return NULL;
   }
 
   *id = new_id;
-  gpu_memory_buffers_[new_id] = gpu_memory_buffer.release();
-  return gpu_memory_buffers_[new_id];
+  gpu_memory_buffers_.add(new_id, buffer.Pass());
+  return gpu_memory_buffers_.get(new_id);

[no sievers, 2014/07/11 18:33:29]

nit: can avoid the lookup here

[reveman, 2014/07/11 21:08:06]

Done.

 }
 
 void CommandBufferProxyImpl::DestroyGpuMemoryBuffer(int32 id) {
   if (last_state_.error != gpu::error::kNoError)
     return;
 
+  Send(new GpuCommandBufferMsg_DestroyGpuMemoryBuffer(route_id_, id));
+
   // Remove the gpu memory buffer from the client side cache.
-  GpuMemoryBufferMap::iterator it = gpu_memory_buffers_.find(id);
-  if (it != gpu_memory_buffers_.end()) {
-    delete it->second;
-    gpu_memory_buffers_.erase(it);
-  }
-
-  Send(new GpuCommandBufferMsg_DestroyGpuMemoryBuffer(route_id_, id));
+  gpu_memory_buffers_.erase(id);
 }
 
 int CommandBufferProxyImpl::GetRouteID() const {
   return route_id_;
 }
 
 void CommandBufferProxyImpl::Echo(const base::Closure& callback) {
   if (last_state_.error != gpu::error::kNoError) {
     return;
   }
@@ skipping 158 matching lines @@
   if (last_state_.error == gpu::error::kNoError)
     shared_state()->Read(&last_state_);
 }
 
 gpu::CommandBufferSharedState* CommandBufferProxyImpl::shared_state() const {
   return reinterpret_cast<gpu::CommandBufferSharedState*>(
       shared_state_shm_->memory());
 }
 
 }  // namespace content