| 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 270a5c36ba695af23cbd4074782ca5ee9c587678..786fd9107e805aa5f0021f7465a19ce4b576fbf1 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
|
| @@ -27,6 +27,7 @@
|
| #include "ppapi/c/dev/ppb_text_input_dev.h"
|
| #include "ppapi/c/dev/ppb_trace_event_dev.h"
|
| #include "ppapi/c/dev/ppb_url_util_dev.h"
|
| +#include "ppapi/c/dev/ppb_var_dictionary_dev.h"
|
| #include "ppapi/c/dev/ppb_video_capture_dev.h"
|
| #include "ppapi/c/dev/ppb_video_decoder_dev.h"
|
| #include "ppapi/c/dev/ppb_view_dev.h"
|
| @@ -114,14 +115,8 @@
|
|
|
| /* Use local strcmp to avoid dependency on libc. */
|
| static int mystrcmp(const char* s1, const char *s2) {
|
| - while (1) {
|
| - if (*s1 == 0) break;
|
| - if (*s2 == 0) break;
|
| - if (*s1 != *s2) break;
|
| - ++s1;
|
| - ++s2;
|
| - }
|
| - return *(s1) - *(s2);
|
| + while((*s1 && *s2) && (*s1++ == *s2++));
|
| + return *(--s1) - *(--s2);
|
| }
|
|
|
| /* BEGIN Declarations for all Wrapper Infos */
|
| @@ -205,6 +200,7 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_TextInput_Dev_0_1;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_TextInput_Dev_0_2;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Trace_Event_Dev_0_1;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_URLUtil_Dev_0_6;
|
| +static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_VarDictionary_Dev_0_1;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_VideoCapture_Dev_0_2;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_VideoCapture_Dev_0_3;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_VideoDecoder_Dev_0_16;
|
| @@ -2039,6 +2035,46 @@ struct PP_Var Pnacl_M17_PPB_URLUtil_Dev_GetPluginInstanceURL(PP_Instance instanc
|
|
|
| /* End wrapper methods for PPB_URLUtil_Dev_0_6 */
|
|
|
| +/* Begin wrapper methods for PPB_VarDictionary_Dev_0_1 */
|
| +
|
| +static __attribute__((pnaclcall))
|
| +struct PP_Var Pnacl_M27_PPB_VarDictionary_Dev_Create(void) {
|
| + const struct PPB_VarDictionary_Dev_0_1 *iface = Pnacl_WrapperInfo_PPB_VarDictionary_Dev_0_1.real_iface;
|
| + return iface->Create();
|
| +}
|
| +
|
| +static __attribute__((pnaclcall))
|
| +struct PP_Var Pnacl_M27_PPB_VarDictionary_Dev_Get(struct PP_Var dict, struct PP_Var key) {
|
| + const struct PPB_VarDictionary_Dev_0_1 *iface = Pnacl_WrapperInfo_PPB_VarDictionary_Dev_0_1.real_iface;
|
| + return iface->Get(dict, key);
|
| +}
|
| +
|
| +static __attribute__((pnaclcall))
|
| +PP_Bool Pnacl_M27_PPB_VarDictionary_Dev_Set(struct PP_Var dict, struct PP_Var key, struct PP_Var value) {
|
| + const struct PPB_VarDictionary_Dev_0_1 *iface = Pnacl_WrapperInfo_PPB_VarDictionary_Dev_0_1.real_iface;
|
| + return iface->Set(dict, key, value);
|
| +}
|
| +
|
| +static __attribute__((pnaclcall))
|
| +void Pnacl_M27_PPB_VarDictionary_Dev_Delete(struct PP_Var dict, struct PP_Var key) {
|
| + const struct PPB_VarDictionary_Dev_0_1 *iface = Pnacl_WrapperInfo_PPB_VarDictionary_Dev_0_1.real_iface;
|
| + iface->Delete(dict, key);
|
| +}
|
| +
|
| +static __attribute__((pnaclcall))
|
| +PP_Bool Pnacl_M27_PPB_VarDictionary_Dev_HasKey(struct PP_Var dict, struct PP_Var key) {
|
| + const struct PPB_VarDictionary_Dev_0_1 *iface = Pnacl_WrapperInfo_PPB_VarDictionary_Dev_0_1.real_iface;
|
| + return iface->HasKey(dict, key);
|
| +}
|
| +
|
| +static __attribute__((pnaclcall))
|
| +struct PP_Var Pnacl_M27_PPB_VarDictionary_Dev_GetKeys(struct PP_Var dict) {
|
| + const struct PPB_VarDictionary_Dev_0_1 *iface = Pnacl_WrapperInfo_PPB_VarDictionary_Dev_0_1.real_iface;
|
| + return iface->GetKeys(dict);
|
| +}
|
| +
|
| +/* End wrapper methods for PPB_VarDictionary_Dev_0_1 */
|
| +
|
| /* Begin wrapper methods for PPB_VideoCapture_Dev_0_2 */
|
|
|
| static __attribute__((pnaclcall))
|
| @@ -4075,6 +4111,15 @@ struct PPB_URLUtil_Dev_0_6 Pnacl_Wrappers_PPB_URLUtil_Dev_0_6 = {
|
| .GetPluginInstanceURL = (struct PP_Var (*)(PP_Instance instance, struct PP_URLComponents_Dev* components))&Pnacl_M17_PPB_URLUtil_Dev_GetPluginInstanceURL
|
| };
|
|
|
| +struct PPB_VarDictionary_Dev_0_1 Pnacl_Wrappers_PPB_VarDictionary_Dev_0_1 = {
|
| + .Create = (struct PP_Var (*)(void))&Pnacl_M27_PPB_VarDictionary_Dev_Create,
|
| + .Get = (struct PP_Var (*)(struct PP_Var dict, struct PP_Var key))&Pnacl_M27_PPB_VarDictionary_Dev_Get,
|
| + .Set = (PP_Bool (*)(struct PP_Var dict, struct PP_Var key, struct PP_Var value))&Pnacl_M27_PPB_VarDictionary_Dev_Set,
|
| + .Delete = (void (*)(struct PP_Var dict, struct PP_Var key))&Pnacl_M27_PPB_VarDictionary_Dev_Delete,
|
| + .HasKey = (PP_Bool (*)(struct PP_Var dict, struct PP_Var key))&Pnacl_M27_PPB_VarDictionary_Dev_HasKey,
|
| + .GetKeys = (struct PP_Var (*)(struct PP_Var dict))&Pnacl_M27_PPB_VarDictionary_Dev_GetKeys
|
| +};
|
| +
|
| struct PPB_VideoCapture_Dev_0_2 Pnacl_Wrappers_PPB_VideoCapture_Dev_0_2 = {
|
| .Create = (PP_Resource (*)(PP_Instance instance))&Pnacl_M19_PPB_VideoCapture_Dev_Create,
|
| .IsVideoCapture = (PP_Bool (*)(PP_Resource video_capture))&Pnacl_M19_PPB_VideoCapture_Dev_IsVideoCapture,
|
| @@ -4930,6 +4975,12 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_URLUtil_Dev_0_6 = {
|
| .real_iface = NULL
|
| };
|
|
|
| +static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_VarDictionary_Dev_0_1 = {
|
| + .iface_macro = PPB_VAR_DICTIONARY_DEV_INTERFACE_0_1,
|
| + .wrapped_iface = (void *) &Pnacl_Wrappers_PPB_VarDictionary_Dev_0_1,
|
| + .real_iface = NULL
|
| +};
|
| +
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_VideoCapture_Dev_0_2 = {
|
| .iface_macro = PPB_VIDEOCAPTURE_DEV_INTERFACE_0_2,
|
| .wrapped_iface = (void *) &Pnacl_Wrappers_PPB_VideoCapture_Dev_0_2,
|
| @@ -5352,6 +5403,7 @@ static struct __PnaclWrapperInfo *s_ppb_wrappers[] = {
|
| &Pnacl_WrapperInfo_PPB_TextInput_Dev_0_2,
|
| &Pnacl_WrapperInfo_PPB_Trace_Event_Dev_0_1,
|
| &Pnacl_WrapperInfo_PPB_URLUtil_Dev_0_6,
|
| + &Pnacl_WrapperInfo_PPB_VarDictionary_Dev_0_1,
|
| &Pnacl_WrapperInfo_PPB_VideoCapture_Dev_0_2,
|
| &Pnacl_WrapperInfo_PPB_VideoCapture_Dev_0_3,
|
| &Pnacl_WrapperInfo_PPB_VideoDecoder_Dev_0_16,
|
|
|