Index: ui/gfx/gpu_memory_buffer.h |
diff --git a/ui/gfx/gpu_memory_buffer.h b/ui/gfx/gpu_memory_buffer.h |
index 3510a911c0493ca3c4781120a3abd0976f78781f..d2f551aef2a0ea772acf84f4b8aff0d88556594c 100644 |
--- a/ui/gfx/gpu_memory_buffer.h |
+++ b/ui/gfx/gpu_memory_buffer.h |
@@ -20,7 +20,8 @@ enum GpuMemoryBufferType { |
SHARED_MEMORY_BUFFER, |
EGL_CLIENT_BUFFER, |
IO_SURFACE_BUFFER, |
- GPU_MEMORY_BUFFER_TYPE_LAST = IO_SURFACE_BUFFER |
+ SURFACE_TEXTURE_BUFFER, |
+ GPU_MEMORY_BUFFER_TYPE_LAST = SURFACE_TEXTURE_BUFFER |
}; |
struct GpuMemoryBufferHandle { |
@@ -28,10 +29,14 @@ struct GpuMemoryBufferHandle { |
: type(EMPTY_BUFFER), |
handle(base::SharedMemory::NULLHandle()) |
#if defined(OS_ANDROID) |
- , native_buffer(NULL) |
+ , |
+ native_buffer(NULL), |
+ texture_id(0), |
+ surface_texture_handle(NULL) |
#endif |
#if defined(OS_MACOSX) |
- , io_surface_id(0) |
+ , |
+ io_surface_id(0) |
#endif |
{ |
} |
@@ -40,6 +45,8 @@ struct GpuMemoryBufferHandle { |
base::SharedMemoryHandle handle; |
#if defined(OS_ANDROID) |
EGLClientBuffer native_buffer; |
+ unsigned int texture_id; |
reveman
2014/02/26 08:02:34
I think it should be possible to create the surfac
|
+ void* surface_texture_handle; |
reveman
2014/02/26 08:02:34
hm, this should instead be something that can be s
|
#endif |
#if defined(OS_MACOSX) |
uint32 io_surface_id; |