| 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 2444aa919d0ca76e849344ee048b87ce6805b74c..26c025de620ad29400e9947e4dbf1fd25201d0ab 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
|
| @@ -119,6 +119,7 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_MediaStreamVideoTrack_0_1
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_MediaStreamVideoTrack_1_0;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_MessageLoop_1_0;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Messaging_1_0;
|
| +static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Messaging_1_1;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_MouseLock_1_0;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_NetAddress_1_0;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_NetworkList_1_0;
|
| @@ -1185,6 +1186,25 @@ static void Pnacl_M14_PPB_Messaging_PostMessage(PP_Instance instance, struct PP_
|
|
|
| /* End wrapper methods for PPB_Messaging_1_0 */
|
|
|
| +/* Begin wrapper methods for PPB_Messaging_1_1 */
|
| +
|
| +static void Pnacl_M37_PPB_Messaging_PostMessage(PP_Instance instance, struct PP_Var* message) {
|
| + const struct PPB_Messaging_1_1 *iface = Pnacl_WrapperInfo_PPB_Messaging_1_1.real_iface;
|
| + iface->PostMessage(instance, *message);
|
| +}
|
| +
|
| +static int32_t Pnacl_M37_PPB_Messaging_RegisterMessageHandler(PP_Instance instance, void* user_data, const struct PPP_MessageHandler_0_1* handler, PP_Resource message_loop) {
|
| + const struct PPB_Messaging_1_1 *iface = Pnacl_WrapperInfo_PPB_Messaging_1_1.real_iface;
|
| + return iface->RegisterMessageHandler(instance, user_data, handler, message_loop);
|
| +}
|
| +
|
| +static void Pnacl_M37_PPB_Messaging_UnregisterMessageHandler(PP_Instance instance) {
|
| + const struct PPB_Messaging_1_1 *iface = Pnacl_WrapperInfo_PPB_Messaging_1_1.real_iface;
|
| + iface->UnregisterMessageHandler(instance);
|
| +}
|
| +
|
| +/* End wrapper methods for PPB_Messaging_1_1 */
|
| +
|
| /* Not generating wrapper methods for PPB_MouseCursor_1_0 */
|
|
|
| /* Begin wrapper methods for PPB_MouseLock_1_0 */
|
| @@ -1896,6 +1916,8 @@ static void Pnacl_M18_PPB_WebSocket_GetURL(struct PP_Var* _struct_result, PP_Res
|
|
|
| /* Not generating wrapper methods for PPP_Instance_1_1 */
|
|
|
| +/* Not generating wrapper methods for PPP_MessageHandler_0_1 */
|
| +
|
| /* Begin wrapper methods for PPP_Messaging_1_0 */
|
|
|
| static void Pnacl_M14_PPP_Messaging_HandleMessage(PP_Instance instance, struct PP_Var message) {
|
| @@ -4526,6 +4548,12 @@ static const struct PPB_Messaging_1_0 Pnacl_Wrappers_PPB_Messaging_1_0 = {
|
| .PostMessage = (void (*)(PP_Instance instance, struct PP_Var message))&Pnacl_M14_PPB_Messaging_PostMessage
|
| };
|
|
|
| +static const struct PPB_Messaging_1_1 Pnacl_Wrappers_PPB_Messaging_1_1 = {
|
| + .PostMessage = (void (*)(PP_Instance instance, struct PP_Var message))&Pnacl_M37_PPB_Messaging_PostMessage,
|
| + .RegisterMessageHandler = (int32_t (*)(PP_Instance instance, void* user_data, const struct PPP_MessageHandler_0_1* handler, PP_Resource message_loop))&Pnacl_M37_PPB_Messaging_RegisterMessageHandler,
|
| + .UnregisterMessageHandler = (void (*)(PP_Instance instance))&Pnacl_M37_PPB_Messaging_UnregisterMessageHandler
|
| +};
|
| +
|
| /* Not generating wrapper interface for PPB_MouseCursor_1_0 */
|
|
|
| static const struct PPB_MouseLock_1_0 Pnacl_Wrappers_PPB_MouseLock_1_0 = {
|
| @@ -4725,6 +4753,8 @@ static const struct PPB_WebSocket_1_0 Pnacl_Wrappers_PPB_WebSocket_1_0 = {
|
|
|
| /* Not generating wrapper interface for PPP_Instance_1_1 */
|
|
|
| +/* Not generating wrapper interface for PPP_MessageHandler_0_1 */
|
| +
|
| static const struct PPP_Messaging_1_0 Pnacl_Wrappers_PPP_Messaging_1_0 = {
|
| .HandleMessage = &Pnacl_M14_PPP_Messaging_HandleMessage
|
| };
|
| @@ -5538,6 +5568,12 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Messaging_1_0 = {
|
| .real_iface = NULL
|
| };
|
|
|
| +static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Messaging_1_1 = {
|
| + .iface_macro = PPB_MESSAGING_INTERFACE_1_1,
|
| + .wrapped_iface = (const void *) &Pnacl_Wrappers_PPB_Messaging_1_1,
|
| + .real_iface = NULL
|
| +};
|
| +
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_MouseLock_1_0 = {
|
| .iface_macro = PPB_MOUSELOCK_INTERFACE_1_0,
|
| .wrapped_iface = (const void *) &Pnacl_Wrappers_PPB_MouseLock_1_0,
|
| @@ -6038,6 +6074,7 @@ static struct __PnaclWrapperInfo *s_ppb_wrappers[] = {
|
| &Pnacl_WrapperInfo_PPB_MediaStreamVideoTrack_1_0,
|
| &Pnacl_WrapperInfo_PPB_MessageLoop_1_0,
|
| &Pnacl_WrapperInfo_PPB_Messaging_1_0,
|
| + &Pnacl_WrapperInfo_PPB_Messaging_1_1,
|
| &Pnacl_WrapperInfo_PPB_MouseLock_1_0,
|
| &Pnacl_WrapperInfo_PPB_NetAddress_1_0,
|
| &Pnacl_WrapperInfo_PPB_NetworkList_1_0,
|
|
|