Fixed ui::TouchEvent rotation angle out-of-bound issue.

ui/events/gestures/motion_event_aura_unittest.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 <cmath>
 
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 189 matching lines @@
   EXPECT_TRUE(event.OnTouch(press1));
 
   EXPECT_EQ(2U, event.GetPointerCount());
   EXPECT_FLOAT_EQ(x, event.GetX(1));
   EXPECT_FLOAT_EQ(y, event.GetY(1));
   EXPECT_FLOAT_EQ(raw_x, event.GetRawX(1));
   EXPECT_FLOAT_EQ(raw_y, event.GetRawY(1));
 
   // Test cloning of pointer location information.
   scoped_ptr<MotionEvent> clone = event.Clone();
-  {
-    EXPECT_EQ(test::ToString(event), test::ToString(*clone));
-    EXPECT_EQ(2U, clone->GetPointerCount());
-    EXPECT_FLOAT_EQ(x, clone->GetX(1));
-    EXPECT_FLOAT_EQ(y, clone->GetY(1));
-    EXPECT_FLOAT_EQ(raw_x, clone->GetRawX(1));
-    EXPECT_FLOAT_EQ(raw_y, clone->GetRawY(1));
-  }
+  EXPECT_EQ(test::ToString(event), test::ToString(*clone));
+  EXPECT_EQ(2U, clone->GetPointerCount());
+  EXPECT_FLOAT_EQ(x, clone->GetX(1));
+  EXPECT_FLOAT_EQ(y, clone->GetY(1));
+  EXPECT_FLOAT_EQ(raw_x, clone->GetRawX(1));
+  EXPECT_FLOAT_EQ(raw_y, clone->GetRawY(1));
 
   x = 27.9f;
   y = 22.3f;
   raw_x = x + kRawOffsetX;
   raw_y = y + kRawOffsetY;
   TouchEvent move1 =
       TouchWithPosition(ET_TOUCH_MOVED, ids[1], x, y, raw_x, raw_y);
   EXPECT_TRUE(event.OnTouch(move1));
 
   EXPECT_FLOAT_EQ(x, event.GetX(1));
