Index: content/common/gpu/gpu_messages.h |
diff --git a/content/common/gpu/gpu_messages.h b/content/common/gpu/gpu_messages.h |
index 8af047702bd15533ad0eb3d412ad0d8adfdbf825..ede5b3ad47da8477b1bd3e6d059f37f32749791a 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::vector<signed char>, 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,7 +80,6 @@ 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) |
@@ -197,10 +195,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 +274,11 @@ 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. |
IPC_MESSAGE_ROUTED2(AcceleratedSurfaceMsg_BufferPresented, |
- bool /* presented */, |
+ uint64 /* surface_handle */, |
piman
2012/11/09 22:02:01
Please document above what this surface handle rep
no sievers
2012/11/19 20:30:44
Done.
|
uint32 /* sync_point */) |
// Tells the GPU process to remove all contexts. |