| 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 6e8a8aa7cde1b4b073fe18ee3e56416970685113..435ad91f082fc1907c9b4ba2a94d13b52a043f19 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
|
| @@ -118,6 +118,7 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_WheelInputEvent_1_0;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_KeyboardInputEvent_1_0;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_KeyboardInputEvent_1_2;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_TouchInputEvent_1_0;
|
| +static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_TouchInputEvent_1_1;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_IMEInputEvent_1_0;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_MediaStreamAudioTrack_0_1;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_MediaStreamVideoTrack_0_1;
|
| @@ -1191,6 +1192,50 @@ static void Pnacl_M13_PPB_TouchInputEvent_GetTouchById(struct PP_TouchPoint* _st
|
|
|
| /* End wrapper methods for PPB_TouchInputEvent_1_0 */
|
|
|
| +/* Begin wrapper methods for PPB_TouchInputEvent_1_1 */
|
| +
|
| +static PP_Resource Pnacl_M14_PPB_TouchInputEvent_Create(PP_Instance instance, PP_InputEvent_Type type, PP_TimeTicks time_stamp, uint32_t modifiers) {
|
| + const struct PPB_TouchInputEvent_1_1 *iface = Pnacl_WrapperInfo_PPB_TouchInputEvent_1_1.real_iface;
|
| + return iface->Create(instance, type, time_stamp, modifiers);
|
| +}
|
| +
|
| +static void Pnacl_M14_PPB_TouchInputEvent_AddTouchPoint(PP_Resource touch_event, PP_TouchListType list, const struct PP_TouchPoint* point) {
|
| + const struct PPB_TouchInputEvent_1_1 *iface = Pnacl_WrapperInfo_PPB_TouchInputEvent_1_1.real_iface;
|
| + iface->AddTouchPoint(touch_event, list, point);
|
| +}
|
| +
|
| +static PP_Bool Pnacl_M14_PPB_TouchInputEvent_IsTouchInputEvent(PP_Resource resource) {
|
| + const struct PPB_TouchInputEvent_1_1 *iface = Pnacl_WrapperInfo_PPB_TouchInputEvent_1_1.real_iface;
|
| + return iface->IsTouchInputEvent(resource);
|
| +}
|
| +
|
| +static uint32_t Pnacl_M14_PPB_TouchInputEvent_GetTouchCount(PP_Resource resource, PP_TouchListType list) {
|
| + const struct PPB_TouchInputEvent_1_1 *iface = Pnacl_WrapperInfo_PPB_TouchInputEvent_1_1.real_iface;
|
| + return iface->GetTouchCount(resource, list);
|
| +}
|
| +
|
| +static void Pnacl_M14_PPB_TouchInputEvent_GetTouchByIndex(struct PP_TouchPoint* _struct_result, PP_Resource resource, PP_TouchListType list, uint32_t index) {
|
| + const struct PPB_TouchInputEvent_1_1 *iface = Pnacl_WrapperInfo_PPB_TouchInputEvent_1_1.real_iface;
|
| + *_struct_result = iface->GetTouchByIndex(resource, list, index);
|
| +}
|
| +
|
| +static void Pnacl_M14_PPB_TouchInputEvent_GetTouchById(struct PP_TouchPoint* _struct_result, PP_Resource resource, PP_TouchListType list, uint32_t touch_id) {
|
| + const struct PPB_TouchInputEvent_1_1 *iface = Pnacl_WrapperInfo_PPB_TouchInputEvent_1_1.real_iface;
|
| + *_struct_result = iface->GetTouchById(resource, list, touch_id);
|
| +}
|
| +
|
| +static void Pnacl_M14_PPB_TouchInputEvent_GetTouchTiltByIndex(struct PP_FloatPoint* _struct_result, PP_Resource resource, PP_TouchListType list, uint32_t index) {
|
| + const struct PPB_TouchInputEvent_1_1 *iface = Pnacl_WrapperInfo_PPB_TouchInputEvent_1_1.real_iface;
|
| + *_struct_result = iface->GetTouchTiltByIndex(resource, list, index);
|
| +}
|
| +
|
| +static void Pnacl_M14_PPB_TouchInputEvent_GetTouchTiltById(struct PP_FloatPoint* _struct_result, PP_Resource resource, PP_TouchListType list, uint32_t touch_id) {
|
| + const struct PPB_TouchInputEvent_1_1 *iface = Pnacl_WrapperInfo_PPB_TouchInputEvent_1_1.real_iface;
|
| + *_struct_result = iface->GetTouchTiltById(resource, list, touch_id);
|
| +}
|
| +
|
| +/* End wrapper methods for PPB_TouchInputEvent_1_1 */
|
| +
|
| /* Begin wrapper methods for PPB_IMEInputEvent_1_0 */
|
|
|
| static PP_Resource Pnacl_M13_PPB_IMEInputEvent_Create(PP_Instance instance, PP_InputEvent_Type type, PP_TimeTicks time_stamp, struct PP_Var* text, uint32_t segment_number, const uint32_t segment_offsets[], int32_t target_segment, uint32_t selection_start, uint32_t selection_end) {
|
| @@ -5018,6 +5063,17 @@ static const struct PPB_TouchInputEvent_1_0 Pnacl_Wrappers_PPB_TouchInputEvent_1
|
| .GetTouchById = (struct PP_TouchPoint (*)(PP_Resource resource, PP_TouchListType list, uint32_t touch_id))&Pnacl_M13_PPB_TouchInputEvent_GetTouchById
|
| };
|
|
|
| +static const struct PPB_TouchInputEvent_1_1 Pnacl_Wrappers_PPB_TouchInputEvent_1_1 = {
|
| + .Create = (PP_Resource (*)(PP_Instance instance, PP_InputEvent_Type type, PP_TimeTicks time_stamp, uint32_t modifiers))&Pnacl_M14_PPB_TouchInputEvent_Create,
|
| + .AddTouchPoint = (void (*)(PP_Resource touch_event, PP_TouchListType list, const struct PP_TouchPoint* point))&Pnacl_M14_PPB_TouchInputEvent_AddTouchPoint,
|
| + .IsTouchInputEvent = (PP_Bool (*)(PP_Resource resource))&Pnacl_M14_PPB_TouchInputEvent_IsTouchInputEvent,
|
| + .GetTouchCount = (uint32_t (*)(PP_Resource resource, PP_TouchListType list))&Pnacl_M14_PPB_TouchInputEvent_GetTouchCount,
|
| + .GetTouchByIndex = (struct PP_TouchPoint (*)(PP_Resource resource, PP_TouchListType list, uint32_t index))&Pnacl_M14_PPB_TouchInputEvent_GetTouchByIndex,
|
| + .GetTouchById = (struct PP_TouchPoint (*)(PP_Resource resource, PP_TouchListType list, uint32_t touch_id))&Pnacl_M14_PPB_TouchInputEvent_GetTouchById,
|
| + .GetTouchTiltByIndex = (struct PP_FloatPoint (*)(PP_Resource resource, PP_TouchListType list, uint32_t index))&Pnacl_M14_PPB_TouchInputEvent_GetTouchTiltByIndex,
|
| + .GetTouchTiltById = (struct PP_FloatPoint (*)(PP_Resource resource, PP_TouchListType list, uint32_t touch_id))&Pnacl_M14_PPB_TouchInputEvent_GetTouchTiltById
|
| +};
|
| +
|
| static const struct PPB_IMEInputEvent_1_0 Pnacl_Wrappers_PPB_IMEInputEvent_1_0 = {
|
| .Create = (PP_Resource (*)(PP_Instance instance, PP_InputEvent_Type type, PP_TimeTicks time_stamp, struct PP_Var text, uint32_t segment_number, const uint32_t segment_offsets[], int32_t target_segment, uint32_t selection_start, uint32_t selection_end))&Pnacl_M13_PPB_IMEInputEvent_Create,
|
| .IsIMEInputEvent = (PP_Bool (*)(PP_Resource resource))&Pnacl_M13_PPB_IMEInputEvent_IsIMEInputEvent,
|
| @@ -6151,6 +6207,12 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_TouchInputEvent_1_0 = {
|
| .real_iface = NULL
|
| };
|
|
|
| +static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_TouchInputEvent_1_1 = {
|
| + .iface_macro = PPB_TOUCH_INPUT_EVENT_INTERFACE_1_1,
|
| + .wrapped_iface = (const void *) &Pnacl_Wrappers_PPB_TouchInputEvent_1_1,
|
| + .real_iface = NULL
|
| +};
|
| +
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_IMEInputEvent_1_0 = {
|
| .iface_macro = PPB_IME_INPUT_EVENT_INTERFACE_1_0,
|
| .wrapped_iface = (const void *) &Pnacl_Wrappers_PPB_IMEInputEvent_1_0,
|
| @@ -6721,6 +6783,7 @@ static struct __PnaclWrapperInfo *s_ppb_wrappers[] = {
|
| &Pnacl_WrapperInfo_PPB_KeyboardInputEvent_1_0,
|
| &Pnacl_WrapperInfo_PPB_KeyboardInputEvent_1_2,
|
| &Pnacl_WrapperInfo_PPB_TouchInputEvent_1_0,
|
| + &Pnacl_WrapperInfo_PPB_TouchInputEvent_1_1,
|
| &Pnacl_WrapperInfo_PPB_IMEInputEvent_1_0,
|
| &Pnacl_WrapperInfo_PPB_MediaStreamAudioTrack_0_1,
|
| &Pnacl_WrapperInfo_PPB_MediaStreamVideoTrack_0_1,
|
|
|