Add initial GpuMemoryBufferSurfaceTexture implementation.

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 3510a911c0493ca3c4781120a3abd0976f78781f..08f75329e6b425891f8e898e95d00417b9af78fb 100644
--- a/ui/gfx/gpu_memory_buffer.h
+++ b/ui/gfx/gpu_memory_buffer.h
@@ -20,9 +20,20 @@ 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
 };
 
+#if defined(OS_ANDROID)
+struct SurfaceTextureId {
+  SurfaceTextureId() : primary_id(0), secondary_id(0) {}
+  SurfaceTextureId(int32 primary_id, int32 secondary_id)
+      : primary_id(primary_id), secondary_id(secondary_id) {}
+  int32 primary_id;
+  int32 secondary_id;
+};
+#endif
+
 struct GpuMemoryBufferHandle {
   GpuMemoryBufferHandle()
       : type(EMPTY_BUFFER),
@@ -44,7 +55,9 @@ struct GpuMemoryBufferHandle {
 #if defined(OS_MACOSX)
   uint32 io_surface_id;
 #endif
-
+#if defined(OS_ANDROID)
+  SurfaceTextureId surface_texture_id;
+#endif
 };
 
 // Interface for creating and accessing a zero-copy GPU memory buffer.