Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / content / common / child_process_messages.h

diff --git a/src/content/common/child_process_messages.h b/src/content/common/child_process_messages.h
index f220891..ecbd201 100644 (file)
--- a/src/content/common/child_process_messages.h
+++ b/src/content/common/child_process_messages.h
@@ -60,12 +60,22 @@ IPC_STRUCT_TRAITS_END()
 IPC_ENUM_TRAITS_MAX_VALUE(gfx::GpuMemoryBufferType,
                           gfx::GPU_MEMORY_BUFFER_TYPE_LAST)
 
+#if defined(OS_ANDROID)
+IPC_STRUCT_TRAITS_BEGIN(gfx::SurfaceTextureId)
+  IPC_STRUCT_TRAITS_MEMBER(primary_id)
+  IPC_STRUCT_TRAITS_MEMBER(secondary_id)
+IPC_STRUCT_TRAITS_END()
+#endif
+
 IPC_STRUCT_TRAITS_BEGIN(gfx::GpuMemoryBufferHandle)
   IPC_STRUCT_TRAITS_MEMBER(type)
   IPC_STRUCT_TRAITS_MEMBER(handle)
 #if defined(OS_MACOSX)
   IPC_STRUCT_TRAITS_MEMBER(io_surface_id)
 #endif
+#if defined(OS_ANDROID)
+  IPC_STRUCT_TRAITS_MEMBER(surface_texture_id)
+#endif
 IPC_STRUCT_TRAITS_END()
 
 #undef IPC_MESSAGE_EXPORT
@@ -171,8 +181,9 @@ IPC_MESSAGE_CONTROL1(ChildProcessHostMsg_TcmallocStats,
 #endif
 
 // Asks the browser to create a gpu memory buffer.
-IPC_SYNC_MESSAGE_CONTROL3_1(ChildProcessHostMsg_SyncAllocateGpuMemoryBuffer,
+IPC_SYNC_MESSAGE_CONTROL4_1(ChildProcessHostMsg_SyncAllocateGpuMemoryBuffer,
                             uint32 /* width */,
                             uint32 /* height */,
                             uint32 /* internalformat */,
+                            uint32 /* usage */,
                             gfx::GpuMemoryBufferHandle)