Index: ui/events/gesture_detection/motion_event_generic.cc |
diff --git a/ui/events/gesture_detection/motion_event_generic.cc b/ui/events/gesture_detection/motion_event_generic.cc |
index 2f2c34b11c5688bcf1c1cc3922e9f14198322ea1..51a099d46f101b691a827e92d9b8e1fcf9ff0e4c 100644 |
--- a/ui/events/gesture_detection/motion_event_generic.cc |
+++ b/ui/events/gesture_detection/motion_event_generic.cc |
@@ -24,6 +24,10 @@ PointerProperties::PointerProperties(float x, float y, float touch_major) |
touch_major(touch_major), |
touch_minor(0), |
orientation(0), |
+ tilt(0), |
+ tilt_orientation(0), |
+ tilt_x(0), |
+ tilt_y(0), |
source_device_id(0) { |
} |
@@ -39,6 +43,10 @@ PointerProperties::PointerProperties(const MotionEvent& event, |
touch_major(event.GetTouchMajor(pointer_index)), |
touch_minor(event.GetTouchMinor(pointer_index)), |
orientation(event.GetOrientation(pointer_index)), |
+ tilt(event.GetTilt(pointer_index)), |
+ tilt_orientation(event.GetTiltOrientation(pointer_index)), |
+ tilt_x(event.GetTiltX(pointer_index)), |
+ tilt_y(event.GetTiltY(pointer_index)), |
source_device_id(0) { |
} |
@@ -134,6 +142,26 @@ float MotionEventGeneric::GetPressure(size_t pointer_index) const { |
return pointers_[pointer_index].pressure; |
} |
+float MotionEventGeneric::GetTilt(size_t pointer_index) const { |
+ DCHECK_LT(pointer_index, pointers_->size()); |
+ return pointers_[pointer_index].tilt; |
+} |
+ |
+float MotionEventGeneric::GetTiltOrientation(size_t pointer_index) const { |
+ DCHECK_LT(pointer_index, pointers_->size()); |
+ return pointers_[pointer_index].tilt_orientation; |
+} |
+ |
+float MotionEventGeneric::GetTiltX(size_t pointer_index) const { |
+ DCHECK_LT(pointer_index, pointers_->size()); |
+ return pointers_[pointer_index].tilt_x; |
+} |
+ |
+float MotionEventGeneric::GetTiltY(size_t pointer_index) const { |
+ DCHECK_LT(pointer_index, pointers_->size()); |
+ return pointers_[pointer_index].tilt_y; |
+} |
+ |
MotionEvent::ToolType MotionEventGeneric::GetToolType( |
size_t pointer_index) const { |
DCHECK_LT(pointer_index, pointers_->size()); |