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 70cb67415adf4eebc603f56af7f53f7fb8e347b0..3b7ba0f483a7d22c50dd872b0ca74fcbf25c3c66 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 |
@@ -12,7 +12,6 @@ |
#include "ppapi/c/dev/ppb_crypto_dev.h" |
#include "ppapi/c/dev/ppb_cursor_control_dev.h" |
#include "ppapi/c/dev/ppb_device_ref_dev.h" |
-#include "ppapi/c/dev/ppb_directory_reader_dev.h" |
#include "ppapi/c/dev/ppb_file_chooser_dev.h" |
#include "ppapi/c/dev/ppb_find_dev.h" |
#include "ppapi/c/dev/ppb_font_dev.h" |
@@ -51,6 +50,7 @@ |
#include "ppapi/c/ppb_audio_config.h" |
#include "ppapi/c/ppb_console.h" |
#include "ppapi/c/ppb_core.h" |
+#include "ppapi/c/ppb_directory_reader.h" |
#include "ppapi/c/ppb_file_io.h" |
#include "ppapi/c/ppb_file_ref.h" |
#include "ppapi/c/ppb_file_system.h" |
@@ -140,6 +140,7 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_AudioConfig_1_0; |
static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_AudioConfig_1_1; |
static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Console_1_0; |
static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Core_1_0; |
+static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_DirectoryReader_1_0; |
static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_FileIO_1_0; |
static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_FileIO_1_1; |
static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_FileRef_1_0; |
@@ -197,7 +198,6 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Buffer_Dev_0_4; |
static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Crypto_Dev_0_1; |
static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_CursorControl_Dev_0_4; |
static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_DeviceRef_Dev_0_1; |
-static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_DirectoryReader_Dev_0_6; |
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_Find_Dev_0_3; |
@@ -349,6 +349,28 @@ PP_Bool Pnacl_M14_PPB_Core_IsMainThread(void) { |
/* End wrapper methods for PPB_Core_1_0 */ |
+/* Begin wrapper methods for PPB_DirectoryReader_1_0 */ |
+ |
+static __attribute__((pnaclcall)) |
+PP_Resource Pnacl_M28_PPB_DirectoryReader_Create(PP_Resource directory_ref) { |
+ const struct PPB_DirectoryReader_1_0 *iface = Pnacl_WrapperInfo_PPB_DirectoryReader_1_0.real_iface; |
+ return iface->Create(directory_ref); |
+} |
+ |
+static __attribute__((pnaclcall)) |
+PP_Bool Pnacl_M28_PPB_DirectoryReader_IsDirectoryReader(PP_Resource resource) { |
+ const struct PPB_DirectoryReader_1_0 *iface = Pnacl_WrapperInfo_PPB_DirectoryReader_1_0.real_iface; |
+ return iface->IsDirectoryReader(resource); |
+} |
+ |
+static __attribute__((pnaclcall)) |
+int32_t Pnacl_M28_PPB_DirectoryReader_ReadEntries(PP_Resource directory_reader, struct PP_ArrayOutput output, struct PP_CompletionCallback callback) { |
+ const struct PPB_DirectoryReader_1_0 *iface = Pnacl_WrapperInfo_PPB_DirectoryReader_1_0.real_iface; |
+ return iface->ReadEntries(directory_reader, output, callback); |
+} |
+ |
+/* End wrapper methods for PPB_DirectoryReader_1_0 */ |
+ |
/* Begin wrapper methods for PPB_FileIO_1_0 */ |
static __attribute__((pnaclcall)) |
@@ -1859,28 +1881,6 @@ struct PP_Var Pnacl_M18_PPB_DeviceRef_Dev_GetName(PP_Resource device_ref) { |
/* End wrapper methods for PPB_DeviceRef_Dev_0_1 */ |
-/* Begin wrapper methods for PPB_DirectoryReader_Dev_0_6 */ |
- |
-static __attribute__((pnaclcall)) |
-PP_Resource Pnacl_M27_PPB_DirectoryReader_Dev_Create(PP_Resource directory_ref) { |
- const struct PPB_DirectoryReader_Dev_0_6 *iface = Pnacl_WrapperInfo_PPB_DirectoryReader_Dev_0_6.real_iface; |
- return iface->Create(directory_ref); |
-} |
- |
-static __attribute__((pnaclcall)) |
-PP_Bool Pnacl_M27_PPB_DirectoryReader_Dev_IsDirectoryReader(PP_Resource resource) { |
- const struct PPB_DirectoryReader_Dev_0_6 *iface = Pnacl_WrapperInfo_PPB_DirectoryReader_Dev_0_6.real_iface; |
- return iface->IsDirectoryReader(resource); |
-} |
- |
-static __attribute__((pnaclcall)) |
-int32_t Pnacl_M27_PPB_DirectoryReader_Dev_ReadEntries(PP_Resource directory_reader, struct PP_ArrayOutput output, struct PP_CompletionCallback callback) { |
- const struct PPB_DirectoryReader_Dev_0_6 *iface = Pnacl_WrapperInfo_PPB_DirectoryReader_Dev_0_6.real_iface; |
- return iface->ReadEntries(directory_reader, output, callback); |
-} |
- |
-/* End wrapper methods for PPB_DirectoryReader_Dev_0_6 */ |
- |
/* Begin wrapper methods for PPB_FileChooser_Dev_0_5 */ |
static __attribute__((pnaclcall)) |
@@ -4189,6 +4189,12 @@ struct PPB_Core_1_0 Pnacl_Wrappers_PPB_Core_1_0 = { |
.IsMainThread = (PP_Bool (*)(void))&Pnacl_M14_PPB_Core_IsMainThread |
}; |
+struct PPB_DirectoryReader_1_0 Pnacl_Wrappers_PPB_DirectoryReader_1_0 = { |
+ .Create = (PP_Resource (*)(PP_Resource directory_ref))&Pnacl_M28_PPB_DirectoryReader_Create, |
+ .IsDirectoryReader = (PP_Bool (*)(PP_Resource resource))&Pnacl_M28_PPB_DirectoryReader_IsDirectoryReader, |
+ .ReadEntries = (int32_t (*)(PP_Resource directory_reader, struct PP_ArrayOutput output, struct PP_CompletionCallback callback))&Pnacl_M28_PPB_DirectoryReader_ReadEntries |
+}; |
+ |
struct PPB_FileIO_1_0 Pnacl_Wrappers_PPB_FileIO_1_0 = { |
.Create = (PP_Resource (*)(PP_Instance instance))&Pnacl_M14_PPB_FileIO_Create, |
.IsFileIO = (PP_Bool (*)(PP_Resource resource))&Pnacl_M14_PPB_FileIO_IsFileIO, |
@@ -4561,12 +4567,6 @@ struct PPB_DeviceRef_Dev_0_1 Pnacl_Wrappers_PPB_DeviceRef_Dev_0_1 = { |
.GetName = (struct PP_Var (*)(PP_Resource device_ref))&Pnacl_M18_PPB_DeviceRef_Dev_GetName |
}; |
-struct PPB_DirectoryReader_Dev_0_6 Pnacl_Wrappers_PPB_DirectoryReader_Dev_0_6 = { |
- .Create = (PP_Resource (*)(PP_Resource directory_ref))&Pnacl_M27_PPB_DirectoryReader_Dev_Create, |
- .IsDirectoryReader = (PP_Bool (*)(PP_Resource resource))&Pnacl_M27_PPB_DirectoryReader_Dev_IsDirectoryReader, |
- .ReadEntries = (int32_t (*)(PP_Resource directory_reader, struct PP_ArrayOutput output, struct PP_CompletionCallback callback))&Pnacl_M27_PPB_DirectoryReader_Dev_ReadEntries |
-}; |
- |
struct PPB_FileChooser_Dev_0_5 Pnacl_Wrappers_PPB_FileChooser_Dev_0_5 = { |
.Create = (PP_Resource (*)(PP_Instance instance, PP_FileChooserMode_Dev mode, struct PP_Var accept_types))&Pnacl_M16_PPB_FileChooser_Dev_Create, |
.IsFileChooser = (PP_Bool (*)(PP_Resource resource))&Pnacl_M16_PPB_FileChooser_Dev_IsFileChooser, |
@@ -5156,6 +5156,12 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Core_1_0 = { |
.real_iface = NULL |
}; |
+static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_DirectoryReader_1_0 = { |
+ .iface_macro = PPB_DIRECTORYREADER_INTERFACE_1_0, |
+ .wrapped_iface = (void *) &Pnacl_Wrappers_PPB_DirectoryReader_1_0, |
+ .real_iface = NULL |
+}; |
+ |
static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_FileIO_1_0 = { |
.iface_macro = PPB_FILEIO_INTERFACE_1_0, |
.wrapped_iface = (void *) &Pnacl_Wrappers_PPB_FileIO_1_0, |
@@ -5498,12 +5504,6 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_DeviceRef_Dev_0_1 = { |
.real_iface = NULL |
}; |
-static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_DirectoryReader_Dev_0_6 = { |
- .iface_macro = PPB_DIRECTORYREADER_DEV_INTERFACE_0_6, |
- .wrapped_iface = (void *) &Pnacl_Wrappers_PPB_DirectoryReader_Dev_0_6, |
- .real_iface = NULL |
-}; |
- |
static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_FileChooser_Dev_0_5 = { |
.iface_macro = PPB_FILECHOOSER_DEV_INTERFACE_0_5, |
.wrapped_iface = (void *) &Pnacl_Wrappers_PPB_FileChooser_Dev_0_5, |
@@ -6032,6 +6032,7 @@ static struct __PnaclWrapperInfo *s_ppb_wrappers[] = { |
&Pnacl_WrapperInfo_PPB_AudioConfig_1_1, |
&Pnacl_WrapperInfo_PPB_Console_1_0, |
&Pnacl_WrapperInfo_PPB_Core_1_0, |
+ &Pnacl_WrapperInfo_PPB_DirectoryReader_1_0, |
&Pnacl_WrapperInfo_PPB_FileIO_1_0, |
&Pnacl_WrapperInfo_PPB_FileIO_1_1, |
&Pnacl_WrapperInfo_PPB_FileRef_1_0, |
@@ -6083,7 +6084,6 @@ static struct __PnaclWrapperInfo *s_ppb_wrappers[] = { |
&Pnacl_WrapperInfo_PPB_Crypto_Dev_0_1, |
&Pnacl_WrapperInfo_PPB_CursorControl_Dev_0_4, |
&Pnacl_WrapperInfo_PPB_DeviceRef_Dev_0_1, |
- &Pnacl_WrapperInfo_PPB_DirectoryReader_Dev_0_6, |
&Pnacl_WrapperInfo_PPB_FileChooser_Dev_0_5, |
&Pnacl_WrapperInfo_PPB_FileChooser_Dev_0_6, |
&Pnacl_WrapperInfo_PPB_Find_Dev_0_3, |