| Index: content/common/gpu/gpu_messages.h
|
| diff --git a/content/common/gpu/gpu_messages.h b/content/common/gpu/gpu_messages.h
|
| index d72bf0541b1494491d60eccaa63dbacaf4602e37..38d2156ab76c6d0c2eedad26ee79dd24e52bee48 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)
|
| @@ -63,8 +64,6 @@ IPC_STRUCT_BEGIN(GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params)
|
| #if defined(OS_MACOSX)
|
| IPC_STRUCT_MEMBER(gfx::PluginWindowHandle, window)
|
| #endif
|
| - IPC_STRUCT_MEMBER(uint32, protection_state_id)
|
| - IPC_STRUCT_MEMBER(bool, skip_ack)
|
| IPC_STRUCT_END()
|
| #undef IPC_MESSAGE_EXPORT
|
| #define IPC_MESSAGE_EXPORT
|
| @@ -81,12 +80,10 @@ IPC_STRUCT_BEGIN(GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params)
|
| #if defined(OS_MACOSX)
|
| IPC_STRUCT_MEMBER(gfx::PluginWindowHandle, window)
|
| #endif
|
| - IPC_STRUCT_MEMBER(uint32, protection_state_id)
|
| IPC_STRUCT_END()
|
|
|
| IPC_STRUCT_BEGIN(GpuHostMsg_AcceleratedSurfaceRelease_Params)
|
| IPC_STRUCT_MEMBER(int32, surface_id)
|
| - IPC_STRUCT_MEMBER(uint64, identifier)
|
| IPC_STRUCT_MEMBER(int32, route_id)
|
| #if defined(OS_MACOSX)
|
| IPC_STRUCT_MEMBER(gfx::PluginWindowHandle, window)
|
| @@ -197,10 +194,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)
|
| @@ -280,16 +273,12 @@ IPC_MESSAGE_CONTROL1(GpuMsg_SetVideoMemoryWindowCount,
|
| // view.
|
| IPC_MESSAGE_ROUTED0(AcceleratedSurfaceMsg_ResizeViewACK)
|
|
|
| -// Tells the GPU process if it's worth suggesting release of the front surface.
|
| -IPC_MESSAGE_ROUTED2(AcceleratedSurfaceMsg_SetFrontSurfaceIsProtected,
|
| - bool /* is_protected */,
|
| - uint32 /* protection_state_id */)
|
| -
|
| // Tells the GPU process that the browser process has handled the swap
|
| // buffers or post sub-buffer request. A non-zero sync point means
|
| -// that we should wait for the sync point.
|
| +// that we should wait for the sync point. The surface_handle identifies
|
| +// that buffer that has finished presented, i.e. the buffer being returned.
|
| IPC_MESSAGE_ROUTED2(AcceleratedSurfaceMsg_BufferPresented,
|
| - bool /* presented */,
|
| + uint64 /* surface_handle */,
|
| uint32 /* sync_point */)
|
|
|
| // Tells the GPU process to remove all contexts.
|
|
|