Index: ppapi/proxy/ppapi_messages.h |
diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h |
index b57e8ebf34e06bbb578130683c0e2286b3242348..5990709a87667729bfb27a1de45e8708012dadd5 100644 |
--- a/ppapi/proxy/ppapi_messages.h |
+++ b/ppapi/proxy/ppapi_messages.h |
@@ -228,6 +228,15 @@ IPC_STRUCT_TRAITS_BEGIN(ppapi::PPB_URLRequestInfo_Data::BodyItem) |
IPC_STRUCT_TRAITS_MEMBER(expected_last_modified_time) |
IPC_STRUCT_TRAITS_END() |
+IPC_STRUCT_TRAITS_BEGIN(ppapi::proxy::SerializedSharedMemoryHandle) |
+ IPC_STRUCT_TRAITS_MEMBER(handle) |
+ IPC_STRUCT_TRAITS_MEMBER(size) |
+IPC_STRUCT_TRAITS_END() |
+ |
+IPC_STRUCT_TRAITS_BEGIN(ppapi::proxy::SerializedFileDescriptor) |
+ IPC_STRUCT_TRAITS_MEMBER(descriptor) |
+IPC_STRUCT_TRAITS_END() |
+ |
#if !defined(OS_NACL) |
IPC_STRUCT_TRAITS_BEGIN(ppapi::proxy::PPPVideoCapture_Buffer) |
IPC_STRUCT_TRAITS_MEMBER(resource) |
@@ -353,12 +362,11 @@ IPC_SYNC_MESSAGE_CONTROL2_1(PpapiMsg_ConnectToPlugin, |
// |
// The handler of this message should always close all of the handles passed |
// in, since some could be valid even in the error case. |
-IPC_MESSAGE_ROUTED5(PpapiMsg_PPBAudio_NotifyAudioStreamCreated, |
+IPC_MESSAGE_ROUTED4(PpapiMsg_PPBAudio_NotifyAudioStreamCreated, |
ppapi::HostResource /* audio_id */, |
int32_t /* result_code (will be != PP_OK on failure) */, |
- IPC::PlatformFileForTransit /* socket_handle */, |
- base::SharedMemoryHandle /* handle */, |
- int32_t /* length */) |
+ ppapi::proxy::SerializedFileDescriptor /* socket_handle */, |
+ ppapi::proxy::SerializedSharedMemoryHandle /* handle */) |
// PPB_AudioInput_Dev. |
IPC_MESSAGE_ROUTED3(PpapiMsg_PPBAudioInput_EnumerateDevicesACK, |
@@ -909,6 +917,14 @@ IPC_SYNC_MESSAGE_ROUTED4_3(PpapiHostMsg_PPBImageData_Create, |
ppapi::HostResource /* result_resource */, |
std::string /* image_data_desc */, |
ppapi::proxy::ImageHandle /* result */) |
+IPC_SYNC_MESSAGE_ROUTED4_3(PpapiHostMsg_PPBImageData_CreateNaCl, |
+ PP_Instance /* instance */, |
+ int32 /* format */, |
+ PP_Size /* size */, |
+ PP_Bool /* init_to_zero */, |
+ ppapi::HostResource /* result_resource */, |
+ std::string /* image_data_desc */, |
+ base::SharedMemoryHandle /* result */) |
// PPB_Instance. |
IPC_SYNC_MESSAGE_ROUTED1_1(PpapiHostMsg_PPBInstance_GetWindowObject, |