| Index: ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
|
| diff --git a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
|
| index f2cd8ca827f702d7985134d5cdc281ce65623a24..4249fe9cc29c6ad1baee8a95edf6e71668f079ff 100644
|
| --- a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
|
| +++ b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
|
| @@ -202,6 +202,7 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Testing_Private_1_0;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_UDPSocket_Private_0_2;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_UDPSocket_Private_0_3;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_UDPSocket_Private_0_4;
|
| +static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_UDPSocket_Private_0_5;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_UMA_Private_0_3;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_VideoDestination_Private_0_1;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_VideoSource_Private_0_1;
|
| @@ -1732,7 +1733,7 @@ static void Pnacl_M29_PPB_UDPSocket_Close(PP_Resource udp_socket) {
|
| iface->Close(udp_socket);
|
| }
|
|
|
| -static int32_t Pnacl_M29_PPB_UDPSocket_SetOption(PP_Resource udp_socket, PP_UDPSocket_Option name, struct PP_Var* value, struct PP_CompletionCallback* callback) {
|
| +static int32_t Pnacl_M29_PPB_UDPSocket_SetOption(PP_Resource udp_socket, PP_UDPSocket_Option_1_0 name, struct PP_Var* value, struct PP_CompletionCallback* callback) {
|
| const struct PPB_UDPSocket_1_0 *iface = Pnacl_WrapperInfo_PPB_UDPSocket_1_0.real_iface;
|
| return iface->SetOption(udp_socket, name, *value, *callback);
|
| }
|
| @@ -4404,7 +4405,7 @@ static PP_Bool Pnacl_M23_PPB_UDPSocket_Private_IsUDPSocket(PP_Resource resource_
|
| return iface->IsUDPSocket(resource_id);
|
| }
|
|
|
| -static int32_t Pnacl_M23_PPB_UDPSocket_Private_SetSocketFeature(PP_Resource udp_socket, PP_UDPSocketFeature_Private name, struct PP_Var* value) {
|
| +static int32_t Pnacl_M23_PPB_UDPSocket_Private_SetSocketFeature(PP_Resource udp_socket, PP_UDPSocketFeature_Private_0_4 name, struct PP_Var* value) {
|
| const struct PPB_UDPSocket_Private_0_4 *iface = Pnacl_WrapperInfo_PPB_UDPSocket_Private_0_4.real_iface;
|
| return iface->SetSocketFeature(udp_socket, name, *value);
|
| }
|
| @@ -4441,6 +4442,55 @@ static void Pnacl_M23_PPB_UDPSocket_Private_Close(PP_Resource udp_socket) {
|
|
|
| /* End wrapper methods for PPB_UDPSocket_Private_0_4 */
|
|
|
| +/* Begin wrapper methods for PPB_UDPSocket_Private_0_5 */
|
| +
|
| +static PP_Resource Pnacl_M41_PPB_UDPSocket_Private_Create(PP_Instance instance_id) {
|
| + const struct PPB_UDPSocket_Private_0_5 *iface = Pnacl_WrapperInfo_PPB_UDPSocket_Private_0_5.real_iface;
|
| + return iface->Create(instance_id);
|
| +}
|
| +
|
| +static PP_Bool Pnacl_M41_PPB_UDPSocket_Private_IsUDPSocket(PP_Resource resource_id) {
|
| + const struct PPB_UDPSocket_Private_0_5 *iface = Pnacl_WrapperInfo_PPB_UDPSocket_Private_0_5.real_iface;
|
| + return iface->IsUDPSocket(resource_id);
|
| +}
|
| +
|
| +static int32_t Pnacl_M41_PPB_UDPSocket_Private_SetSocketFeature(PP_Resource udp_socket, PP_UDPSocketFeature_Private name, struct PP_Var* value) {
|
| + const struct PPB_UDPSocket_Private_0_5 *iface = Pnacl_WrapperInfo_PPB_UDPSocket_Private_0_5.real_iface;
|
| + return iface->SetSocketFeature(udp_socket, name, *value);
|
| +}
|
| +
|
| +static int32_t Pnacl_M41_PPB_UDPSocket_Private_Bind(PP_Resource udp_socket, const struct PP_NetAddress_Private* addr, struct PP_CompletionCallback* callback) {
|
| + const struct PPB_UDPSocket_Private_0_5 *iface = Pnacl_WrapperInfo_PPB_UDPSocket_Private_0_5.real_iface;
|
| + return iface->Bind(udp_socket, addr, *callback);
|
| +}
|
| +
|
| +static PP_Bool Pnacl_M41_PPB_UDPSocket_Private_GetBoundAddress(PP_Resource udp_socket, struct PP_NetAddress_Private* addr) {
|
| + const struct PPB_UDPSocket_Private_0_5 *iface = Pnacl_WrapperInfo_PPB_UDPSocket_Private_0_5.real_iface;
|
| + return iface->GetBoundAddress(udp_socket, addr);
|
| +}
|
| +
|
| +static int32_t Pnacl_M41_PPB_UDPSocket_Private_RecvFrom(PP_Resource udp_socket, char* buffer, int32_t num_bytes, struct PP_CompletionCallback* callback) {
|
| + const struct PPB_UDPSocket_Private_0_5 *iface = Pnacl_WrapperInfo_PPB_UDPSocket_Private_0_5.real_iface;
|
| + return iface->RecvFrom(udp_socket, buffer, num_bytes, *callback);
|
| +}
|
| +
|
| +static PP_Bool Pnacl_M41_PPB_UDPSocket_Private_GetRecvFromAddress(PP_Resource udp_socket, struct PP_NetAddress_Private* addr) {
|
| + const struct PPB_UDPSocket_Private_0_5 *iface = Pnacl_WrapperInfo_PPB_UDPSocket_Private_0_5.real_iface;
|
| + return iface->GetRecvFromAddress(udp_socket, addr);
|
| +}
|
| +
|
| +static int32_t Pnacl_M41_PPB_UDPSocket_Private_SendTo(PP_Resource udp_socket, const char* buffer, int32_t num_bytes, const struct PP_NetAddress_Private* addr, struct PP_CompletionCallback* callback) {
|
| + const struct PPB_UDPSocket_Private_0_5 *iface = Pnacl_WrapperInfo_PPB_UDPSocket_Private_0_5.real_iface;
|
| + return iface->SendTo(udp_socket, buffer, num_bytes, addr, *callback);
|
| +}
|
| +
|
| +static void Pnacl_M41_PPB_UDPSocket_Private_Close(PP_Resource udp_socket) {
|
| + const struct PPB_UDPSocket_Private_0_5 *iface = Pnacl_WrapperInfo_PPB_UDPSocket_Private_0_5.real_iface;
|
| + iface->Close(udp_socket);
|
| +}
|
| +
|
| +/* End wrapper methods for PPB_UDPSocket_Private_0_5 */
|
| +
|
| /* Begin wrapper methods for PPB_UMA_Private_0_3 */
|
|
|
| static void Pnacl_M35_PPB_UMA_Private_HistogramCustomTimes(PP_Instance instance, struct PP_Var* name, int64_t sample, int64_t min, int64_t max, uint32_t bucket_count) {
|
| @@ -5091,7 +5141,7 @@ static const struct PPB_UDPSocket_1_0 Pnacl_Wrappers_PPB_UDPSocket_1_0 = {
|
| .RecvFrom = (int32_t (*)(PP_Resource udp_socket, char* buffer, int32_t num_bytes, PP_Resource* addr, struct PP_CompletionCallback callback))&Pnacl_M29_PPB_UDPSocket_RecvFrom,
|
| .SendTo = (int32_t (*)(PP_Resource udp_socket, const char* buffer, int32_t num_bytes, PP_Resource addr, struct PP_CompletionCallback callback))&Pnacl_M29_PPB_UDPSocket_SendTo,
|
| .Close = (void (*)(PP_Resource udp_socket))&Pnacl_M29_PPB_UDPSocket_Close,
|
| - .SetOption = (int32_t (*)(PP_Resource udp_socket, PP_UDPSocket_Option name, struct PP_Var value, struct PP_CompletionCallback callback))&Pnacl_M29_PPB_UDPSocket_SetOption
|
| + .SetOption = (int32_t (*)(PP_Resource udp_socket, PP_UDPSocket_Option_1_0 name, struct PP_Var value, struct PP_CompletionCallback callback))&Pnacl_M29_PPB_UDPSocket_SetOption
|
| };
|
|
|
| static const struct PPB_UDPSocket_1_1 Pnacl_Wrappers_PPB_UDPSocket_1_1 = {
|
| @@ -5850,7 +5900,7 @@ static const struct PPB_UDPSocket_Private_0_3 Pnacl_Wrappers_PPB_UDPSocket_Priva
|
| static const struct PPB_UDPSocket_Private_0_4 Pnacl_Wrappers_PPB_UDPSocket_Private_0_4 = {
|
| .Create = (PP_Resource (*)(PP_Instance instance_id))&Pnacl_M23_PPB_UDPSocket_Private_Create,
|
| .IsUDPSocket = (PP_Bool (*)(PP_Resource resource_id))&Pnacl_M23_PPB_UDPSocket_Private_IsUDPSocket,
|
| - .SetSocketFeature = (int32_t (*)(PP_Resource udp_socket, PP_UDPSocketFeature_Private name, struct PP_Var value))&Pnacl_M23_PPB_UDPSocket_Private_SetSocketFeature,
|
| + .SetSocketFeature = (int32_t (*)(PP_Resource udp_socket, PP_UDPSocketFeature_Private_0_4 name, struct PP_Var value))&Pnacl_M23_PPB_UDPSocket_Private_SetSocketFeature,
|
| .Bind = (int32_t (*)(PP_Resource udp_socket, const struct PP_NetAddress_Private* addr, struct PP_CompletionCallback callback))&Pnacl_M23_PPB_UDPSocket_Private_Bind,
|
| .GetBoundAddress = (PP_Bool (*)(PP_Resource udp_socket, struct PP_NetAddress_Private* addr))&Pnacl_M23_PPB_UDPSocket_Private_GetBoundAddress,
|
| .RecvFrom = (int32_t (*)(PP_Resource udp_socket, char* buffer, int32_t num_bytes, struct PP_CompletionCallback callback))&Pnacl_M23_PPB_UDPSocket_Private_RecvFrom,
|
| @@ -5859,6 +5909,18 @@ static const struct PPB_UDPSocket_Private_0_4 Pnacl_Wrappers_PPB_UDPSocket_Priva
|
| .Close = (void (*)(PP_Resource udp_socket))&Pnacl_M23_PPB_UDPSocket_Private_Close
|
| };
|
|
|
| +static const struct PPB_UDPSocket_Private_0_5 Pnacl_Wrappers_PPB_UDPSocket_Private_0_5 = {
|
| + .Create = (PP_Resource (*)(PP_Instance instance_id))&Pnacl_M41_PPB_UDPSocket_Private_Create,
|
| + .IsUDPSocket = (PP_Bool (*)(PP_Resource resource_id))&Pnacl_M41_PPB_UDPSocket_Private_IsUDPSocket,
|
| + .SetSocketFeature = (int32_t (*)(PP_Resource udp_socket, PP_UDPSocketFeature_Private name, struct PP_Var value))&Pnacl_M41_PPB_UDPSocket_Private_SetSocketFeature,
|
| + .Bind = (int32_t (*)(PP_Resource udp_socket, const struct PP_NetAddress_Private* addr, struct PP_CompletionCallback callback))&Pnacl_M41_PPB_UDPSocket_Private_Bind,
|
| + .GetBoundAddress = (PP_Bool (*)(PP_Resource udp_socket, struct PP_NetAddress_Private* addr))&Pnacl_M41_PPB_UDPSocket_Private_GetBoundAddress,
|
| + .RecvFrom = (int32_t (*)(PP_Resource udp_socket, char* buffer, int32_t num_bytes, struct PP_CompletionCallback callback))&Pnacl_M41_PPB_UDPSocket_Private_RecvFrom,
|
| + .GetRecvFromAddress = (PP_Bool (*)(PP_Resource udp_socket, struct PP_NetAddress_Private* addr))&Pnacl_M41_PPB_UDPSocket_Private_GetRecvFromAddress,
|
| + .SendTo = (int32_t (*)(PP_Resource udp_socket, const char* buffer, int32_t num_bytes, const struct PP_NetAddress_Private* addr, struct PP_CompletionCallback callback))&Pnacl_M41_PPB_UDPSocket_Private_SendTo,
|
| + .Close = (void (*)(PP_Resource udp_socket))&Pnacl_M41_PPB_UDPSocket_Private_Close
|
| +};
|
| +
|
| static const struct PPB_UMA_Private_0_3 Pnacl_Wrappers_PPB_UMA_Private_0_3 = {
|
| .HistogramCustomTimes = (void (*)(PP_Instance instance, struct PP_Var name, int64_t sample, int64_t min, int64_t max, uint32_t bucket_count))&Pnacl_M35_PPB_UMA_Private_HistogramCustomTimes,
|
| .HistogramCustomCounts = (void (*)(PP_Instance instance, struct PP_Var name, int32_t sample, int32_t min, int32_t max, uint32_t bucket_count))&Pnacl_M35_PPB_UMA_Private_HistogramCustomCounts,
|
| @@ -6556,6 +6618,12 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_UDPSocket_Private_0_4 = {
|
| .real_iface = NULL
|
| };
|
|
|
| +static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_UDPSocket_Private_0_5 = {
|
| + .iface_macro = PPB_UDPSOCKET_PRIVATE_INTERFACE_0_5,
|
| + .wrapped_iface = (const void *) &Pnacl_Wrappers_PPB_UDPSocket_Private_0_5,
|
| + .real_iface = NULL
|
| +};
|
| +
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_UMA_Private_0_3 = {
|
| .iface_macro = PPB_UMA_PRIVATE_INTERFACE_0_3,
|
| .wrapped_iface = (const void *) &Pnacl_Wrappers_PPB_UMA_Private_0_3,
|
| @@ -6697,6 +6765,7 @@ static struct __PnaclWrapperInfo *s_ppb_wrappers[] = {
|
| &Pnacl_WrapperInfo_PPB_UDPSocket_Private_0_2,
|
| &Pnacl_WrapperInfo_PPB_UDPSocket_Private_0_3,
|
| &Pnacl_WrapperInfo_PPB_UDPSocket_Private_0_4,
|
| + &Pnacl_WrapperInfo_PPB_UDPSocket_Private_0_5,
|
| &Pnacl_WrapperInfo_PPB_UMA_Private_0_3,
|
| &Pnacl_WrapperInfo_PPB_VideoDestination_Private_0_1,
|
| &Pnacl_WrapperInfo_PPB_VideoSource_Private_0_1,
|
|
|