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

ui/gfx/gpu_memory_buffer.h

Index: ui/gfx/gpu_memory_buffer.h
diff --git a/ui/gfx/gpu_memory_buffer.h b/ui/gfx/gpu_memory_buffer.h
index 1a622016c7c003f212ec8428f96cf3f1ae0cedba..d21725a31dc25ffc59d5ed6a3245e94419a5ae0c 100644
--- a/ui/gfx/gpu_memory_buffer.h
+++ b/ui/gfx/gpu_memory_buffer.h
@@ -9,8 +9,8 @@
 #include "build/build_config.h"
 #include "ui/gfx/gfx_export.h"
 
-#if defined(OS_ANDROID)
-#include <third_party/khronos/EGL/egl.h>
+#if defined(USE_X11)
+#include "ui/gfx/x/x11_types.h"
 #endif
 
 namespace gfx {
@@ -21,7 +21,8 @@ enum GpuMemoryBufferType {
   IO_SURFACE_BUFFER,
   ANDROID_NATIVE_BUFFER,
   SURFACE_TEXTURE_BUFFER,
-  GPU_MEMORY_BUFFER_TYPE_LAST = SURFACE_TEXTURE_BUFFER
+  X11_PIXMAP_BUFFER,
+  GPU_MEMORY_BUFFER_TYPE_LAST = X11_PIXMAP_BUFFER
 };
 
 // TODO(alexst): Merge this with GpuMemoryBufferId as part of switchover to
@@ -54,9 +55,12 @@ struct GFX_EXPORT GpuMemoryBufferHandle {
   uint32 io_surface_id;
 #endif
 #if defined(OS_ANDROID)
-  EGLClientBuffer native_buffer;
+  long buffer_id;

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

nit: why change this?

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

Everything in this struct is expected to be serialized and potentially used to
identify the buffer by another process. While "EGLClientBuffer" which is a
"void*" could be used as an identifier, that's pretty nasty. Long term we'll use
|global_id| (or |handle| if we add more generic gralloc support that works in
out of process mode) and the factory will do a lookup just like the X11Pixmap
factory does. I think buffer_id is fine for now and a big improvement over
EGLClientBuffer.

   SurfaceTextureId surface_texture_id;
 #endif
+#if defined(USE_X11)
+  XID pixmap;
+#endif
 };
 
 // This interface typically correspond to a type of shared memory that is also