| 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 ee1219b0a495108c90d890cb3a7537ca89cc30bf..abf0ddfc75259ab00729fdb3841869ff2b0a78ef 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
|
| @@ -34,6 +34,7 @@
|
| #include "ppapi/c/ppb_media_stream_video_track.h"
|
| #include "ppapi/c/ppb_message_loop.h"
|
| #include "ppapi/c/ppb_messaging.h"
|
| +#include "ppapi/c/ppb_mojo.h"
|
| #include "ppapi/c/ppb_mouse_lock.h"
|
| #include "ppapi/c/ppb_net_address.h"
|
| #include "ppapi/c/ppb_network_list.h"
|
| @@ -125,6 +126,7 @@ 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_2;
|
| +static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Mojo_0_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;
|
| @@ -1348,6 +1350,15 @@ static void Pnacl_M39_PPB_Messaging_UnregisterMessageHandler(PP_Instance instanc
|
|
|
| /* End wrapper methods for PPB_Messaging_1_2 */
|
|
|
| +/* Begin wrapper methods for PPB_Mojo_0_1 */
|
| +
|
| +static int32_t Pnacl_M38_PPB_Mojo_GetHandle(PP_Instance instance, uint32_t* mojo_handle, struct PP_CompletionCallback* callback) {
|
| + const struct PPB_Mojo_0_1 *iface = Pnacl_WrapperInfo_PPB_Mojo_0_1.real_iface;
|
| + return iface->GetHandle(instance, mojo_handle, *callback);
|
| +}
|
| +
|
| +/* End wrapper methods for PPB_Mojo_0_1 */
|
| +
|
| /* Not generating wrapper methods for PPB_MouseCursor_1_0 */
|
|
|
| /* Begin wrapper methods for PPB_MouseLock_1_0 */
|
| @@ -4825,6 +4836,10 @@ static const struct PPB_Messaging_1_2 Pnacl_Wrappers_PPB_Messaging_1_2 = {
|
| .UnregisterMessageHandler = (void (*)(PP_Instance instance))&Pnacl_M39_PPB_Messaging_UnregisterMessageHandler
|
| };
|
|
|
| +static const struct PPB_Mojo_0_1 Pnacl_Wrappers_PPB_Mojo_0_1 = {
|
| + .GetHandle = (int32_t (*)(PP_Instance instance, uint32_t* mojo_handle, struct PP_CompletionCallback callback))&Pnacl_M38_PPB_Mojo_GetHandle
|
| +};
|
| +
|
| /* Not generating wrapper interface for PPB_MouseCursor_1_0 */
|
|
|
| static const struct PPB_MouseLock_1_0 Pnacl_Wrappers_PPB_MouseLock_1_0 = {
|
| @@ -5902,6 +5917,12 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Messaging_1_2 = {
|
| .real_iface = NULL
|
| };
|
|
|
| +static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Mojo_0_1 = {
|
| + .iface_macro = PPB_MOJO_INTERFACE_0_1,
|
| + .wrapped_iface = (const void *) &Pnacl_Wrappers_PPB_Mojo_0_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,
|
| @@ -6412,6 +6433,7 @@ static struct __PnaclWrapperInfo *s_ppb_wrappers[] = {
|
| &Pnacl_WrapperInfo_PPB_MessageLoop_1_0,
|
| &Pnacl_WrapperInfo_PPB_Messaging_1_0,
|
| &Pnacl_WrapperInfo_PPB_Messaging_1_2,
|
| + &Pnacl_WrapperInfo_PPB_Mojo_0_1,
|
| &Pnacl_WrapperInfo_PPB_MouseLock_1_0,
|
| &Pnacl_WrapperInfo_PPB_NetAddress_1_0,
|
| &Pnacl_WrapperInfo_PPB_NetworkList_1_0,
|
|
|