| Index: ppapi/cpp/input_event.cc
|
| diff --git a/ppapi/cpp/input_event.cc b/ppapi/cpp/input_event.cc
|
| index 90f41fa2b8fbaeb99a51990a221a27dac8d3ac25..90fe65905b1e02cfd4b76087cb8cbe1b8c50e6e4 100644
|
| --- a/ppapi/cpp/input_event.cc
|
| +++ b/ppapi/cpp/input_event.cc
|
| @@ -39,6 +39,11 @@ template <> const char* interface_name<PPB_TouchInputEvent_1_0>() {
|
| return PPB_TOUCH_INPUT_EVENT_INTERFACE_1_0;
|
| }
|
|
|
| +template <>
|
| +const char* interface_name<PPB_TouchInputEvent_1_1>() {
|
| + return PPB_TOUCH_INPUT_EVENT_INTERFACE_1_1;
|
| +}
|
| +
|
| template <> const char* interface_name<PPB_IMEInputEvent_1_0>() {
|
| return PPB_IME_INPUT_EVENT_INTERFACE_1_0;
|
| }
|
| @@ -324,14 +329,32 @@ TouchPoint TouchInputEvent::GetTouchById(PP_TouchListType list,
|
| uint32_t id) const {
|
| if (!has_interface<PPB_TouchInputEvent_1_0>())
|
| return TouchPoint();
|
| - return TouchPoint(get_interface<PPB_TouchInputEvent_1_0>()->
|
| - GetTouchById(pp_resource(), list, id));
|
| +
|
| + if (has_interface<PPB_TouchInputEvent_1_1>()) {
|
| + return TouchPoint(
|
| + get_interface<PPB_TouchInputEvent_1_1>()->GetTouchById(pp_resource(),
|
| + list, id),
|
| + get_interface<PPB_TouchInputEvent_1_1>()->GetTouchTiltById(
|
| + pp_resource(), list, id));
|
| + }
|
| +
|
| + return TouchPoint(get_interface<PPB_TouchInputEvent_1_0>()->GetTouchById(
|
| + pp_resource(), list, id));
|
| }
|
|
|
| TouchPoint TouchInputEvent::GetTouchByIndex(PP_TouchListType list,
|
| uint32_t index) const {
|
| if (!has_interface<PPB_TouchInputEvent_1_0>())
|
| return TouchPoint();
|
| +
|
| + if (has_interface<PPB_TouchInputEvent_1_1>()) {
|
| + return TouchPoint(
|
| + get_interface<PPB_TouchInputEvent_1_1>()->GetTouchByIndex(pp_resource(),
|
| + list, index),
|
| + get_interface<PPB_TouchInputEvent_1_1>()->GetTouchTiltByIndex(
|
| + pp_resource(), list, index));
|
| + }
|
| +
|
| return TouchPoint(get_interface<PPB_TouchInputEvent_1_0>()->
|
| GetTouchByIndex(pp_resource(), list, index));
|
| }
|
|
|