| 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 b085cfbbeb9d56346eaa363020495f77deea891d..c3388810919effe8b4f6cf5bfc728157e3581da8 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
|
| @@ -173,6 +173,7 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_Menu_0_2;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_HostResolver_Private_0_1;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Instance_Private_0_1;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_IsolatedFileSystem_Private_0_2;
|
| +static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_ManifestService_1_0;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_NaCl_Private_1_0;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_NetAddress_Private_0_1;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_NetAddress_Private_1_0;
|
| @@ -3085,11 +3086,28 @@ static int32_t Pnacl_M33_PPB_IsolatedFileSystem_Private_Open(PP_Instance instanc
|
|
|
| /* End wrapper methods for PPB_IsolatedFileSystem_Private_0_2 */
|
|
|
| -/* Not generating wrapper methods for PP_ManifestService_1_0 */
|
| +/* Begin wrapper methods for PPB_ManifestService_1_0 */
|
| +
|
| +static PP_Bool Pnacl_M25_PPB_ManifestService_Quit(void* user_data) {
|
| + const struct PPB_ManifestService_1_0 *iface = Pnacl_WrapperInfo_PPB_ManifestService_1_0.real_iface;
|
| + return iface->Quit(user_data);
|
| +}
|
| +
|
| +static PP_Bool Pnacl_M25_PPB_ManifestService_StartupInitializationComplete(void* user_data) {
|
| + const struct PPB_ManifestService_1_0 *iface = Pnacl_WrapperInfo_PPB_ManifestService_1_0.real_iface;
|
| + return iface->StartupInitializationComplete(user_data);
|
| +}
|
| +
|
| +static PP_Bool Pnacl_M25_PPB_ManifestService_OpenResource(void* user_data, const char* entry_key, PP_FileHandle* file, struct PP_CompletionCallback* callback) {
|
| + const struct PPB_ManifestService_1_0 *iface = Pnacl_WrapperInfo_PPB_ManifestService_1_0.real_iface;
|
| + return iface->OpenResource(user_data, entry_key, file, *callback);
|
| +}
|
| +
|
| +/* End wrapper methods for PPB_ManifestService_1_0 */
|
|
|
| /* Begin wrapper methods for PPB_NaCl_Private_1_0 */
|
|
|
| -static void Pnacl_M25_PPB_NaCl_Private_LaunchSelLdr(PP_Instance instance, const char* alleged_url, PP_Bool uses_irt, PP_Bool uses_ppapi, PP_Bool uses_nonsfi_mode, PP_Bool enable_ppapi_dev, PP_Bool enable_dyncode_syscalls, PP_Bool enable_exception_handling, PP_Bool enable_crash_throttling, const struct PP_ManifestService_1_0* manifest_service_interface, void* manifest_service_user_data, void* imc_handle, struct PP_Var* error_message, struct PP_CompletionCallback* callback) {
|
| +static void Pnacl_M25_PPB_NaCl_Private_LaunchSelLdr(PP_Instance instance, const char* alleged_url, PP_Bool uses_irt, PP_Bool uses_ppapi, PP_Bool uses_nonsfi_mode, PP_Bool enable_ppapi_dev, PP_Bool enable_dyncode_syscalls, PP_Bool enable_exception_handling, PP_Bool enable_crash_throttling, const struct PPB_ManifestService_1_0* manifest_service_interface, void* manifest_service_user_data, void* imc_handle, struct PP_Var* error_message, struct PP_CompletionCallback* callback) {
|
| const struct PPB_NaCl_Private_1_0 *iface = Pnacl_WrapperInfo_PPB_NaCl_Private_1_0.real_iface;
|
| iface->LaunchSelLdr(instance, alleged_url, uses_irt, uses_ppapi, uses_nonsfi_mode, enable_ppapi_dev, enable_dyncode_syscalls, enable_exception_handling, enable_crash_throttling, manifest_service_interface, manifest_service_user_data, imc_handle, error_message, *callback);
|
| }
|
| @@ -5142,10 +5160,14 @@ static const struct PPB_IsolatedFileSystem_Private_0_2 Pnacl_Wrappers_PPB_Isolat
|
| .Open = (int32_t (*)(PP_Instance instance, PP_IsolatedFileSystemType_Private type, PP_Resource* file_system, struct PP_CompletionCallback callback))&Pnacl_M33_PPB_IsolatedFileSystem_Private_Open
|
| };
|
|
|
| -/* Not generating wrapper interface for PP_ManifestService_1_0 */
|
| +static const struct PPB_ManifestService_1_0 Pnacl_Wrappers_PPB_ManifestService_1_0 = {
|
| + .Quit = (PP_Bool (*)(void* user_data))&Pnacl_M25_PPB_ManifestService_Quit,
|
| + .StartupInitializationComplete = (PP_Bool (*)(void* user_data))&Pnacl_M25_PPB_ManifestService_StartupInitializationComplete,
|
| + .OpenResource = (PP_Bool (*)(void* user_data, const char* entry_key, PP_FileHandle* file, struct PP_CompletionCallback callback))&Pnacl_M25_PPB_ManifestService_OpenResource
|
| +};
|
|
|
| static const struct PPB_NaCl_Private_1_0 Pnacl_Wrappers_PPB_NaCl_Private_1_0 = {
|
| - .LaunchSelLdr = (void (*)(PP_Instance instance, const char* alleged_url, PP_Bool uses_irt, PP_Bool uses_ppapi, PP_Bool uses_nonsfi_mode, PP_Bool enable_ppapi_dev, PP_Bool enable_dyncode_syscalls, PP_Bool enable_exception_handling, PP_Bool enable_crash_throttling, const struct PP_ManifestService_1_0* manifest_service_interface, void* manifest_service_user_data, void* imc_handle, struct PP_Var* error_message, struct PP_CompletionCallback callback))&Pnacl_M25_PPB_NaCl_Private_LaunchSelLdr,
|
| + .LaunchSelLdr = (void (*)(PP_Instance instance, const char* alleged_url, PP_Bool uses_irt, PP_Bool uses_ppapi, PP_Bool uses_nonsfi_mode, PP_Bool enable_ppapi_dev, PP_Bool enable_dyncode_syscalls, PP_Bool enable_exception_handling, PP_Bool enable_crash_throttling, const struct PPB_ManifestService_1_0* manifest_service_interface, void* manifest_service_user_data, void* imc_handle, struct PP_Var* error_message, struct PP_CompletionCallback callback))&Pnacl_M25_PPB_NaCl_Private_LaunchSelLdr,
|
| .StartPpapiProxy = (PP_Bool (*)(PP_Instance instance))&Pnacl_M25_PPB_NaCl_Private_StartPpapiProxy,
|
| .UrandomFD = (int32_t (*)(void))&Pnacl_M25_PPB_NaCl_Private_UrandomFD,
|
| .Are3DInterfacesDisabled = (PP_Bool (*)(void))&Pnacl_M25_PPB_NaCl_Private_Are3DInterfacesDisabled,
|
| @@ -5918,6 +5940,12 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_IsolatedFileSystem_Privat
|
| .real_iface = NULL
|
| };
|
|
|
| +static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_ManifestService_1_0 = {
|
| + .iface_macro = PPB_MANIFESTSERVICE_INTERFACE_1_0,
|
| + .wrapped_iface = (const void *) &Pnacl_Wrappers_PPB_ManifestService_1_0,
|
| + .real_iface = NULL
|
| +};
|
| +
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_NaCl_Private_1_0 = {
|
| .iface_macro = PPB_NACL_PRIVATE_INTERFACE_1_0,
|
| .wrapped_iface = (const void *) &Pnacl_Wrappers_PPB_NaCl_Private_1_0,
|
| @@ -6146,6 +6174,7 @@ static struct __PnaclWrapperInfo *s_ppb_wrappers[] = {
|
| &Pnacl_WrapperInfo_PPB_HostResolver_Private_0_1,
|
| &Pnacl_WrapperInfo_PPB_Instance_Private_0_1,
|
| &Pnacl_WrapperInfo_PPB_IsolatedFileSystem_Private_0_2,
|
| + &Pnacl_WrapperInfo_PPB_ManifestService_1_0,
|
| &Pnacl_WrapperInfo_PPB_NaCl_Private_1_0,
|
| &Pnacl_WrapperInfo_PPB_NetAddress_Private_0_1,
|
| &Pnacl_WrapperInfo_PPB_NetAddress_Private_1_0,
|
|
|