Add tilt_x and tilt_y to ppapi touchpoint.

ppapi/shared_impl/ppb_input_event_shared.cc

Index: ppapi/shared_impl/ppb_input_event_shared.cc
diff --git a/ppapi/shared_impl/ppb_input_event_shared.cc b/ppapi/shared_impl/ppb_input_event_shared.cc
index c966224b39dd177dec6e08158e20edf2fc95eab2..fcbab95239bf0956524493221f52608e392bfe22 100644
--- a/ppapi/shared_impl/ppb_input_event_shared.cc
+++ b/ppapi/shared_impl/ppb_input_event_shared.cc
@@ -121,15 +121,16 @@ void PPB_InputEvent_Shared::GetIMESelection(uint32_t* start, uint32_t* end) {
 
 void PPB_InputEvent_Shared::AddTouchPoint(PP_TouchListType list,
                                           const PP_TouchPoint& point) {
+  TouchPointWithTilt point_with_tilt{point, {0, 0}};
   switch (list) {
     case PP_TOUCHLIST_TYPE_TOUCHES:
-      data_.touches.push_back(point);
+      data_.touches.push_back(point_with_tilt);
       break;
     case PP_TOUCHLIST_TYPE_CHANGEDTOUCHES:
-      data_.changed_touches.push_back(point);
+      data_.changed_touches.push_back(point_with_tilt);
       break;
     case PP_TOUCHLIST_TYPE_TARGETTOUCHES:
-      data_.target_touches.push_back(point);
+      data_.target_touches.push_back(point_with_tilt);
       break;
     default:
       break;
@@ -149,49 +150,71 @@ uint32_t PPB_InputEvent_Shared::GetTouchCount(PP_TouchListType list) {
   return 0;
 }
 
-PP_TouchPoint PPB_InputEvent_Shared::GetTouchByIndex(PP_TouchListType list,
-                                                     uint32_t index) {
-  std::vector<PP_TouchPoint>* points;
+std::vector<TouchPointWithTilt>* PPB_InputEvent_Shared::GetTouchListByType(
+    PP_TouchListType list) {
   switch (list) {
     case PP_TOUCHLIST_TYPE_TOUCHES:
-      points = &data_.touches;
-      break;
+      return &data_.touches;
     case PP_TOUCHLIST_TYPE_CHANGEDTOUCHES:
-      points = &data_.changed_touches;
-      break;
+      return &data_.changed_touches;
     case PP_TOUCHLIST_TYPE_TARGETTOUCHES:
-      points = &data_.target_touches;
-      break;
+      return &data_.target_touches;
     default:

[dcheng, 2017/05/25 21:55:02]

Nit: remove default, move return nullptr to outside the switch. That way the
compiler will warn for future unhandled values.

-      return PP_MakeTouchPoint();
+      return nullptr;
   }
-  if (index >= points->size()) {
+}
+
+TouchPointWithTilt* PPB_InputEvent_Shared::GetTouchByTypeAndId(
+    PP_TouchListType list,
+    uint32_t id) {
+  std::vector<TouchPointWithTilt>* points = GetTouchListByType(list);
+  if (!points)
+    return nullptr;
+
+  for (size_t i = 0; i < points->size(); i++) {
+    if (points->at(i).touch.id == id)
+      return &points->at(i);
+  }
+
+  return nullptr;
+}
+
+PP_TouchPoint PPB_InputEvent_Shared::GetTouchByIndex(PP_TouchListType list,
+                                                     uint32_t index) {
+  std::vector<TouchPointWithTilt>* points = GetTouchListByType(list);
+
+  if (!points || index >= points->size()) {
     return PP_MakeTouchPoint();
   }
-  return points->at(index);
+  return points->at(index).touch;
 }
 
 PP_TouchPoint PPB_InputEvent_Shared::GetTouchById(PP_TouchListType list,
                                                   uint32_t id) {
-  const std::vector<PP_TouchPoint>* points;
-  switch (list) {
-    case PP_TOUCHLIST_TYPE_TOUCHES:
-      points = &data_.touches;
-      break;
-    case PP_TOUCHLIST_TYPE_CHANGEDTOUCHES:
-      points = &data_.changed_touches;
-      break;
-    case PP_TOUCHLIST_TYPE_TARGETTOUCHES:
-      points = &data_.target_touches;
-      break;
-    default:
-      return PP_MakeTouchPoint();
-  }
-  for (size_t i = 0; i < points->size(); i++) {
-    if (points->at(i).id == id)
-      return points->at(i);
+  TouchPointWithTilt* point = GetTouchByTypeAndId(list, id);
+  if (!point)
+    return PP_MakeTouchPoint();
+
+  return point->touch;
+}
+
+PP_FloatPoint PPB_InputEvent_Shared::GetTouchTiltByIndex(PP_TouchListType list,
+                                                         uint32_t index) {
+  std::vector<TouchPointWithTilt>* points = GetTouchListByType(list);
+
+  if (!points || index >= points->size()) {

[dcheng, 2017/05/25 21:55:02]

Super minor nit: be consistent with { }'s around one-line ifs (line 196 and line
215 both aren't wrapped in { }'s)

+    return PP_MakeFloatPoint(0, 0);
   }
-  return PP_MakeTouchPoint();
+  return points->at(index).tilt;
+}
+
+PP_FloatPoint PPB_InputEvent_Shared::GetTouchTiltById(PP_TouchListType list,
+                                                      uint32_t id) {
+  TouchPointWithTilt* point = GetTouchByTypeAndId(list, id);
+  if (!point)
+    return PP_MakeFloatPoint(0, 0);
+
+  return point->tilt;
 }
 
 // static