| 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 7e30452cb8ac1bd6c0f0b650724247271997ad0f..597d7638a200609181a728687d1d1692818d053e 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
|
| @@ -10,6 +10,7 @@
|
| #include "ppapi/c/dev/ppb_audio_input_dev.h"
|
| #include "ppapi/c/dev/ppb_device_ref_dev.h"
|
| #include "ppapi/c/dev/ppb_file_chooser_dev.h"
|
| +#include "ppapi/c/dev/ppb_filesystemprovider_dev.h"
|
| #include "ppapi/c/dev/ppb_font_dev.h"
|
| #include "ppapi/c/dev/ppb_ime_input_event_dev.h"
|
| #include "ppapi/c/dev/ppb_printing_dev.h"
|
| @@ -154,6 +155,7 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_AudioInput_Dev_0_4;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_DeviceRef_Dev_0_1;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_FileChooser_Dev_0_5;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_FileChooser_Dev_0_6;
|
| +static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_FilesystemProvider_Dev_0_1;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Font_Dev_0_6;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_IMEInputEvent_Dev_0_1;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_IMEInputEvent_Dev_0_2;
|
| @@ -2629,6 +2631,70 @@ static int32_t Pnacl_M19_PPB_FileChooser_Dev_Show(PP_Resource chooser, struct PP
|
|
|
| /* End wrapper methods for PPB_FileChooser_Dev_0_6 */
|
|
|
| +/* Begin wrapper methods for PPB_FilesystemProvider_Dev_0_1 */
|
| +
|
| +static PP_Resource Pnacl_M40_PPB_FilesystemProvider_Dev_Create(PP_Instance instance) {
|
| + const struct PPB_FilesystemProvider_Dev_0_1 *iface = Pnacl_WrapperInfo_PPB_FilesystemProvider_Dev_0_1.real_iface;
|
| + return iface->Create(instance);
|
| +}
|
| +
|
| +static PP_Bool Pnacl_M40_PPB_FilesystemProvider_Dev_IsFilesystemProvider(PP_Resource resource) {
|
| + const struct PPB_FilesystemProvider_Dev_0_1 *iface = Pnacl_WrapperInfo_PPB_FilesystemProvider_Dev_0_1.real_iface;
|
| + return iface->IsFilesystemProvider(resource);
|
| +}
|
| +
|
| +static int32_t Pnacl_M40_PPB_FilesystemProvider_Dev_Mount(PP_Resource filesystem_prov, struct PP_Var* filesystem_id, struct PP_Var* display_name, PP_Bool writable, int32_t opened_files_limit, struct PP_CompletionCallback* callback) {
|
| + const struct PPB_FilesystemProvider_Dev_0_1 *iface = Pnacl_WrapperInfo_PPB_FilesystemProvider_Dev_0_1.real_iface;
|
| + return iface->Mount(filesystem_prov, *filesystem_id, *display_name, writable, opened_files_limit, *callback);
|
| +}
|
| +
|
| +static int32_t Pnacl_M40_PPB_FilesystemProvider_Dev_Unmount(PP_Resource filesystem_prov, struct PP_Var* filesystem_id, struct PP_CompletionCallback* callback) {
|
| + const struct PPB_FilesystemProvider_Dev_0_1 *iface = Pnacl_WrapperInfo_PPB_FilesystemProvider_Dev_0_1.real_iface;
|
| + return iface->Unmount(filesystem_prov, *filesystem_id, *callback);
|
| +}
|
| +
|
| +static int32_t Pnacl_M40_PPB_FilesystemProvider_Dev_Notify(PP_Resource filesystem_prov, struct PP_Var* notify_options) {
|
| + const struct PPB_FilesystemProvider_Dev_0_1 *iface = Pnacl_WrapperInfo_PPB_FilesystemProvider_Dev_0_1.real_iface;
|
| + return iface->Notify(filesystem_prov, *notify_options);
|
| +}
|
| +
|
| +static int32_t Pnacl_M40_PPB_FilesystemProvider_Dev_SendSuccessResponse(PP_Resource filesystem_prov, PP_OperationType_Dev operation_type, int32_t request_id) {
|
| + const struct PPB_FilesystemProvider_Dev_0_1 *iface = Pnacl_WrapperInfo_PPB_FilesystemProvider_Dev_0_1.real_iface;
|
| + return iface->SendSuccessResponse(filesystem_prov, operation_type, request_id);
|
| +}
|
| +
|
| +static int32_t Pnacl_M40_PPB_FilesystemProvider_Dev_SendErrorResponse(PP_Resource filesystem_prov, PP_OperationType_Dev operation_type, int32_t error, int32_t request_id) {
|
| + const struct PPB_FilesystemProvider_Dev_0_1 *iface = Pnacl_WrapperInfo_PPB_FilesystemProvider_Dev_0_1.real_iface;
|
| + return iface->SendErrorResponse(filesystem_prov, operation_type, error, request_id);
|
| +}
|
| +
|
| +static int32_t Pnacl_M40_PPB_FilesystemProvider_Dev_SendMetadataSuccessResponse(PP_Resource filesystem_prov, struct PP_Var* metadata, int32_t request_id) {
|
| + const struct PPB_FilesystemProvider_Dev_0_1 *iface = Pnacl_WrapperInfo_PPB_FilesystemProvider_Dev_0_1.real_iface;
|
| + return iface->SendMetadataSuccessResponse(filesystem_prov, *metadata, request_id);
|
| +}
|
| +
|
| +static int32_t Pnacl_M40_PPB_FilesystemProvider_Dev_SendReadDirectorySuccessResponse(PP_Resource filesystem_prov, struct PP_Var* entries, PP_Bool has_more, int32_t request_id) {
|
| + const struct PPB_FilesystemProvider_Dev_0_1 *iface = Pnacl_WrapperInfo_PPB_FilesystemProvider_Dev_0_1.real_iface;
|
| + return iface->SendReadDirectorySuccessResponse(filesystem_prov, *entries, has_more, request_id);
|
| +}
|
| +
|
| +static int32_t Pnacl_M40_PPB_FilesystemProvider_Dev_SendReadFileSuccessResponse(PP_Resource filesystem_prov, uint32_t data_size, const void* data, PP_Bool has_more, int32_t request_id) {
|
| + const struct PPB_FilesystemProvider_Dev_0_1 *iface = Pnacl_WrapperInfo_PPB_FilesystemProvider_Dev_0_1.real_iface;
|
| + return iface->SendReadFileSuccessResponse(filesystem_prov, data_size, data, has_more, request_id);
|
| +}
|
| +
|
| +static int32_t Pnacl_M40_PPB_FilesystemProvider_Dev_GetNextRequest(PP_Resource filesystem_prov, struct PP_FilesystemRequest* request, struct PP_CompletionCallback* callback) {
|
| + const struct PPB_FilesystemProvider_Dev_0_1 *iface = Pnacl_WrapperInfo_PPB_FilesystemProvider_Dev_0_1.real_iface;
|
| + return iface->GetNextRequest(filesystem_prov, request, *callback);
|
| +}
|
| +
|
| +static int32_t Pnacl_M40_PPB_FilesystemProvider_Dev_ReleaseRequestBuffer(PP_Resource filesystem_prov, int32_t request_id) {
|
| + const struct PPB_FilesystemProvider_Dev_0_1 *iface = Pnacl_WrapperInfo_PPB_FilesystemProvider_Dev_0_1.real_iface;
|
| + return iface->ReleaseRequestBuffer(filesystem_prov, request_id);
|
| +}
|
| +
|
| +/* End wrapper methods for PPB_FilesystemProvider_Dev_0_1 */
|
| +
|
| /* Begin wrapper methods for PPB_Font_Dev_0_6 */
|
|
|
| static void Pnacl_M14_PPB_Font_Dev_GetFontFamilies(struct PP_Var* _struct_result, PP_Instance instance) {
|
| @@ -5241,6 +5307,21 @@ static const struct PPB_FileChooser_Dev_0_6 Pnacl_Wrappers_PPB_FileChooser_Dev_0
|
| .Show = (int32_t (*)(PP_Resource chooser, struct PP_ArrayOutput output, struct PP_CompletionCallback callback))&Pnacl_M19_PPB_FileChooser_Dev_Show
|
| };
|
|
|
| +static const struct PPB_FilesystemProvider_Dev_0_1 Pnacl_Wrappers_PPB_FilesystemProvider_Dev_0_1 = {
|
| + .Create = (PP_Resource (*)(PP_Instance instance))&Pnacl_M40_PPB_FilesystemProvider_Dev_Create,
|
| + .IsFilesystemProvider = (PP_Bool (*)(PP_Resource resource))&Pnacl_M40_PPB_FilesystemProvider_Dev_IsFilesystemProvider,
|
| + .Mount = (int32_t (*)(PP_Resource filesystem_prov, struct PP_Var filesystem_id, struct PP_Var display_name, PP_Bool writable, int32_t opened_files_limit, struct PP_CompletionCallback callback))&Pnacl_M40_PPB_FilesystemProvider_Dev_Mount,
|
| + .Unmount = (int32_t (*)(PP_Resource filesystem_prov, struct PP_Var filesystem_id, struct PP_CompletionCallback callback))&Pnacl_M40_PPB_FilesystemProvider_Dev_Unmount,
|
| + .Notify = (int32_t (*)(PP_Resource filesystem_prov, struct PP_Var notify_options))&Pnacl_M40_PPB_FilesystemProvider_Dev_Notify,
|
| + .SendSuccessResponse = (int32_t (*)(PP_Resource filesystem_prov, PP_OperationType_Dev operation_type, int32_t request_id))&Pnacl_M40_PPB_FilesystemProvider_Dev_SendSuccessResponse,
|
| + .SendErrorResponse = (int32_t (*)(PP_Resource filesystem_prov, PP_OperationType_Dev operation_type, int32_t error, int32_t request_id))&Pnacl_M40_PPB_FilesystemProvider_Dev_SendErrorResponse,
|
| + .SendMetadataSuccessResponse = (int32_t (*)(PP_Resource filesystem_prov, struct PP_Var metadata, int32_t request_id))&Pnacl_M40_PPB_FilesystemProvider_Dev_SendMetadataSuccessResponse,
|
| + .SendReadDirectorySuccessResponse = (int32_t (*)(PP_Resource filesystem_prov, struct PP_Var entries, PP_Bool has_more, int32_t request_id))&Pnacl_M40_PPB_FilesystemProvider_Dev_SendReadDirectorySuccessResponse,
|
| + .SendReadFileSuccessResponse = (int32_t (*)(PP_Resource filesystem_prov, uint32_t data_size, const void* data, PP_Bool has_more, int32_t request_id))&Pnacl_M40_PPB_FilesystemProvider_Dev_SendReadFileSuccessResponse,
|
| + .GetNextRequest = (int32_t (*)(PP_Resource filesystem_prov, struct PP_FilesystemRequest* request, struct PP_CompletionCallback callback))&Pnacl_M40_PPB_FilesystemProvider_Dev_GetNextRequest,
|
| + .ReleaseRequestBuffer = (int32_t (*)(PP_Resource filesystem_prov, int32_t request_id))&Pnacl_M40_PPB_FilesystemProvider_Dev_ReleaseRequestBuffer
|
| +};
|
| +
|
| static const struct PPB_Font_Dev_0_6 Pnacl_Wrappers_PPB_Font_Dev_0_6 = {
|
| .GetFontFamilies = (struct PP_Var (*)(PP_Instance instance))&Pnacl_M14_PPB_Font_Dev_GetFontFamilies,
|
| .Create = (PP_Resource (*)(PP_Instance instance, const struct PP_FontDescription_Dev* description))&Pnacl_M14_PPB_Font_Dev_Create,
|
| @@ -6135,6 +6216,12 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_FileChooser_Dev_0_6 = {
|
| .real_iface = NULL
|
| };
|
|
|
| +static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_FilesystemProvider_Dev_0_1 = {
|
| + .iface_macro = PPB_FILESYSTEMPROVIDER_DEV_INTERFACE_0_1,
|
| + .wrapped_iface = (const void *) &Pnacl_Wrappers_PPB_FilesystemProvider_Dev_0_1,
|
| + .real_iface = NULL
|
| +};
|
| +
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Font_Dev_0_6 = {
|
| .iface_macro = PPB_FONT_DEV_INTERFACE_0_6,
|
| .wrapped_iface = (const void *) &Pnacl_Wrappers_PPB_Font_Dev_0_6,
|
| @@ -6490,6 +6577,7 @@ static struct __PnaclWrapperInfo *s_ppb_wrappers[] = {
|
| &Pnacl_WrapperInfo_PPB_DeviceRef_Dev_0_1,
|
| &Pnacl_WrapperInfo_PPB_FileChooser_Dev_0_5,
|
| &Pnacl_WrapperInfo_PPB_FileChooser_Dev_0_6,
|
| + &Pnacl_WrapperInfo_PPB_FilesystemProvider_Dev_0_1,
|
| &Pnacl_WrapperInfo_PPB_Font_Dev_0_6,
|
| &Pnacl_WrapperInfo_PPB_IMEInputEvent_Dev_0_1,
|
| &Pnacl_WrapperInfo_PPB_IMEInputEvent_Dev_0_2,
|
|
|