| Index: ui/gfx/gpu_memory_buffer.h
|
| diff --git a/ui/gfx/gpu_memory_buffer.h b/ui/gfx/gpu_memory_buffer.h
|
| index 17bb6693858fc5e43a63da1d7c7193b08b62227d..4a7b142d175fb517065d977003a9397e7459c0c5 100644
|
| --- a/ui/gfx/gpu_memory_buffer.h
|
| +++ b/ui/gfx/gpu_memory_buffer.h
|
| @@ -18,7 +18,8 @@ namespace gfx {
|
| enum GpuMemoryBufferType {
|
| EMPTY_BUFFER,
|
| SHARED_MEMORY_BUFFER,
|
| - EGL_CLIENT_BUFFER
|
| + EGL_CLIENT_BUFFER,
|
| + IO_SURFACE_BUFFER
|
| };
|
|
|
| struct GpuMemoryBufferHandle {
|
| @@ -28,6 +29,9 @@ struct GpuMemoryBufferHandle {
|
| #if defined(OS_ANDROID)
|
| , native_buffer(NULL)
|
| #endif
|
| +#if defined(OS_MACOSX)
|
| + , io_surface_id(0)
|
| +#endif
|
| {
|
| }
|
| bool is_null() const { return type == EMPTY_BUFFER; }
|
| @@ -36,6 +40,10 @@ struct GpuMemoryBufferHandle {
|
| #if defined(OS_ANDROID)
|
| EGLClientBuffer native_buffer;
|
| #endif
|
| +#if defined(OS_MACOSX)
|
| + uint32 io_surface_id;
|
| +#endif
|
| +
|
| };
|
|
|
| // Interface for creating and accessing a zero-copy GPU memory buffer.
|
|
|