Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1034)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/renderer_host/input/web_input_event_builders_mac_unittest.mm

Issue 1706683002: [Mac] Produce correct DomKey when Ctrl/Shift/Command is down (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tapted's review, add test Alt and Ctrl Alt Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ui/events/keycodes/keyboard_code_conversion_mac.mm » ('j') | ui/events/keycodes/keyboard_code_conversion_mac.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/input/web_input_event_builders_mac_unittest.mm
diff --git a/content/browser/renderer_host/input/web_input_event_builders_mac_unittest.mm b/content/browser/renderer_host/input/web_input_event_builders_mac_unittest.mm
index 3c8c5a284b5f242daac2a713939359a59015d668..d735b7750259da30eff6d27cead110e2f73f6575 100644
--- a/content/browser/renderer_host/input/web_input_event_builders_mac_unittest.mm
+++ b/content/browser/renderer_host/input/web_input_event_builders_mac_unittest.mm
@@ -112,7 +112,8 @@ TEST(WebInputEventBuilderMacTest, ControlSequence) {
EXPECT_EQ(ui::VKEY_OEM_4, web_event.windowsKeyCode);
EXPECT_EQ(ui::DomCode::BRACKET_LEFT,
static_cast<ui::DomCode>(web_event.domCode));
- EXPECT_EQ(ui::DomKey::FromCharacter(0x1b), web_event.domKey);
+ // Will only pass on US layout.
+ EXPECT_EQ(ui::DomKey::FromCharacter('['), web_event.domKey);
}
// Test that numpad keys get mapped correctly.
@@ -246,3 +247,160 @@ TEST(WebInputEventBuilderMacTest, SystemKeyEvents) {
webEvent = WebKeyboardEventBuilder::Build(macEvent);
EXPECT_TRUE(webEvent.isSystemKey);
}
+
+// Test conversion from key combination with Control to DomKey.
+// TODO(chongz): Move DomKey tests for all platforms into one place.
+// http://crbug.com/587589
+// This test case only works for U.S. layout.
+TEST(WebInputEventBuilderMacTest, DomKeyCtrlShift) {
+ struct DomKeyTestCase {
+ int mac_key_code;
+ unichar character;
+ unichar shift_character;
+ } table[] = {
+ {kVK_ANSI_0, '0', ')'}, {kVK_ANSI_1, '1', '!'}, {kVK_ANSI_2, '2', '@'},
+ {kVK_ANSI_3, '3', '#'}, {kVK_ANSI_4, '4', '$'}, {kVK_ANSI_5, '5', '%'},
+ {kVK_ANSI_6, '6', '^'}, {kVK_ANSI_7, '7', '&'}, {kVK_ANSI_8, '8', '*'},
+ {kVK_ANSI_9, '9', '('}, {kVK_ANSI_A, 'a', 'A'}, {kVK_ANSI_B, 'b', 'B'},
+ {kVK_ANSI_C, 'c', 'C'}, {kVK_ANSI_D, 'd', 'D'}, {kVK_ANSI_E, 'e', 'E'},
+ {kVK_ANSI_F, 'f', 'F'}, {kVK_ANSI_G, 'g', 'G'}, {kVK_ANSI_H, 'h', 'H'},
+ {kVK_ANSI_I, 'i', 'I'}, {kVK_ANSI_J, 'j', 'J'}, {kVK_ANSI_K, 'k', 'K'},
+ {kVK_ANSI_L, 'l', 'L'}, {kVK_ANSI_M, 'm', 'M'}, {kVK_ANSI_N, 'n', 'N'},
+ {kVK_ANSI_O, 'o', 'O'}, {kVK_ANSI_P, 'p', 'P'}, {kVK_ANSI_Q, 'q', 'Q'},
+ {kVK_ANSI_R, 'r', 'R'}, {kVK_ANSI_S, 's', 'S'}, {kVK_ANSI_T, 't', 'T'},
+ {kVK_ANSI_U, 'u', 'U'}, {kVK_ANSI_V, 'v', 'V'}, {kVK_ANSI_W, 'w', 'W'},
+ {kVK_ANSI_X, 'x', 'X'}, {kVK_ANSI_Y, 'y', 'Y'}, {kVK_ANSI_Z, 'z', 'Z'}};
+
+ for (const DomKeyTestCase& entry : table) {
+ // Tests ctrl_dom_key
tdresser 2016/02/24 17:12:08 Add period.
+ NSEvent* mac_event = BuildFakeKeyEvent(entry.mac_key_code, entry.character,
+ NSControlKeyMask, NSKeyDown);
+ WebKeyboardEvent web_event = WebKeyboardEventBuilder::Build(mac_event);
+ EXPECT_EQ(ui::DomKey::FromCharacter(entry.character), web_event.domKey);
+ // Tests ctrl_shift_dom_key
tdresser 2016/02/24 17:12:08 period
+ mac_event = BuildFakeKeyEvent(entry.mac_key_code, entry.shift_character,
+ NSControlKeyMask | NSShiftKeyMask, NSKeyDown);
+ web_event = WebKeyboardEventBuilder::Build(mac_event);
+ EXPECT_EQ(ui::DomKey::FromCharacter(entry.shift_character),
+ web_event.domKey);
+ }
+}
+
+// This test case only works for U.S. layout.
+TEST(WebInputEventBuilderMacTest, DomKeyCtrlAlt) {
+ struct DomKeyTestCase {
+ int mac_key_code;
+ unichar alt_character;
+ unichar ctrl_alt_character;
+ } table[] = {{kVK_ANSI_0, u"º"[0], u"0"[0]}, {kVK_ANSI_1, u"¡"[0], u"1"[0]},
+ {kVK_ANSI_2, u"™"[0], u"2"[0]}, {kVK_ANSI_3, u"£"[0], u"3"[0]},
+ {kVK_ANSI_4, u"¢"[0], u"4"[0]}, {kVK_ANSI_5, u"∞"[0], u"5"[0]},
+ {kVK_ANSI_6, u"§"[0], u"6"[0]}, {kVK_ANSI_7, u"¶"[0], u"7"[0]},
+ {kVK_ANSI_8, u"•"[0], u"8"[0]}, {kVK_ANSI_9, u"ª"[0], u"9"[0]},
+ {kVK_ANSI_A, u"å"[0], u"å"[0]}, {kVK_ANSI_B, u"∫"[0], u"∫"[0]},
+ {kVK_ANSI_C, u"ç"[0], u"ç"[0]}, {kVK_ANSI_D, u"∂"[0], u"∂"[0]},
+ {kVK_ANSI_E, u"´"[0], u"´"[0]}, {kVK_ANSI_F, u"ƒ"[0], u"ƒ"[0]},
+ {kVK_ANSI_G, u"©"[0], u"©"[0]}, {kVK_ANSI_H, u"˙"[0], u"˙"[0]},
+ {kVK_ANSI_I, u"ˆ"[0], u"ˆ"[0]}, {kVK_ANSI_J, u"∆"[0], u"∆"[0]},
+ {kVK_ANSI_K, u"˚"[0], u"˚"[0]}, {kVK_ANSI_L, u"¬"[0], u"¬"[0]},
+ {kVK_ANSI_M, u"µ"[0], u"µ"[0]}, {kVK_ANSI_N, u"˜"[0], u"˜"[0]},
+ {kVK_ANSI_O, u"ø"[0], u"ø"[0]}, {kVK_ANSI_P, u"π"[0], u"π"[0]},
+ {kVK_ANSI_Q, u"œ"[0], u"œ"[0]}, {kVK_ANSI_R, u"®"[0], u"®"[0]},
+ {kVK_ANSI_S, u"ß"[0], u"ß"[0]}, {kVK_ANSI_T, u"†"[0], u"†"[0]},
+ {kVK_ANSI_U, u"¨"[0], u"¨"[0]}, {kVK_ANSI_V, u"√"[0], u"√"[0]},
+ {kVK_ANSI_W, u"∑"[0], u"∑"[0]}, {kVK_ANSI_X, u"≈"[0], u"≈"[0]},
+ {kVK_ANSI_Y, u"¥"[0], u"¥"[0]}, {kVK_ANSI_Z, u"Ω"[0], u"Ω"[0]}};
+
+ for (const DomKeyTestCase& entry : table) {
+ // Tests alt_dom_key
+ NSEvent* mac_event = BuildFakeKeyEvent(
+ entry.mac_key_code, entry.alt_character, NSAlternateKeyMask, NSKeyDown);
+ WebKeyboardEvent web_event = WebKeyboardEventBuilder::Build(mac_event);
+ EXPECT_EQ(ui::DomKey::FromCharacter(entry.alt_character), web_event.domKey)
+ << "a " << entry.alt_character;
+ // Tests ctrl_alt_dom_key
+ mac_event = BuildFakeKeyEvent(entry.mac_key_code, entry.ctrl_alt_character,
+ NSAlternateKeyMask, NSKeyDown);
+ web_event = WebKeyboardEventBuilder::Build(mac_event);
+ EXPECT_EQ(ui::DomKey::FromCharacter(entry.ctrl_alt_character),
+ web_event.domKey)
+ << "a_c " << entry.ctrl_alt_character;
+ }
+}
+
+TEST(WebInputEventBuilderMacTest, DomKeyNonPrintable) {
+ struct DomKeyTestCase {
+ int mac_key_code;
+ unichar character;
+ ui::DomKey dom_key;
+ } table[] = {
+ {kVK_Return, kReturnCharCode, ui::DomKey::ENTER},
+ {kVK_Tab, kTabCharCode, ui::DomKey::TAB},
+ {kVK_Delete, kBackspaceCharCode, ui::DomKey::BACKSPACE},
+ {kVK_Escape, kEscapeCharCode, ui::DomKey::ESCAPE},
+ {kVK_F1, NSF1FunctionKey, ui::DomKey::F1},
+ {kVK_F2, NSF2FunctionKey, ui::DomKey::F2},
+ {kVK_F3, NSF3FunctionKey, ui::DomKey::F3},
+ {kVK_F4, NSF4FunctionKey, ui::DomKey::F4},
+ {kVK_F5, NSF5FunctionKey, ui::DomKey::F5},
+ {kVK_F6, NSF6FunctionKey, ui::DomKey::F6},
+ {kVK_F7, NSF7FunctionKey, ui::DomKey::F7},
+ {kVK_F8, NSF8FunctionKey, ui::DomKey::F8},
+ {kVK_F9, NSF9FunctionKey, ui::DomKey::F9},
+ {kVK_F10, NSF10FunctionKey, ui::DomKey::F10},
+ {kVK_F11, NSF11FunctionKey, ui::DomKey::F11},
+ {kVK_F12, NSF12FunctionKey, ui::DomKey::F12},
+ {kVK_F13, NSF13FunctionKey, ui::DomKey::F13},
+ {kVK_F14, NSF14FunctionKey, ui::DomKey::F14},
+ {kVK_F15, NSF15FunctionKey, ui::DomKey::F15},
+ {kVK_F16, NSF16FunctionKey, ui::DomKey::F16},
+ {kVK_F17, NSF17FunctionKey, ui::DomKey::F17},
+ {kVK_F18, NSF18FunctionKey, ui::DomKey::F18},
+ {kVK_F19, NSF19FunctionKey, ui::DomKey::F19},
+ {kVK_F20, NSF20FunctionKey, ui::DomKey::F20},
+ {kVK_Help, kHelpCharCode, ui::DomKey::HELP},
+ {kVK_Home, NSHomeFunctionKey, ui::DomKey::HOME},
+ {kVK_PageUp, NSPageUpFunctionKey, ui::DomKey::PAGE_UP},
+ {kVK_ForwardDelete, NSDeleteFunctionKey, ui::DomKey::DEL},
+ {kVK_End, NSEndFunctionKey, ui::DomKey::END},
+ {kVK_PageDown, NSPageDownFunctionKey, ui::DomKey::PAGE_DOWN},
+ {kVK_LeftArrow, NSLeftArrowFunctionKey, ui::DomKey::ARROW_LEFT},
+ {kVK_RightArrow, NSRightArrowFunctionKey, ui::DomKey::ARROW_RIGHT},
+ {kVK_DownArrow, NSDownArrowFunctionKey, ui::DomKey::ARROW_DOWN},
+ {kVK_UpArrow, NSUpArrowFunctionKey, ui::DomKey::ARROW_UP}};
+
+ for (const DomKeyTestCase& entry : table) {
+ // Tests non-printable key
+ NSEvent* mac_event =
+ BuildFakeKeyEvent(entry.mac_key_code, entry.character, 0, NSKeyDown);
+ WebKeyboardEvent web_event = WebKeyboardEventBuilder::Build(mac_event);
+ EXPECT_EQ(entry.dom_key, web_event.domKey) << entry.mac_key_code;
+ // Tests non-printable key with Shift
+ mac_event = BuildFakeKeyEvent(entry.mac_key_code, entry.character,
+ NSShiftKeyMask, NSKeyDown);
+ web_event = WebKeyboardEventBuilder::Build(mac_event);
+ EXPECT_EQ(entry.dom_key, web_event.domKey) << "s " << entry.mac_key_code;
+ }
+}
+
+TEST(WebInputEventBuilderMacTest, DomKeyFlagsChanged) {
+ struct DomKeyTestCase {
+ int mac_key_code;
+ ui::DomKey dom_key;
+ } table[] = {{kVK_Command, ui::DomKey::META},
+ {kVK_Shift, ui::DomKey::SHIFT},
+ {kVK_RightShift, ui::DomKey::SHIFT},
+ {kVK_CapsLock, ui::DomKey::CAPS_LOCK},
+ {kVK_Option, ui::DomKey::ALT},
+ {kVK_RightOption, ui::DomKey::ALT},
+ {kVK_Control, ui::DomKey::CONTROL},
+ {kVK_RightControl, ui::DomKey::CONTROL},
+ {kVK_Function, ui::DomKey::FN}};
+
+ for (const DomKeyTestCase& entry : table) {
+ NSEvent* mac_event =
+ BuildFakeKeyEvent(entry.mac_key_code, 0, 0, NSFlagsChanged);
+ WebKeyboardEvent web_event = WebKeyboardEventBuilder::Build(mac_event);
+ EXPECT_EQ(entry.dom_key, web_event.domKey) << entry.mac_key_code;
+ }
+}
« no previous file with comments | « no previous file | ui/events/keycodes/keyboard_code_conversion_mac.mm » ('j') | ui/events/keycodes/keyboard_code_conversion_mac.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698