| Index: content/common/gpu/gpu_messages.h
|
| diff --git a/content/common/gpu/gpu_messages.h b/content/common/gpu/gpu_messages.h
|
| index 82af22cdaf15685295f60a364fecbc36ebe690b7..0dd33696d39e485ff38c9501e6ef06a97f0c14e9 100644
|
| --- a/content/common/gpu/gpu_messages.h
|
| +++ b/content/common/gpu/gpu_messages.h
|
| @@ -46,6 +46,7 @@ IPC_STRUCT_BEGIN(GpuHostMsg_AcceleratedSurfaceNew_Params)
|
| IPC_STRUCT_MEMBER(int32, width)
|
| IPC_STRUCT_MEMBER(int32, height)
|
| IPC_STRUCT_MEMBER(uint64, surface_handle)
|
| + IPC_STRUCT_MEMBER(std::string, mailbox_name)
|
| IPC_STRUCT_MEMBER(int32, route_id)
|
| #if defined(OS_MACOSX)
|
| IPC_STRUCT_MEMBER(gfx::PluginWindowHandle, window)
|
| @@ -184,10 +185,6 @@ IPC_STRUCT_TRAITS_BEGIN(gfx::GLSurfaceHandle)
|
| IPC_STRUCT_TRAITS_MEMBER(transport)
|
| IPC_STRUCT_TRAITS_MEMBER(parent_gpu_process_id)
|
| IPC_STRUCT_TRAITS_MEMBER(parent_client_id)
|
| - IPC_STRUCT_TRAITS_MEMBER(parent_context_id)
|
| - IPC_STRUCT_TRAITS_MEMBER(parent_texture_id[0])
|
| - IPC_STRUCT_TRAITS_MEMBER(parent_texture_id[1])
|
| - IPC_STRUCT_TRAITS_MEMBER(sync_point)
|
| IPC_STRUCT_TRAITS_END()
|
|
|
| IPC_ENUM_TRAITS(content::CauseForGpuLaunch)
|
|
|