Sync ui/events to chromium @ https://codereview.chromium.org/1210203002

ui/events/event_unittest.cc

Index: ui/events/event_unittest.cc
diff --git a/ui/events/event_unittest.cc b/ui/events/event_unittest.cc
index c766b95ee2f0463fcab9df182319c5d1fda14935..38ad283b5a9b6923cea437c51502563f772e6b92 100644
--- a/ui/events/event_unittest.cc
+++ b/ui/events/event_unittest.cc
@@ -6,7 +6,8 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
-#include "ui/events/keycodes/dom4/keycode_converter.h"
+#include "ui/events/keycodes/dom/dom_code.h"
+#include "ui/events/keycodes/dom/keycode_converter.h"
 #include "ui/events/test/events_test_utils.h"
 
 #if defined(USE_X11)
@@ -17,6 +18,24 @@
 
 namespace ui {
 
+TEST(EventTest, NoNativeEvent) {
+  KeyEvent keyev(ET_KEY_PRESSED, VKEY_SPACE, EF_NONE);
+  EXPECT_FALSE(keyev.HasNativeEvent());
+}
+
+TEST(EventTest, NativeEvent) {
+#if defined(OS_WIN)
+  MSG native_event = { NULL, WM_KEYUP, VKEY_A, 0 };
+  KeyEvent keyev(native_event);
+  EXPECT_TRUE(keyev.HasNativeEvent());
+#elif defined(USE_X11)
+  ScopedXI2Event event;
+  event.InitKeyEvent(ET_KEY_RELEASED, VKEY_A, EF_NONE);
+  KeyEvent keyev(event);
+  EXPECT_TRUE(keyev.HasNativeEvent());
+#endif
+}
+
 TEST(EventTest, GetCharacter) {
   // Check if Control+Enter returns 10.
   KeyEvent keyev1(ET_KEY_PRESSED, VKEY_RETURN, EF_CONTROL_DOWN);
@@ -24,11 +43,23 @@ TEST(EventTest, GetCharacter) {
   // Check if Enter returns 13.
   KeyEvent keyev2(ET_KEY_PRESSED, VKEY_RETURN, EF_NONE);
   EXPECT_EQ(13, keyev2.GetCharacter());
+
+#if defined(USE_X11)
+  // For X11, test the functions with native_event() as well. crbug.com/107837
+  ScopedXI2Event event;
+  event.InitKeyEvent(ET_KEY_PRESSED, VKEY_RETURN, EF_CONTROL_DOWN);
+  KeyEvent keyev3(event);
+  EXPECT_EQ(10, keyev3.GetCharacter());
+
+  event.InitKeyEvent(ET_KEY_PRESSED, VKEY_RETURN, EF_NONE);
+  KeyEvent keyev4(event);
+  EXPECT_EQ(13, keyev4.GetCharacter());
+#endif
 }
 
 TEST(EventTest, ClickCount) {
   const gfx::Point origin(0, 0);
-  MouseEvent mouseev(ET_MOUSE_PRESSED, origin, origin, 0, 0);
+  MouseEvent mouseev(ET_MOUSE_PRESSED, origin, origin, EventTimeForNow(), 0, 0);
   for (int i = 1; i <=3 ; ++i) {
     mouseev.SetClickCount(i);
     EXPECT_EQ(i, mouseev.GetClickCount());
@@ -37,8 +68,10 @@ TEST(EventTest, ClickCount) {
 
 TEST(EventTest, RepeatedClick) {
   const gfx::Point origin(0, 0);
-  MouseEvent mouse_ev1(ET_MOUSE_PRESSED, origin, origin, 0, 0);
-  MouseEvent mouse_ev2(ET_MOUSE_PRESSED, origin, origin, 0, 0);
+  MouseEvent mouse_ev1(ET_MOUSE_PRESSED, origin, origin, EventTimeForNow(), 0,
+                       0);
+  MouseEvent mouse_ev2(ET_MOUSE_PRESSED, origin, origin, EventTimeForNow(), 0,
+                       0);
   LocatedEventTestApi test_ev1(&mouse_ev1);
   LocatedEventTestApi test_ev2(&mouse_ev2);
 
@@ -46,6 +79,15 @@ TEST(EventTest, RepeatedClick) {
   base::TimeDelta soon = start + base::TimeDelta::FromMilliseconds(1);
   base::TimeDelta later = start + base::TimeDelta::FromMilliseconds(1000);
 
+  // Same event.
+  test_ev1.set_location(gfx::Point(0, 0));
+  test_ev2.set_location(gfx::Point(1, 0));
+  test_ev1.set_time_stamp(start);
+  test_ev2.set_time_stamp(start);
+  EXPECT_FALSE(MouseEvent::IsRepeatedClickEvent(mouse_ev1, mouse_ev2));
+  MouseEvent mouse_ev3(mouse_ev1);
+  EXPECT_FALSE(MouseEvent::IsRepeatedClickEvent(mouse_ev1, mouse_ev3));
+
   // Close point.
   test_ev1.set_location(gfx::Point(0, 0));
   test_ev2.set_location(gfx::Point(1, 0));
@@ -68,6 +110,73 @@ TEST(EventTest, RepeatedClick) {
   EXPECT_FALSE(MouseEvent::IsRepeatedClickEvent(mouse_ev1, mouse_ev2));
 }
 
+// Tests that an event only increases the click count and gets marked as a
+// double click if a release event was seen for the previous click. This
+// prevents the same PRESSED event from being processed twice:
+// http://crbug.com/389162
+TEST(EventTest, DoubleClickRequiresRelease) {
+  const gfx::Point origin1(0, 0);
+  const gfx::Point origin2(100, 0);
+  scoped_ptr<MouseEvent> ev;
+  base::TimeDelta start = base::TimeDelta::FromMilliseconds(0);
+  base::TimeDelta soon = start + base::TimeDelta::FromMilliseconds(1);
+
+  ev.reset(new MouseEvent(ET_MOUSE_PRESSED, origin1, origin1, EventTimeForNow(),
+                          0, 0));
+  ev->set_time_stamp(start);
+  EXPECT_EQ(1, MouseEvent::GetRepeatCount(*ev));
+  ev.reset(new MouseEvent(ET_MOUSE_PRESSED, origin1, origin1, EventTimeForNow(),
+                          0, 0));
+  ev->set_time_stamp(start);
+  EXPECT_EQ(1, MouseEvent::GetRepeatCount(*ev));
+
+  ev.reset(new MouseEvent(ET_MOUSE_PRESSED, origin2, origin2, EventTimeForNow(),
+                          0, 0));
+  ev->set_time_stamp(start);
+  EXPECT_EQ(1, MouseEvent::GetRepeatCount(*ev));
+  ev.reset(new MouseEvent(ET_MOUSE_RELEASED, origin2, origin2,
+                          EventTimeForNow(), 0, 0));
+  ev->set_time_stamp(start);
+  EXPECT_EQ(1, MouseEvent::GetRepeatCount(*ev));
+  ev.reset(new MouseEvent(ET_MOUSE_PRESSED, origin2, origin2, EventTimeForNow(),
+                          0, 0));
+  ev->set_time_stamp(soon);
+  EXPECT_EQ(2, MouseEvent::GetRepeatCount(*ev));
+  ev.reset(new MouseEvent(ET_MOUSE_RELEASED, origin2, origin2,
+                          EventTimeForNow(), 0, 0));
+  ev->set_time_stamp(soon);
+  EXPECT_EQ(2, MouseEvent::GetRepeatCount(*ev));
+  MouseEvent::ResetLastClickForTest();
+}
+
+// Tests that clicking right and then left clicking does not generate a double
+// click.
+TEST(EventTest, SingleClickRightLeft) {
+  const gfx::Point origin(0, 0);
+  scoped_ptr<MouseEvent> ev;
+  base::TimeDelta start = base::TimeDelta::FromMilliseconds(0);
+  base::TimeDelta soon = start + base::TimeDelta::FromMilliseconds(1);
+
+  ev.reset(new MouseEvent(ET_MOUSE_PRESSED, origin, origin, EventTimeForNow(),
+                          ui::EF_RIGHT_MOUSE_BUTTON,
+                          ui::EF_RIGHT_MOUSE_BUTTON));
+  ev->set_time_stamp(start);
+  EXPECT_EQ(1, MouseEvent::GetRepeatCount(*ev));
+  ev.reset(new MouseEvent(ET_MOUSE_PRESSED, origin, origin, EventTimeForNow(),
+                          ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
+  ev->set_time_stamp(start);
+  EXPECT_EQ(1, MouseEvent::GetRepeatCount(*ev));
+  ev.reset(new MouseEvent(ET_MOUSE_RELEASED, origin, origin, EventTimeForNow(),
+                          ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
+  ev->set_time_stamp(start);
+  EXPECT_EQ(1, MouseEvent::GetRepeatCount(*ev));
+  ev.reset(new MouseEvent(ET_MOUSE_PRESSED, origin, origin, EventTimeForNow(),
+                          ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
+  ev->set_time_stamp(soon);
+  EXPECT_EQ(2, MouseEvent::GetRepeatCount(*ev));
+  MouseEvent::ResetLastClickForTest();
+}
+
 TEST(EventTest, KeyEvent) {
   static const struct {
     KeyboardCode key_code;
@@ -160,6 +269,41 @@ TEST(EventTest, KeyEventDirectUnicode) {
 }
 
 TEST(EventTest, NormalizeKeyEventFlags) {
+#if defined(USE_X11)
+  // Normalize flags when KeyEvent is created from XEvent.
+  ScopedXI2Event event;
+  {
+    event.InitKeyEvent(ET_KEY_PRESSED, VKEY_SHIFT, EF_SHIFT_DOWN);
+    KeyEvent keyev(event);
+    EXPECT_EQ(EF_SHIFT_DOWN, keyev.flags());
+  }
+  {
+    event.InitKeyEvent(ET_KEY_RELEASED, VKEY_SHIFT, EF_SHIFT_DOWN);
+    KeyEvent keyev(event);
+    EXPECT_EQ(EF_NONE, keyev.flags());
+  }
+  {
+    event.InitKeyEvent(ET_KEY_PRESSED, VKEY_CONTROL, EF_CONTROL_DOWN);
+    KeyEvent keyev(event);
+    EXPECT_EQ(EF_CONTROL_DOWN, keyev.flags());
+  }
+  {
+    event.InitKeyEvent(ET_KEY_RELEASED, VKEY_CONTROL, EF_CONTROL_DOWN);
+    KeyEvent keyev(event);
+    EXPECT_EQ(EF_NONE, keyev.flags());
+  }
+  {
+    event.InitKeyEvent(ET_KEY_PRESSED, VKEY_MENU,  EF_ALT_DOWN);
+    KeyEvent keyev(event);
+    EXPECT_EQ(EF_ALT_DOWN, keyev.flags());
+  }
+  {
+    event.InitKeyEvent(ET_KEY_RELEASED, VKEY_MENU, EF_ALT_DOWN);
+    KeyEvent keyev(event);
+    EXPECT_EQ(EF_NONE, keyev.flags());
+  }
+#endif
+
   // Do not normalize flags for synthesized events without
   // KeyEvent::NormalizeFlags called explicitly.
   {
@@ -202,27 +346,263 @@ TEST(EventTest, KeyEventCopy) {
 }
 
 TEST(EventTest, KeyEventCode) {
+  const DomCode kDomCodeForSpace = DomCode::SPACE;
   const char kCodeForSpace[] = "Space";
+  ASSERT_EQ(kDomCodeForSpace,
+            ui::KeycodeConverter::CodeStringToDomCode(kCodeForSpace));
   const uint16 kNativeCodeSpace =
-      ui::KeycodeConverter::CodeToNativeKeycode(kCodeForSpace);
+      ui::KeycodeConverter::DomCodeToNativeKeycode(kDomCodeForSpace);
   ASSERT_NE(ui::KeycodeConverter::InvalidNativeKeycode(), kNativeCodeSpace);
+  ASSERT_EQ(kNativeCodeSpace,
+            ui::KeycodeConverter::DomCodeToNativeKeycode(kDomCodeForSpace));
 
   {
-    KeyEvent key(ET_KEY_PRESSED, VKEY_SPACE, kCodeForSpace, EF_NONE);
-    EXPECT_EQ(kCodeForSpace, key.code());
+    KeyEvent key(ET_KEY_PRESSED, VKEY_SPACE, kDomCodeForSpace, EF_NONE);
+    EXPECT_EQ(kCodeForSpace, key.GetCodeString());
   }
   {
     // Regardless the KeyEvent.key_code (VKEY_RETURN), code should be
     // the specified value.
-    KeyEvent key(ET_KEY_PRESSED, VKEY_RETURN, kCodeForSpace, EF_NONE);
-    EXPECT_EQ(kCodeForSpace, key.code());
+    KeyEvent key(ET_KEY_PRESSED, VKEY_RETURN, kDomCodeForSpace, EF_NONE);
+    EXPECT_EQ(kCodeForSpace, key.GetCodeString());
   }
   {
-    // If the synthetic event is initialized without code, it returns
-    // an empty string.
-    // TODO(komatsu): Fill a fallback value assuming the US keyboard layout.
+    // If the synthetic event is initialized without code, the code is
+    // determined from the KeyboardCode assuming a US keyboard layout.
     KeyEvent key(ET_KEY_PRESSED, VKEY_SPACE, EF_NONE);
-    EXPECT_TRUE(key.code().empty());
+    EXPECT_EQ(kCodeForSpace, key.GetCodeString());
+  }
+#if defined(USE_X11)
+  {
+    // KeyEvent converts from the native keycode (XKB) to the code.
+    ScopedXI2Event xevent;
+    xevent.InitKeyEvent(ET_KEY_PRESSED, VKEY_SPACE, kNativeCodeSpace);
+    KeyEvent key(xevent);
+    EXPECT_EQ(kCodeForSpace, key.GetCodeString());
+  }
+#endif  // USE_X11
+#if defined(OS_WIN)
+  {
+    // Test a non extended key.
+    ASSERT_EQ((kNativeCodeSpace & 0xFF), kNativeCodeSpace);
+
+    const LPARAM lParam = GetLParamFromScanCode(kNativeCodeSpace);
+    MSG native_event = { NULL, WM_KEYUP, VKEY_SPACE, lParam };
+    KeyEvent key(native_event);
+
+    // KeyEvent converts from the native keycode (scan code) to the code.
+    EXPECT_EQ(kCodeForSpace, key.GetCodeString());
+  }
+  {
+    const char kCodeForHome[]  = "Home";
+    const uint16 kNativeCodeHome  = 0xe047;
+
+    // 'Home' is an extended key with 0xe000 bits.
+    ASSERT_NE((kNativeCodeHome & 0xFF), kNativeCodeHome);
+    const LPARAM lParam = GetLParamFromScanCode(kNativeCodeHome);
+
+    MSG native_event = { NULL, WM_KEYUP, VKEY_HOME, lParam };
+    KeyEvent key(native_event);
+
+    // KeyEvent converts from the native keycode (scan code) to the code.
+    EXPECT_EQ(kCodeForHome, key.GetCodeString());
+  }
+#endif  // OS_WIN
+}
+
+namespace {
+#if defined(USE_X11)
+void SetKeyEventTimestamp(XEvent* event, long time) {
+  event->xkey.time = time;
+}
+
+void AdvanceKeyEventTimestamp(XEvent* event) {
+  event->xkey.time++;
+}
+
+#elif defined(OS_WIN)
+void SetKeyEventTimestamp(MSG& msg, long time) {
+  msg.time = time;
+}
+
+void AdvanceKeyEventTimestamp(MSG& msg) {
+  msg.time++;
+}
+#endif
+}  // namespace
+
+#if defined(USE_X11) || defined(OS_WIN)
+TEST(EventTest, AutoRepeat) {
+  const uint16 kNativeCodeA =
+      ui::KeycodeConverter::DomCodeToNativeKeycode(DomCode::KEY_A);
+  const uint16 kNativeCodeB =
+      ui::KeycodeConverter::DomCodeToNativeKeycode(DomCode::KEY_B);
+#if defined(USE_X11)
+  ScopedXI2Event native_event_a_pressed;
+  native_event_a_pressed.InitKeyEvent(ET_KEY_PRESSED, VKEY_A, kNativeCodeA);
+  ScopedXI2Event native_event_a_pressed_1500;
+  native_event_a_pressed_1500.InitKeyEvent(
+      ET_KEY_PRESSED, VKEY_A, kNativeCodeA);
+  ScopedXI2Event native_event_a_pressed_3000;
+  native_event_a_pressed_3000.InitKeyEvent(
+      ET_KEY_PRESSED, VKEY_A, kNativeCodeA);
+
+  ScopedXI2Event native_event_a_released;
+  native_event_a_released.InitKeyEvent(ET_KEY_RELEASED, VKEY_A, kNativeCodeA);
+  ScopedXI2Event native_event_b_pressed;
+  native_event_b_pressed.InitKeyEvent(ET_KEY_PRESSED, VKEY_B, kNativeCodeB);
+  ScopedXI2Event native_event_a_pressed_nonstandard_state;
+  native_event_a_pressed_nonstandard_state.InitKeyEvent(
+      ET_KEY_PRESSED, VKEY_A, kNativeCodeA);
+  // IBUS-GTK uses the mask (1 << 25) to detect reposted event.
+  static_cast<XEvent*>(native_event_a_pressed_nonstandard_state)->xkey.state |=
+      1 << 25;
+#elif defined(OS_WIN)
+  const LPARAM lParam_a = GetLParamFromScanCode(kNativeCodeA);
+  const LPARAM lParam_b = GetLParamFromScanCode(kNativeCodeB);
+  MSG native_event_a_pressed = { NULL, WM_KEYDOWN, VKEY_A, lParam_a };
+  MSG native_event_a_pressed_1500 = { NULL, WM_KEYDOWN, VKEY_A, lParam_a };
+  MSG native_event_a_pressed_3000 = { NULL, WM_KEYDOWN, VKEY_A, lParam_a };
+  MSG native_event_a_released = { NULL, WM_KEYUP, VKEY_A, lParam_a };
+  MSG native_event_b_pressed = { NULL, WM_KEYUP, VKEY_B, lParam_b };
+#endif
+  SetKeyEventTimestamp(native_event_a_pressed_1500, 1500);
+  SetKeyEventTimestamp(native_event_a_pressed_3000, 3000);
+
+  {
+    KeyEvent key_a1(native_event_a_pressed);
+    EXPECT_FALSE(key_a1.IsRepeat());
+
+    KeyEvent key_a1_with_same_event(native_event_a_pressed);
+    EXPECT_FALSE(key_a1_with_same_event.IsRepeat());
+
+    KeyEvent key_a1_released(native_event_a_released);
+    EXPECT_FALSE(key_a1_released.IsRepeat());
+
+    KeyEvent key_a2(native_event_a_pressed);
+    EXPECT_FALSE(key_a2.IsRepeat());
+
+    AdvanceKeyEventTimestamp(native_event_a_pressed);
+    KeyEvent key_a2_repeated(native_event_a_pressed);
+    EXPECT_TRUE(key_a2_repeated.IsRepeat());
+
+    KeyEvent key_a2_released(native_event_a_released);
+    EXPECT_FALSE(key_a2_released.IsRepeat());
+  }
+
+  // Interleaved with different key press.
+  {
+    KeyEvent key_a3(native_event_a_pressed);
+    EXPECT_FALSE(key_a3.IsRepeat());
+
+    KeyEvent key_b(native_event_b_pressed);
+    EXPECT_FALSE(key_b.IsRepeat());
+
+    AdvanceKeyEventTimestamp(native_event_a_pressed);
+    KeyEvent key_a3_again(native_event_a_pressed);
+    EXPECT_FALSE(key_a3_again.IsRepeat());
+
+    AdvanceKeyEventTimestamp(native_event_a_pressed);
+    KeyEvent key_a3_repeated(native_event_a_pressed);
+    EXPECT_TRUE(key_a3_repeated.IsRepeat());
+
+    AdvanceKeyEventTimestamp(native_event_a_pressed);
+    KeyEvent key_a3_repeated2(native_event_a_pressed);
+    EXPECT_TRUE(key_a3_repeated2.IsRepeat());
+
+    KeyEvent key_a3_released(native_event_a_released);
+    EXPECT_FALSE(key_a3_released.IsRepeat());
+  }
+
+  // Hold the key longer than max auto repeat timeout.
+  {
+    KeyEvent key_a4_0(native_event_a_pressed);
+    EXPECT_FALSE(key_a4_0.IsRepeat());
+
+    KeyEvent key_a4_1500(native_event_a_pressed_1500);
+    EXPECT_TRUE(key_a4_1500.IsRepeat());
+
+    KeyEvent key_a4_3000(native_event_a_pressed_3000);
+    EXPECT_TRUE(key_a4_3000.IsRepeat());
+
+    KeyEvent key_a4_released(native_event_a_released);
+    EXPECT_FALSE(key_a4_released.IsRepeat());
+  }
+
+#if defined(USE_X11)
+  {
+    KeyEvent key_a4_pressed(native_event_a_pressed);
+    EXPECT_FALSE(key_a4_pressed.IsRepeat());
+
+    KeyEvent key_a4_pressed_nonstandard_state(
+        native_event_a_pressed_nonstandard_state);
+    EXPECT_FALSE(key_a4_pressed_nonstandard_state.IsRepeat());
+  }
+#endif
+}
+#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);
+  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);
+  EXPECT_EQ(non_zero_length2, event2.radius_x());
+  EXPECT_EQ(non_zero_length2, event2.radius_y());
+}
+
+TEST(EventTest, TouchEventRotationAngleFixing) {
+  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.9f;
+    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.1f;
+    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.1f, 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(400 - 360, event.rotation_angle());
   }
 }