| 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 9e3c55b4b8eea0133146c85dd900adae1b4683c3..6aaa0689d22e96dd3c8df5dd0aec225426968284 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
|
| @@ -3,7 +3,7 @@
|
| * found in the LICENSE file.
|
| */
|
|
|
| -/* Last generated from IDL: Tue Sep 4 17:22:07 2012. */
|
| +/* Last generated from IDL: Tue Sep 11 10:41:20 2012. */
|
| #include "ppapi/generators/pnacl_shim.h"
|
|
|
| #include "ppapi/c/ppb.h"
|
| @@ -70,6 +70,7 @@
|
| #include "ppapi/c/private/ppb_flash.h"
|
| #include "ppapi/c/private/ppb_flash_clipboard.h"
|
| #include "ppapi/c/private/ppb_flash_device_id.h"
|
| +#include "ppapi/c/private/ppb_flash_font.h"
|
| #include "ppapi/c/private/ppb_flash_fullscreen.h"
|
| #include "ppapi/c/private/ppb_flash_message_loop.h"
|
| #include "ppapi/c/private/ppb_flash_print.h"
|
| @@ -170,6 +171,7 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_KeyboardInputEvent_Dev_0_
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Memory_Dev_0_1;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_MessageLoop_Dev_0_1;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Printing_Dev_0_6;
|
| +static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Printing_Dev_0_7;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_ResourceArray_Dev_0_1;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Scrollbar_Dev_0_5;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Testing_Dev_0_7;
|
| @@ -205,6 +207,7 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_12_5;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_Clipboard_3_0;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_Clipboard_4_0;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_DeviceID_1_0;
|
| +static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_Font_0_1;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_FlashFullscreen_0_1;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_MessageLoop_0_1;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_Print_1_0;
|
| @@ -1632,6 +1635,22 @@ int32_t Pnacl_M18_PPB_MessageLoop_Dev_PostQuit(PP_Resource message_loop, PP_Bool
|
|
|
| /* Not generating wrapper methods for PPB_Printing_Dev_0_6 */
|
|
|
| +/* Begin wrapper methods for PPB_Printing_Dev_0_7 */
|
| +
|
| +static __attribute__((pnaclcall))
|
| +PP_Resource Pnacl_M23_PPB_Printing_Dev_Create(PP_Instance instance) {
|
| + const struct PPB_Printing_Dev_0_7 *iface = Pnacl_WrapperInfo_PPB_Printing_Dev_0_7.real_iface;
|
| + return iface->Create(instance);
|
| +}
|
| +
|
| +static __attribute__((pnaclcall))
|
| +int32_t Pnacl_M23_PPB_Printing_Dev_GetDefaultPrintSettings(PP_Resource resource, struct PP_PrintSettings_Dev* print_settings, struct PP_CompletionCallback callback) {
|
| + const struct PPB_Printing_Dev_0_7 *iface = Pnacl_WrapperInfo_PPB_Printing_Dev_0_7.real_iface;
|
| + return iface->GetDefaultPrintSettings(resource, print_settings, callback);
|
| +}
|
| +
|
| +/* End wrapper methods for PPB_Printing_Dev_0_7 */
|
| +
|
| /* Not generating wrapper methods for PPB_ResourceArray_Dev_0_1 */
|
|
|
| /* Not generating wrapper methods for PPB_Scrollbar_Dev_0_5 */
|
| @@ -2538,6 +2557,8 @@ int32_t Pnacl_M21_PPB_Flash_DeviceID_GetDeviceID(PP_Resource device_id, struct P
|
|
|
| /* End wrapper methods for PPB_Flash_DeviceID_1_0 */
|
|
|
| +/* Not generating wrapper methods for PPB_Flash_Font_0_1 */
|
| +
|
| /* Not generating wrapper methods for PPB_FlashFullscreen_0_1 */
|
|
|
| /* Not generating wrapper methods for PPB_Flash_MessageLoop_0_1 */
|
| @@ -3686,6 +3707,11 @@ struct PPB_MessageLoop_Dev_0_1 Pnacl_Wrappers_PPB_MessageLoop_Dev_0_1 = {
|
|
|
| /* Not generating wrapper interface for PPB_Printing_Dev_0_6 */
|
|
|
| +struct PPB_Printing_Dev_0_7 Pnacl_Wrappers_PPB_Printing_Dev_0_7 = {
|
| + .Create = (PP_Resource (*)(PP_Instance instance))&Pnacl_M23_PPB_Printing_Dev_Create,
|
| + .GetDefaultPrintSettings = (int32_t (*)(PP_Resource resource, struct PP_PrintSettings_Dev* print_settings, struct PP_CompletionCallback callback))&Pnacl_M23_PPB_Printing_Dev_GetDefaultPrintSettings
|
| +};
|
| +
|
| /* Not generating wrapper interface for PPB_ResourceArray_Dev_0_1 */
|
|
|
| /* Not generating wrapper interface for PPB_Scrollbar_Dev_0_5 */
|
| @@ -3906,6 +3932,8 @@ struct PPB_Flash_DeviceID_1_0 Pnacl_Wrappers_PPB_Flash_DeviceID_1_0 = {
|
| .GetDeviceID = (int32_t (*)(PP_Resource device_id, struct PP_Var* id, struct PP_CompletionCallback callback))&Pnacl_M21_PPB_Flash_DeviceID_GetDeviceID
|
| };
|
|
|
| +/* Not generating wrapper interface for PPB_Flash_Font_0_1 */
|
| +
|
| /* Not generating wrapper interface for PPB_FlashFullscreen_0_1 */
|
|
|
| /* Not generating wrapper interface for PPB_Flash_MessageLoop_0_1 */
|
| @@ -4475,6 +4503,12 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Printing_Dev_0_6 = {
|
| .real_iface = NULL
|
| };
|
|
|
| +static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Printing_Dev_0_7 = {
|
| + .iface_macro = PPB_PRINTING_DEV_INTERFACE_0_7,
|
| + .wrapped_iface = (void *) &Pnacl_Wrappers_PPB_Printing_Dev_0_7,
|
| + .real_iface = NULL
|
| +};
|
| +
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_ResourceArray_Dev_0_1 = {
|
| .iface_macro = PPB_RESOURCEARRAY_DEV_INTERFACE_0_1,
|
| .wrapped_iface = NULL /* Still need slot for real_iface */,
|
| @@ -4685,6 +4719,12 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_DeviceID_1_0 = {
|
| .real_iface = NULL
|
| };
|
|
|
| +static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_Font_0_1 = {
|
| + .iface_macro = PPB_FLASH_FONT_INTERFACE_0_1,
|
| + .wrapped_iface = NULL /* Still need slot for real_iface */,
|
| + .real_iface = NULL
|
| +};
|
| +
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_FlashFullscreen_0_1 = {
|
| .iface_macro = PPB_FLASHFULLSCREEN_INTERFACE_0_1,
|
| .wrapped_iface = NULL /* Still need slot for real_iface */,
|
| @@ -4883,6 +4923,7 @@ static struct __PnaclWrapperInfo *s_ppb_wrappers[] = {
|
| &Pnacl_WrapperInfo_PPB_Memory_Dev_0_1,
|
| &Pnacl_WrapperInfo_PPB_MessageLoop_Dev_0_1,
|
| &Pnacl_WrapperInfo_PPB_Printing_Dev_0_6,
|
| + &Pnacl_WrapperInfo_PPB_Printing_Dev_0_7,
|
| &Pnacl_WrapperInfo_PPB_ResourceArray_Dev_0_1,
|
| &Pnacl_WrapperInfo_PPB_Scrollbar_Dev_0_5,
|
| &Pnacl_WrapperInfo_PPB_Testing_Dev_0_7,
|
| @@ -4911,6 +4952,7 @@ static struct __PnaclWrapperInfo *s_ppb_wrappers[] = {
|
| &Pnacl_WrapperInfo_PPB_Flash_Clipboard_3_0,
|
| &Pnacl_WrapperInfo_PPB_Flash_Clipboard_4_0,
|
| &Pnacl_WrapperInfo_PPB_Flash_DeviceID_1_0,
|
| + &Pnacl_WrapperInfo_PPB_Flash_Font_0_1,
|
| &Pnacl_WrapperInfo_PPB_FlashFullscreen_0_1,
|
| &Pnacl_WrapperInfo_PPB_Flash_MessageLoop_0_1,
|
| &Pnacl_WrapperInfo_PPB_Flash_Print_1_0,
|
|
|