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 19262aa6e95dcc411beab127d95fd1d069bbd84a..f99e306738ce6dedb0cbcce417fc2d30ed1cd737 100644 |
--- a/ui/events/gesture_detection/motion_event_generic.cc |
+++ b/ui/events/gesture_detection/motion_event_generic.cc |
@@ -23,7 +23,7 @@ PointerProperties::PointerProperties(float x, float y, float touch_major) |
pressure(0), |
touch_major(touch_major), |
touch_minor(0), |
- orientation(0), |
+ touch_orientation(0), |
source_device_id(0) { |
} |
@@ -38,7 +38,7 @@ PointerProperties::PointerProperties(const MotionEvent& event, |
pressure(event.GetPressure(pointer_index)), |
touch_major(event.GetTouchMajor(pointer_index)), |
touch_minor(event.GetTouchMinor(pointer_index)), |
- orientation(event.GetOrientation(pointer_index)), |
+ touch_orientation(event.GetTouchOrientation(pointer_index)), |
source_device_id(0) { |
} |
@@ -124,9 +124,9 @@ float MotionEventGeneric::GetTouchMinor(size_t pointer_index) const { |
return pointers_[pointer_index].touch_minor; |
} |
-float MotionEventGeneric::GetOrientation(size_t pointer_index) const { |
+float MotionEventGeneric::GetTouchOrientation(size_t pointer_index) const { |
DCHECK_LT(pointer_index, pointers_->size()); |
- return pointers_[pointer_index].orientation; |
+ return pointers_[pointer_index].touch_orientation; |
} |
float MotionEventGeneric::GetPressure(size_t pointer_index) const { |