Separate motion event touch geometry orientation from stylus orientation.

ui/events/gesture_detection/motion_event_generic.cc

 // Copyright 2014 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 "ui/events/gesture_detection/motion_event_generic.h"
 
 #include "base/logging.h"
 #include "ui/events/base_event_utils.h"
 
 namespace ui {
 
 PointerProperties::PointerProperties()
     : PointerProperties(0, 0, 0) {
 }
 
 PointerProperties::PointerProperties(float x, float y, float touch_major)
     : id(0),
       tool_type(MotionEvent::TOOL_TYPE_UNKNOWN),
       x(x),
       y(y),
       raw_x(x),
       raw_y(y),
       pressure(0),
       touch_major(touch_major),
       touch_minor(0),
-      orientation(0),
+      touch_orientation(0),
       source_device_id(0) {
 }
 
 PointerProperties::PointerProperties(const MotionEvent& event,
                                      size_t pointer_index)
     : id(event.GetPointerId(pointer_index)),
       tool_type(event.GetToolType(pointer_index)),
       x(event.GetX(pointer_index)),
       y(event.GetY(pointer_index)),
       raw_x(event.GetRawX(pointer_index)),
       raw_y(event.GetRawY(pointer_index)),
       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) {
 }
 
 MotionEventGeneric::MotionEventGeneric(Action action,
                                        base::TimeTicks event_time,
                                        const PointerProperties& pointer)
     : action_(action),
       event_time_(event_time),
       unique_event_id_(ui::GetNextTouchEventId()),
       action_index_(0),
@@ skipping 65 matching lines @@
 float MotionEventGeneric::GetTouchMajor(size_t pointer_index) const {
   DCHECK_LT(pointer_index, pointers_->size());
   return pointers_[pointer_index].touch_major;
 }
 
 float MotionEventGeneric::GetTouchMinor(size_t pointer_index) const {
   DCHECK_LT(pointer_index, pointers_->size());
   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 {
   DCHECK_LT(pointer_index, pointers_->size());
   return pointers_[pointer_index].pressure;
 }
 
 MotionEvent::ToolType MotionEventGeneric::GetToolType(
     size_t pointer_index) const {
   DCHECK_LT(pointer_index, pointers_->size());
@@ skipping 134 matching lines @@
     PushHistoricalEvent(other.historical_events_[h]->Clone());
   return *this;
 }
 
 void MotionEventGeneric::PopPointer() {
   DCHECK_GT(pointers_->size(), 0U);
   pointers_->pop_back();
 }
 
 }  // namespace ui