Add tilt_x and tilt_y to ppapi touchpoint.

ppapi/shared_impl/ppb_input_event_shared.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ppapi/shared_impl/ppb_input_event_shared.h"
 
 #include <stddef.h>
 
 #include "ppapi/shared_impl/ppapi_globals.h"
 #include "ppapi/shared_impl/var.h"
@@ skipping 103 matching lines @@
 
 void PPB_InputEvent_Shared::GetIMESelection(uint32_t* start, uint32_t* end) {
   if (start)
     *start = data_.composition_selection_start;
   if (end)
     *end = data_.composition_selection_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;
   }
 }
 
 uint32_t PPB_InputEvent_Shared::GetTouchCount(PP_TouchListType list) {
   switch (list) {
     case PP_TOUCHLIST_TYPE_TOUCHES:
       return static_cast<uint32_t>(data_.touches.size());
     case PP_TOUCHLIST_TYPE_CHANGEDTOUCHES:
       return static_cast<uint32_t>(data_.changed_touches.size());
     case PP_TOUCHLIST_TYPE_TARGETTOUCHES:
       return static_cast<uint32_t>(data_.target_touches.size());
   }
 
   return 0;
 }
 
+std::vector<TouchPointWithTilt>* PPB_InputEvent_Shared::GetTouchListByType(
+    PP_TouchListType list) {
+  switch (list) {
+    case PP_TOUCHLIST_TYPE_TOUCHES:
+      return &data_.touches;
+    case PP_TOUCHLIST_TYPE_CHANGEDTOUCHES:
+      return &data_.changed_touches;
+    case PP_TOUCHLIST_TYPE_TARGETTOUCHES:
+      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 nullptr;
+  }
+}
+
+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<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();
-  }
-  if (index >= points->size()) {
+  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();
+  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);
   }
-  for (size_t i = 0; i < points->size(); i++) {
-    if (points->at(i).id == id)
-      return points->at(i);
-  }
-  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
 PP_Resource PPB_InputEvent_Shared::CreateIMEInputEvent(
     ResourceObjectType type,
     PP_Instance instance,
     PP_InputEvent_Type event_type,
     PP_TimeTicks time_stamp,
     struct PP_Var text,
     uint32_t segment_number,
@@ skipping 128 matching lines @@
     return 0;
 
   InputEventData data;
   data.event_type = event_type;
   data.event_time_stamp = time_stamp;
   data.event_modifiers = modifiers;
   return (new PPB_InputEvent_Shared(type, instance, data))->GetReference();
 }
 
 }  // namespace ppapi