| 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 c1a4bb9fee316db24f21c5e1af7d9bfb6687c8a6..5552cb54bade1ffe892db0bbb076bc85f681f22c 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
|
| @@ -1,4 +1,4 @@
|
| -/* Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| +/* Copyright (c) 2013 The Chromium Authors. All rights reserved.
|
| * Use of this source code is governed by a BSD-style license that can be
|
| * found in the LICENSE file.
|
| */
|
| @@ -177,6 +177,7 @@ 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_5;
|
| +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;
|
| @@ -1652,6 +1653,28 @@ int32_t Pnacl_M13_PPB_DirectoryReader_Dev_GetNextEntry(PP_Resource directory_rea
|
|
|
| /* End wrapper methods for PPB_DirectoryReader_Dev_0_5 */
|
|
|
| +/* Begin wrapper methods for PPB_DirectoryReader_Dev_0_6 */
|
| +
|
| +static __attribute__((pnaclcall))
|
| +PP_Resource Pnacl_M26_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_M26_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_M26_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))
|
| @@ -3878,6 +3901,12 @@ struct PPB_DirectoryReader_Dev_0_5 Pnacl_Wrappers_PPB_DirectoryReader_Dev_0_5 =
|
| .GetNextEntry = (int32_t (*)(PP_Resource directory_reader, struct PP_DirectoryEntry_Dev* entry, struct PP_CompletionCallback callback))&Pnacl_M13_PPB_DirectoryReader_Dev_GetNextEntry
|
| };
|
|
|
| +struct PPB_DirectoryReader_Dev_0_6 Pnacl_Wrappers_PPB_DirectoryReader_Dev_0_6 = {
|
| + .Create = (PP_Resource (*)(PP_Resource directory_ref))&Pnacl_M26_PPB_DirectoryReader_Dev_Create,
|
| + .IsDirectoryReader = (PP_Bool (*)(PP_Resource resource))&Pnacl_M26_PPB_DirectoryReader_Dev_IsDirectoryReader,
|
| + .ReadEntries = (int32_t (*)(PP_Resource directory_reader, struct PP_ArrayOutput output, struct PP_CompletionCallback callback))&Pnacl_M26_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,
|
| @@ -4693,6 +4722,12 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_DirectoryReader_Dev_0_5 =
|
| .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,
|
| @@ -5208,6 +5243,7 @@ static struct __PnaclWrapperInfo *s_ppb_wrappers[] = {
|
| &Pnacl_WrapperInfo_PPB_CursorControl_Dev_0_4,
|
| &Pnacl_WrapperInfo_PPB_DeviceRef_Dev_0_1,
|
| &Pnacl_WrapperInfo_PPB_DirectoryReader_Dev_0_5,
|
| + &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,
|
|
|