@@ skipping 12 matching lines @@
   EXPECT_FLOAT_EQ(x, event.GetX(0));
   EXPECT_FLOAT_EQ(y, event.GetY(0));
   EXPECT_FLOAT_EQ(raw_x, event.GetRawX(0));
   EXPECT_FLOAT_EQ(raw_y, event.GetRawY(0));
 }
 
 TEST(MotionEventAuraTest, TapParams) {
   // Test that touch params are stored correctly.
   MotionEventAura event;
 
-  int ids[] = {15, 13};
+  int ids[] = {15, 13, 25, 23};
 
   float radius_x;
   float radius_y;
   float rotation_angle;
   float pressure;
 
+  // Test case: radius_x > radius_y, rotation_angle < 90
   radius_x = 123.45f;
   radius_y = 67.89f;
   rotation_angle = 23.f;
   pressure = 0.123f;
   TouchEvent press0 = TouchWithTapParams(
       ET_TOUCH_PRESSED, ids[0], radius_x, radius_y, rotation_angle, pressure);
   EXPECT_TRUE(event.OnTouch(press0));
 
   EXPECT_EQ(1U, event.GetPointerCount());
   EXPECT_FLOAT_EQ(radius_x, event.GetTouchMajor(0) / 2);
   EXPECT_FLOAT_EQ(radius_y, event.GetTouchMinor(0) / 2);
   EXPECT_FLOAT_EQ(rotation_angle, event.GetOrientation(0) * 180 / M_PI + 90);
   EXPECT_FLOAT_EQ(pressure, event.GetPressure(0));
 
+  // Test case: radius_x < radius_y, rotation_angle < 90
   radius_x = 67.89f;
   radius_y = 123.45f;
   rotation_angle = 46.f;
   pressure = 0.456f;
   TouchEvent press1 = TouchWithTapParams(
       ET_TOUCH_PRESSED, ids[1], radius_x, radius_y, rotation_angle, pressure);
   EXPECT_TRUE(event.OnTouch(press1));
 
   EXPECT_EQ(2U, event.GetPointerCount());
   EXPECT_FLOAT_EQ(radius_y, event.GetTouchMajor(1) / 2);
   EXPECT_FLOAT_EQ(radius_x, event.GetTouchMinor(1) / 2);
   EXPECT_FLOAT_EQ(rotation_angle, event.GetOrientation(1) * 180 / M_PI);
   EXPECT_FLOAT_EQ(pressure, event.GetPressure(1));
 
   // Test cloning of tap params
+  // TODO(mustaq): Make a separate clone test
   scoped_ptr<MotionEvent> clone = event.Clone();
-  {
-    EXPECT_EQ(test::ToString(event), test::ToString(*clone));
-    EXPECT_EQ(2U, clone->GetPointerCount());
-    EXPECT_FLOAT_EQ(radius_y, clone->GetTouchMajor(1) / 2);
-    EXPECT_FLOAT_EQ(radius_x, clone->GetTouchMinor(1) / 2);
-    EXPECT_FLOAT_EQ(rotation_angle, clone->GetOrientation(1) * 180 / M_PI);
-    EXPECT_FLOAT_EQ(pressure, clone->GetPressure(1));
-  }
+  EXPECT_EQ(test::ToString(event), test::ToString(*clone));
+  EXPECT_EQ(2U, clone->GetPointerCount());
+  EXPECT_FLOAT_EQ(radius_y, clone->GetTouchMajor(1) / 2);
+  EXPECT_FLOAT_EQ(radius_x, clone->GetTouchMinor(1) / 2);
+  EXPECT_FLOAT_EQ(rotation_angle, clone->GetOrientation(1) * 180 / M_PI);
+  EXPECT_FLOAT_EQ(pressure, clone->GetPressure(1));
 
+  // TODO(mustaq): The move test seems out-of-scope here, should be isolated
   radius_x = 76.98f;
   radius_y = 321.54f;
   rotation_angle = 64.f;
   pressure = 0.654f;
   TouchEvent move1 = TouchWithTapParams(
       ET_TOUCH_MOVED, ids[1], radius_x, radius_y, rotation_angle, pressure);
   move1.set_location(gfx::Point(20, 21));
   EXPECT_TRUE(event.OnTouch(move1));
 
   EXPECT_EQ(2U, event.GetPointerCount());
   EXPECT_FLOAT_EQ(radius_y, event.GetTouchMajor(1) / 2);
   EXPECT_FLOAT_EQ(radius_x, event.GetTouchMinor(1) / 2);
   EXPECT_FLOAT_EQ(rotation_angle, event.GetOrientation(1) * 180 / M_PI);
   EXPECT_FLOAT_EQ(pressure, event.GetPressure(1));
+
+  // Test case: radius_x > radius_y, rotation_angle > 90
+  radius_x = 123.45f;
+  radius_y = 67.89f;
+  rotation_angle = 92.f;
+  pressure = 0.789f;
+  TouchEvent press2 = TouchWithTapParams(
+      ET_TOUCH_PRESSED, ids[2], radius_x, radius_y, rotation_angle, pressure);
+  EXPECT_TRUE(event.OnTouch(press2));
+
+  EXPECT_EQ(3U, event.GetPointerCount());
+  EXPECT_FLOAT_EQ(radius_x, event.GetTouchMajor(2) / 2);
+  EXPECT_FLOAT_EQ(radius_y, event.GetTouchMinor(2) / 2);
+  EXPECT_FLOAT_EQ(rotation_angle, event.GetOrientation(2) * 180 / M_PI + 90);
+  EXPECT_FLOAT_EQ(pressure, event.GetPressure(2));
+
+  // Test case: radius_x < radius_y, rotation_angle > 90
+  radius_x = 67.89f;
+  radius_y = 123.45f;
+  rotation_angle = 135.f;
+  pressure = 0.012f;
+  TouchEvent press3 = TouchWithTapParams(
+      ET_TOUCH_PRESSED, ids[3], radius_x, radius_y, rotation_angle, pressure);
+  EXPECT_TRUE(event.OnTouch(press3));
+
+  EXPECT_EQ(4U, event.GetPointerCount());
+  EXPECT_FLOAT_EQ(radius_y, event.GetTouchMajor(3) / 2);
+  EXPECT_FLOAT_EQ(radius_x, event.GetTouchMinor(3) / 2);
+  EXPECT_FLOAT_EQ(rotation_angle, event.GetOrientation(3) * 180 / M_PI + 180);
+  EXPECT_FLOAT_EQ(pressure, event.GetPressure(3));
 }
 
 TEST(MotionEventAuraTest, Timestamps) {
   // Test that timestamp information is stored and converted correctly.
   MotionEventAura event;
   int ids[] = {7, 13};
   int times_in_ms[] = {59436, 60263, 82175};
 
   TouchEvent press0 = TouchWithTime(
       ui::ET_TOUCH_PRESSED, ids[0], times_in_ms[0]);
@@ skipping 124 matching lines @@
   EXPECT_TRUE(event.OnTouch(TouchWithType(ET_TOUCH_PRESSED, id)));
   TouchEvent move0 = TouchWithPosition(ET_TOUCH_PRESSED, id, 10, 20, 10, 20);
   EXPECT_TRUE(event.OnTouch(move0));
 
   TouchEvent move1 = TouchWithPosition(ET_TOUCH_MOVED, id, 11, 21, 11, 21);
   EXPECT_TRUE(event.OnTouch(move1));
   EXPECT_FALSE(event.OnTouch(move1));
 }
 
 }  // namespace ui