Completed webkit radiusX, radiusY and rotationAngle handling.

ui/events/gestures/motion_event_aura.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.
 
+// MSVC++ requires this to be set before any other includes to get M_PI.
+#define _USE_MATH_DEFINES
+
 #include "ui/events/gestures/motion_event_aura.h"
 
+#include <cmath>
+
 #include "base/logging.h"
 #include "ui/events/gestures/gesture_configuration.h"
 
 namespace ui {
 
 MotionEventAura::MotionEventAura()
     : pointer_count_(0), cached_action_index_(-1) {
 }
 
 MotionEventAura::MotionEventAura(
@@ skipping 17 matching lines @@
     const TouchEvent& touch) {
   PointData point_data;
   point_data.x = touch.x();
   point_data.y = touch.y();
   point_data.raw_x = touch.root_location_f().x();
   point_data.raw_y = touch.root_location_f().y();
   point_data.touch_id = touch.touch_id();
   point_data.pressure = touch.force();
   point_data.source_device_id = touch.source_device_id();
 
-  // TODO(tdresser): at some point we should start using both radii if they are
-  // available, but for now we use the max.
-  point_data.major_radius = std::max(touch.radius_x(), touch.radius_y());
-  if (!point_data.major_radius)
+  float radius_x = touch.radius_x();
+  float radius_y = touch.radius_y();
+  float rotation_angle_rad = touch.rotation_angle() * M_PI / 180.f;
+  DCHECK_GE(radius_x, 0) << "Unexpected x-radius < 0";
+  DCHECK_GE(radius_y, 0) << "Unexpected y-radius < 0";
+  DCHECK(0 <= rotation_angle_rad && rotation_angle_rad <= M_PI_2)
+      << "Unexpected touch rotation angle";
+
+  if (radius_x >= radius_y) {
+    point_data.major_radius = radius_x;
+    point_data.minor_radius = radius_y;
+    point_data.orientation = rotation_angle_rad;
+  } else {
+    point_data.major_radius = radius_y;
+    point_data.minor_radius = radius_x;
+    point_data.orientation = rotation_angle_rad - M_PI_2;
+  }
+
+  if (!point_data.major_radius) {
     point_data.major_radius = GestureConfiguration::default_radius();
+    point_data.minor_radius = GestureConfiguration::default_radius();
+    point_data.orientation = 0;
+  }
+
   return point_data;
 }
 
 void MotionEventAura::OnTouch(const TouchEvent& touch) {
   switch (touch.type()) {
     case ET_TOUCH_PRESSED:
       AddTouch(touch);
       break;
     case ET_TOUCH_RELEASED:
     case ET_TOUCH_CANCELLED:
@@ skipping 52 matching lines @@
   return active_touches_[pointer_index].raw_x;
 }
 
 float MotionEventAura::GetRawY(size_t pointer_index) const {
   DCHECK_LT(pointer_index, pointer_count_);
   return active_touches_[pointer_index].raw_y;
 }
 
 float MotionEventAura::GetTouchMajor(size_t pointer_index) const {
   DCHECK_LT(pointer_index, pointer_count_);
-  return active_touches_[pointer_index].major_radius * 2;
+  return active_touches_[pointer_index].major_radius * 2.f;
+}
+
+float MotionEventAura::GetTouchMinor(size_t pointer_index) const {
+  DCHECK_LE(pointer_index, pointer_count_);
+  return active_touches_[pointer_index].minor_radius * 2.f;
+}
+
+float MotionEventAura::GetOrientation(size_t pointer_index) const {
+  DCHECK_LE(pointer_index, pointer_count_);
+  return active_touches_[pointer_index].orientation;
 }
 
 float MotionEventAura::GetPressure(size_t pointer_index) const {
   DCHECK_LT(pointer_index, pointer_count_);
   return active_touches_[pointer_index].pressure;
 }
 
 MotionEvent::ToolType MotionEventAura::GetToolType(size_t pointer_index) const {
   // TODO(jdduke): Plumb tool type from the platform, crbug.com/404128.
   DCHECK_LT(pointer_index, pointer_count_);
@@ skipping 33 matching lines @@
 }
 
 MotionEventAura::PointData::PointData()
     : x(0),
       y(0),
       raw_x(0),
       raw_y(0),
       touch_id(0),
       pressure(0),
       source_device_id(0),
-      major_radius(0) {
+      major_radius(0),
+      minor_radius(0),
+      orientation(0) {
 }
 
 int MotionEventAura::GetSourceDeviceId(size_t pointer_index) const {
   DCHECK_LT(pointer_index, pointer_count_);
   return active_touches_[pointer_index].source_device_id;
 }
 
 void MotionEventAura::AddTouch(const TouchEvent& touch) {
   if (pointer_count_ == MotionEvent::MAX_TOUCH_POINT_COUNT)
     return;
@@ skipping 45 matching lines @@
 size_t MotionEventAura::GetIndexFromId(int id) const {
   for (size_t i = 0; i < pointer_count_; ++i) {
     if (active_touches_[i].touch_id == id)
       return i;
   }
   NOTREACHED();
   return 0;
 }
 
 }  // namespace ui