| 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 16a3a9064ba4b74ba628ce7b322c85186cf2a154..245b3bc18fed284b6a1febe0a90fa9aca943e105 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
|
| @@ -97,6 +97,7 @@ static int mystrcmp(const char* s1, const char *s2) {
|
|
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Compositor_0_1;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_CompositorLayer_0_1;
|
| +static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_CompositorLayer_0_2;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Console_1_0;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Core_1_0;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_FileIO_1_0;
|
| @@ -296,6 +297,60 @@ static int32_t Pnacl_M37_PPB_CompositorLayer_SetPremultipliedAlpha(PP_Resource l
|
|
|
| /* End wrapper methods for PPB_CompositorLayer_0_1 */
|
|
|
| +/* Begin wrapper methods for PPB_CompositorLayer_0_2 */
|
| +
|
| +static PP_Bool Pnacl_M38_PPB_CompositorLayer_IsCompositorLayer(PP_Resource resource) {
|
| + const struct PPB_CompositorLayer_0_2 *iface = Pnacl_WrapperInfo_PPB_CompositorLayer_0_2.real_iface;
|
| + return iface->IsCompositorLayer(resource);
|
| +}
|
| +
|
| +static int32_t Pnacl_M38_PPB_CompositorLayer_SetColor(PP_Resource layer, float red, float green, float blue, float alpha, const struct PP_Size* size) {
|
| + const struct PPB_CompositorLayer_0_2 *iface = Pnacl_WrapperInfo_PPB_CompositorLayer_0_2.real_iface;
|
| + return iface->SetColor(layer, red, green, blue, alpha, size);
|
| +}
|
| +
|
| +static int32_t Pnacl_M38_PPB_CompositorLayer_SetTexture(PP_Resource layer, PP_Resource context, uint32_t target, uint32_t texture, const struct PP_Size* size, struct PP_CompletionCallback* cc) {
|
| + const struct PPB_CompositorLayer_0_2 *iface = Pnacl_WrapperInfo_PPB_CompositorLayer_0_2.real_iface;
|
| + return iface->SetTexture(layer, context, target, texture, size, *cc);
|
| +}
|
| +
|
| +static int32_t Pnacl_M38_PPB_CompositorLayer_SetImage(PP_Resource layer, PP_Resource image_data, const struct PP_Size* size, struct PP_CompletionCallback* cc) {
|
| + const struct PPB_CompositorLayer_0_2 *iface = Pnacl_WrapperInfo_PPB_CompositorLayer_0_2.real_iface;
|
| + return iface->SetImage(layer, image_data, size, *cc);
|
| +}
|
| +
|
| +static int32_t Pnacl_M38_PPB_CompositorLayer_SetClipRect(PP_Resource layer, const struct PP_Rect* rect) {
|
| + const struct PPB_CompositorLayer_0_2 *iface = Pnacl_WrapperInfo_PPB_CompositorLayer_0_2.real_iface;
|
| + return iface->SetClipRect(layer, rect);
|
| +}
|
| +
|
| +static int32_t Pnacl_M38_PPB_CompositorLayer_SetTransform(PP_Resource layer, const float matrix[16]) {
|
| + const struct PPB_CompositorLayer_0_2 *iface = Pnacl_WrapperInfo_PPB_CompositorLayer_0_2.real_iface;
|
| + return iface->SetTransform(layer, matrix);
|
| +}
|
| +
|
| +static int32_t Pnacl_M38_PPB_CompositorLayer_SetOpacity(PP_Resource layer, float opacity) {
|
| + const struct PPB_CompositorLayer_0_2 *iface = Pnacl_WrapperInfo_PPB_CompositorLayer_0_2.real_iface;
|
| + return iface->SetOpacity(layer, opacity);
|
| +}
|
| +
|
| +static int32_t Pnacl_M38_PPB_CompositorLayer_SetBlendMode(PP_Resource layer, PP_BlendMode mode) {
|
| + const struct PPB_CompositorLayer_0_2 *iface = Pnacl_WrapperInfo_PPB_CompositorLayer_0_2.real_iface;
|
| + return iface->SetBlendMode(layer, mode);
|
| +}
|
| +
|
| +static int32_t Pnacl_M38_PPB_CompositorLayer_SetSourceRect(PP_Resource layer, const struct PP_FloatRect* rect) {
|
| + const struct PPB_CompositorLayer_0_2 *iface = Pnacl_WrapperInfo_PPB_CompositorLayer_0_2.real_iface;
|
| + return iface->SetSourceRect(layer, rect);
|
| +}
|
| +
|
| +static int32_t Pnacl_M38_PPB_CompositorLayer_SetPremultipliedAlpha(PP_Resource layer, PP_Bool premult) {
|
| + const struct PPB_CompositorLayer_0_2 *iface = Pnacl_WrapperInfo_PPB_CompositorLayer_0_2.real_iface;
|
| + return iface->SetPremultipliedAlpha(layer, premult);
|
| +}
|
| +
|
| +/* End wrapper methods for PPB_CompositorLayer_0_2 */
|
| +
|
| /* Begin wrapper methods for PPB_Console_1_0 */
|
|
|
| static void Pnacl_M25_PPB_Console_Log(PP_Instance instance, PP_LogLevel level, struct PP_Var* value) {
|
| @@ -4369,6 +4424,19 @@ static const struct PPB_CompositorLayer_0_1 Pnacl_Wrappers_PPB_CompositorLayer_0
|
| .SetPremultipliedAlpha = (int32_t (*)(PP_Resource layer, PP_Bool premult))&Pnacl_M37_PPB_CompositorLayer_SetPremultipliedAlpha
|
| };
|
|
|
| +static const struct PPB_CompositorLayer_0_2 Pnacl_Wrappers_PPB_CompositorLayer_0_2 = {
|
| + .IsCompositorLayer = (PP_Bool (*)(PP_Resource resource))&Pnacl_M38_PPB_CompositorLayer_IsCompositorLayer,
|
| + .SetColor = (int32_t (*)(PP_Resource layer, float red, float green, float blue, float alpha, const struct PP_Size* size))&Pnacl_M38_PPB_CompositorLayer_SetColor,
|
| + .SetTexture = (int32_t (*)(PP_Resource layer, PP_Resource context, uint32_t target, uint32_t texture, const struct PP_Size* size, struct PP_CompletionCallback cc))&Pnacl_M38_PPB_CompositorLayer_SetTexture,
|
| + .SetImage = (int32_t (*)(PP_Resource layer, PP_Resource image_data, const struct PP_Size* size, struct PP_CompletionCallback cc))&Pnacl_M38_PPB_CompositorLayer_SetImage,
|
| + .SetClipRect = (int32_t (*)(PP_Resource layer, const struct PP_Rect* rect))&Pnacl_M38_PPB_CompositorLayer_SetClipRect,
|
| + .SetTransform = (int32_t (*)(PP_Resource layer, const float matrix[16]))&Pnacl_M38_PPB_CompositorLayer_SetTransform,
|
| + .SetOpacity = (int32_t (*)(PP_Resource layer, float opacity))&Pnacl_M38_PPB_CompositorLayer_SetOpacity,
|
| + .SetBlendMode = (int32_t (*)(PP_Resource layer, PP_BlendMode mode))&Pnacl_M38_PPB_CompositorLayer_SetBlendMode,
|
| + .SetSourceRect = (int32_t (*)(PP_Resource layer, const struct PP_FloatRect* rect))&Pnacl_M38_PPB_CompositorLayer_SetSourceRect,
|
| + .SetPremultipliedAlpha = (int32_t (*)(PP_Resource layer, PP_Bool premult))&Pnacl_M38_PPB_CompositorLayer_SetPremultipliedAlpha
|
| +};
|
| +
|
| static const struct PPB_Console_1_0 Pnacl_Wrappers_PPB_Console_1_0 = {
|
| .Log = (void (*)(PP_Instance instance, PP_LogLevel level, struct PP_Var value))&Pnacl_M25_PPB_Console_Log,
|
| .LogWithSource = (void (*)(PP_Instance instance, PP_LogLevel level, struct PP_Var source, struct PP_Var value))&Pnacl_M25_PPB_Console_LogWithSource
|
| @@ -5503,6 +5571,12 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_CompositorLayer_0_1 = {
|
| .real_iface = NULL
|
| };
|
|
|
| +static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_CompositorLayer_0_2 = {
|
| + .iface_macro = PPB_COMPOSITORLAYER_INTERFACE_0_2,
|
| + .wrapped_iface = (const void *) &Pnacl_Wrappers_PPB_CompositorLayer_0_2,
|
| + .real_iface = NULL
|
| +};
|
| +
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Console_1_0 = {
|
| .iface_macro = PPB_CONSOLE_INTERFACE_1_0,
|
| .wrapped_iface = (const void *) &Pnacl_Wrappers_PPB_Console_1_0,
|
| @@ -6130,6 +6204,7 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPP_Instance_Private_0_1 = {
|
| static struct __PnaclWrapperInfo *s_ppb_wrappers[] = {
|
| &Pnacl_WrapperInfo_PPB_Compositor_0_1,
|
| &Pnacl_WrapperInfo_PPB_CompositorLayer_0_1,
|
| + &Pnacl_WrapperInfo_PPB_CompositorLayer_0_2,
|
| &Pnacl_WrapperInfo_PPB_Console_1_0,
|
| &Pnacl_WrapperInfo_PPB_Core_1_0,
|
| &Pnacl_WrapperInfo_PPB_FileIO_1_0,
|
|
|