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

content/common/gpu/gpu_command_buffer_stub.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 "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/hash.h"
 #include "base/memory/shared_memory.h"
@@ skipping 910 matching lines @@
       memory_manager_client_state_.reset(GetMemoryManager()->CreateClientState(
           this, surface_id_ != 0, true));
     }
   } else {
     memory_manager_client_state_.reset();
   }
 }
 
 void GpuCommandBufferStub::OnRegisterGpuMemoryBuffer(
     int32 id,
-    gfx::GpuMemoryBufferHandle gpu_memory_buffer,
+    gfx::GpuMemoryBufferHandle handle,
     uint32 width,
     uint32 height,
     uint32 internalformat) {
   TRACE_EVENT0("gpu", "GpuCommandBufferStub::OnRegisterGpuMemoryBuffer");
+
+  // Verify that renderer is not trying to use a buffer it doesn't own.
+  switch (handle.type) {
 #if defined(OS_ANDROID)
-  // Verify that renderer is not trying to use a surface texture it doesn't own.
-  if (gpu_memory_buffer.type == gfx::SURFACE_TEXTURE_BUFFER &&
-      gpu_memory_buffer.surface_texture_id.secondary_id !=
-          channel()->client_id()) {
-    LOG(ERROR) << "Illegal surface texture ID for renderer.";
-    return;
+    case gfx::SURFACE_TEXTURE_BUFFER:
+      if (handle.surface_texture_id.secondary_id != channel()->client_id()) {
+        LOG(ERROR) << "Illegal surface texture ID for renderer.";
+        return;
+      }
+      break;
+#endif
+#if defined(USE_X11)
+    case gfx::X11_PIXMAP_BUFFER:
+      if (handle.global_id.secondary_id != channel()->client_id()) {
+        LOG(ERROR) << "Illegal global ID for renderer.";
+        return;
+      }
+      break;
+#endif
+    default:
+      break;
   }
-#endif
+
   if (gpu_control_service_) {
     gpu_control_service_->RegisterGpuMemoryBuffer(
-        id, gpu_memory_buffer, width, height, internalformat);
+        id, handle, width, height, internalformat);
   }
 }
 
 void GpuCommandBufferStub::OnDestroyGpuMemoryBuffer(int32 id) {
   TRACE_EVENT0("gpu", "GpuCommandBufferStub::OnDestroyGpuMemoryBuffer");
   if (gpu_control_service_)
     gpu_control_service_->UnregisterGpuMemoryBuffer(id);
 }
 
 void GpuCommandBufferStub::SendConsoleMessage(
@@ skipping 88 matching lines @@
   if (decoder_)
     decoder_->LoseContext(GL_UNKNOWN_CONTEXT_RESET_ARB);
   command_buffer_->SetParseError(gpu::error::kLostContext);
 }
 
 uint64 GpuCommandBufferStub::GetMemoryUsage() const {
   return GetMemoryManager()->GetClientMemoryUsage(this);
 }
 
 }  // namespace content