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

ui/events/event_unittest.cc

 // Copyright (c) 2012 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 "base/memory/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/keycodes/dom3/dom_code.h"
 #include "ui/events/keycodes/dom4/keycode_converter.h"
@@ skipping 487 matching lines @@
 }
 #endif  // USE_X11 || OS_WIN
 
 TEST(EventTest, TouchEventRadiusDefaultsToOtherAxis) {
   const base::TimeDelta time = base::TimeDelta::FromMilliseconds(0);
   const float non_zero_length1 = 30;
   const float non_zero_length2 = 46;
 
   TouchEvent event1(ui::ET_TOUCH_PRESSED, gfx::Point(0, 0), 0, 0, time,
                     non_zero_length1, 0, 0, 0);
-  DCHECK_EQ(non_zero_length1, event1.radius_x());
-  DCHECK_EQ(non_zero_length1, event1.radius_y());
+  EXPECT_EQ(non_zero_length1, event1.radius_x());
+  EXPECT_EQ(non_zero_length1, event1.radius_y());
 
   TouchEvent event2(ui::ET_TOUCH_PRESSED, gfx::Point(0, 0), 0, 0, time,
                     0, non_zero_length2, 0, 0);
-  DCHECK_EQ(non_zero_length2, event2.radius_x());
-  DCHECK_EQ(non_zero_length2, event2.radius_y());
+  EXPECT_EQ(non_zero_length2, event2.radius_x());
+  EXPECT_EQ(non_zero_length2, event2.radius_y());
+}
+
+TEST(EventTest, TouchEventRotationAngleFixing) {

[tdresser, 2015/01/20 16:40:38]

Awesome, thanks.

+  const base::TimeDelta time = base::TimeDelta::FromMilliseconds(0);
+  const float radius_x = 20;
+  const float radius_y = 10;
+
+  {
+    const float angle_in_range = 0;
+    TouchEvent event(ui::ET_TOUCH_PRESSED, gfx::Point(0, 0), 0, 0, time,
+                      radius_x, radius_y, angle_in_range, 0);
+    EXPECT_FLOAT_EQ(angle_in_range, event.rotation_angle());
+  }
+
+  {
+    const float angle_in_range = 179.9;
+    TouchEvent event(ui::ET_TOUCH_PRESSED, gfx::Point(0, 0), 0, 0, time,
+                    radius_x, radius_y, angle_in_range, 0);
+    EXPECT_FLOAT_EQ(angle_in_range, event.rotation_angle());
+  }
+
+  {
+    const float angle_negative = -0.1;
+    TouchEvent event(ui::ET_TOUCH_PRESSED, gfx::Point(0, 0), 0, 0, time,
+                    radius_x, radius_y, angle_negative, 0);
+    EXPECT_FLOAT_EQ(180 - 0.1, event.rotation_angle());
+  }
+
+  {
+    const float angle_negative = -200;
+    TouchEvent event(ui::ET_TOUCH_PRESSED, gfx::Point(0, 0), 0, 0, time,
+                    radius_x, radius_y, angle_negative, 0);
+    EXPECT_FLOAT_EQ(360 - 200, event.rotation_angle());
+  }
+
+  {
+    const float angle_too_big = 180;
+    TouchEvent event(ui::ET_TOUCH_PRESSED, gfx::Point(0, 0), 0, 0, time,
+                    radius_x, radius_y, angle_too_big, 0);
+    EXPECT_FLOAT_EQ(0, event.rotation_angle());
+  }
+
+  {
+    const float angle_too_big = 400;
+    TouchEvent event(ui::ET_TOUCH_PRESSED, gfx::Point(0, 0), 0, 0, time,
+                    radius_x, radius_y, angle_too_big, 0);
+    EXPECT_FLOAT_EQ(40, event.rotation_angle());
+  }
 }
 
 }  // namespace ui