| 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..57d2cd7b08115f211eab61596dd29754697c7c3e 100644
|
| --- a/ui/gfx/gpu_memory_buffer.h
|
| +++ b/ui/gfx/gpu_memory_buffer.h
|
| @@ -13,6 +13,10 @@
|
| #include <third_party/khronos/EGL/egl.h>
|
| #endif
|
|
|
| +#if defined(USE_X11)
|
| +#include "ui/gfx/x/x11_types.h"
|
| +#endif
|
| +
|
| namespace gfx {
|
|
|
| enum GpuMemoryBufferType {
|
| @@ -21,6 +25,7 @@ enum GpuMemoryBufferType {
|
| IO_SURFACE_BUFFER,
|
| ANDROID_NATIVE_BUFFER,
|
| SURFACE_TEXTURE_BUFFER,
|
| + X11_PIXMAP_BUFFER,
|
| GPU_MEMORY_BUFFER_TYPE_LAST = SURFACE_TEXTURE_BUFFER
|
| };
|
|
|
| @@ -57,6 +62,9 @@ struct GFX_EXPORT GpuMemoryBufferHandle {
|
| EGLClientBuffer native_buffer;
|
| 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
|
|
|