| 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 bd3b8486055f84dffaebc78aca9dd1e2dd88d814..cc3644cc9d916d39d7ae0daa497ea5c42b4b8525 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
|
| @@ -83,6 +83,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_drm.h"
|
| #include "ppapi/c/private/ppb_flash_font_file.h"
|
| #include "ppapi/c/private/ppb_flash_fullscreen.h"
|
| #include "ppapi/c/private/ppb_flash_menu.h"
|
| @@ -245,6 +246,7 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_13_0;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_Clipboard_4_0;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_Clipboard_5_0;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_DeviceID_1_0;
|
| +static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_DRM_1_0;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_FontFile_0_1;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_FlashFullscreen_0_1;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_FlashFullscreen_1_0;
|
| @@ -2685,6 +2687,20 @@ static int32_t Pnacl_M21_PPB_Flash_DeviceID_GetDeviceID(PP_Resource device_id, s
|
|
|
| /* End wrapper methods for PPB_Flash_DeviceID_1_0 */
|
|
|
| +/* Begin wrapper methods for PPB_Flash_DRM_1_0 */
|
| +
|
| +static PP_Resource Pnacl_M29_PPB_Flash_DRM_Create(PP_Instance instance) {
|
| + const struct PPB_Flash_DRM_1_0 *iface = Pnacl_WrapperInfo_PPB_Flash_DRM_1_0.real_iface;
|
| + return iface->Create(instance);
|
| +}
|
| +
|
| +static int32_t Pnacl_M29_PPB_Flash_DRM_GetDeviceID(PP_Resource drm, struct PP_Var* id, struct PP_CompletionCallback* callback) {
|
| + const struct PPB_Flash_DRM_1_0 *iface = Pnacl_WrapperInfo_PPB_Flash_DRM_1_0.real_iface;
|
| + return iface->GetDeviceID(drm, id, *callback);
|
| +}
|
| +
|
| +/* End wrapper methods for PPB_Flash_DRM_1_0 */
|
| +
|
| /* Not generating wrapper methods for PPB_Flash_FontFile_0_1 */
|
|
|
| /* Not generating wrapper methods for PPB_FlashFullscreen_0_1 */
|
| @@ -4459,6 +4475,11 @@ 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
|
| };
|
|
|
| +struct PPB_Flash_DRM_1_0 Pnacl_Wrappers_PPB_Flash_DRM_1_0 = {
|
| + .Create = (PP_Resource (*)(PP_Instance instance))&Pnacl_M29_PPB_Flash_DRM_Create,
|
| + .GetDeviceID = (int32_t (*)(PP_Resource drm, struct PP_Var* id, struct PP_CompletionCallback callback))&Pnacl_M29_PPB_Flash_DRM_GetDeviceID
|
| +};
|
| +
|
| /* Not generating wrapper interface for PPB_Flash_FontFile_0_1 */
|
|
|
| /* Not generating wrapper interface for PPB_FlashFullscreen_0_1 */
|
| @@ -5428,6 +5449,12 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_DeviceID_1_0 = {
|
| .real_iface = NULL
|
| };
|
|
|
| +static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_DRM_1_0 = {
|
| + .iface_macro = PPB_FLASH_DRM_INTERFACE_1_0,
|
| + .wrapped_iface = (void *) &Pnacl_Wrappers_PPB_Flash_DRM_1_0,
|
| + .real_iface = NULL
|
| +};
|
| +
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Flash_FontFile_0_1 = {
|
| .iface_macro = PPB_FLASH_FONTFILE_INTERFACE_0_1,
|
| .wrapped_iface = NULL /* Still need slot for real_iface */,
|
| @@ -5747,6 +5774,7 @@ static struct __PnaclWrapperInfo *s_ppb_wrappers[] = {
|
| &Pnacl_WrapperInfo_PPB_Flash_Clipboard_4_0,
|
| &Pnacl_WrapperInfo_PPB_Flash_Clipboard_5_0,
|
| &Pnacl_WrapperInfo_PPB_Flash_DeviceID_1_0,
|
| + &Pnacl_WrapperInfo_PPB_Flash_DRM_1_0,
|
| &Pnacl_WrapperInfo_PPB_Flash_FontFile_0_1,
|
| &Pnacl_WrapperInfo_PPB_FlashFullscreen_0_1,
|
| &Pnacl_WrapperInfo_PPB_FlashFullscreen_1_0,
|
|
|