Index: ui/events/gesture_detection/motion_event_buffer.cc |
diff --git a/ui/events/gesture_detection/motion_event_buffer.cc b/ui/events/gesture_detection/motion_event_buffer.cc |
index 4fbdc4ea529d5b28d04c52ffeb97d7709ac5b3dc..faad9006489822289a77bc81a3dc731fb61c5d8d 100644 |
--- a/ui/events/gesture_detection/motion_event_buffer.cc |
+++ b/ui/events/gesture_detection/motion_event_buffer.cc |
@@ -97,6 +97,8 @@ PointerProperties PointerFromMotionEvent(const MotionEvent& event, |
result.raw_y = event.GetRawY(pointer_index); |
result.pressure = event.GetPressure(pointer_index); |
result.touch_major = event.GetTouchMajor(pointer_index); |
+ result.touch_minor = event.GetTouchMinor(pointer_index); |
+ result.orientation = event.GetOrientation(pointer_index); |
return result; |
} |
@@ -199,6 +201,12 @@ class CompoundMotionEvent : public ui::MotionEvent { |
virtual float GetTouchMajor(size_t pointer_index) const OVERRIDE { |
return latest().GetTouchMajor(pointer_index); |
} |
+ virtual float GetTouchMinor(size_t pointer_index) const OVERRIDE { |
+ return latest().GetTouchMinor(pointer_index); |
+ } |
+ virtual float GetOrientation(size_t pointer_index) const OVERRIDE { |
+ return latest().GetOrientation(pointer_index); |
+ } |
virtual float GetPressure(size_t pointer_index) const OVERRIDE { |
return latest().GetPressure(pointer_index); |
} |
@@ -223,6 +231,18 @@ class CompoundMotionEvent : public ui::MotionEvent { |
DCHECK_LT(historical_index, GetHistorySize()); |
return events_[historical_index]->GetTouchMajor(); |
} |
+ virtual float GetHistoricalTouchMinor( |
+ size_t pointer_index, |
+ size_t historical_index) const OVERRIDE { |
+ DCHECK_LT(historical_index, GetHistorySize()); |
+ return events_[historical_index]->GetTouchMinor(); |
+ } |
+ virtual float GetHistoricalOrientation( |
+ size_t pointer_index, |
+ size_t historical_index) const OVERRIDE { |
+ DCHECK_LT(historical_index, GetHistorySize()); |
+ return events_[historical_index]->GetOrientation(); |
+ } |
virtual float GetHistoricalX(size_t pointer_index, |
size_t historical_index) const OVERRIDE { |
DCHECK_LT(historical_index, GetHistorySize()); |