[Mac] Produce correct DomKey when Ctrl/Shift/Command is down

content/browser/renderer_host/input/web_input_event_builders_mac_unittest.mm

 // Copyright 2015 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 "content/browser/renderer_host/input/web_input_event_builders_mac.h"
 
 #include <Carbon/Carbon.h>
 #import <Cocoa/Cocoa.h>
 #include <stddef.h>
 
@@ skipping 28 matching lines @@
     {56, 1 << 1, NSShiftKeyMask},      // Left Shift
     {60, 1 << 2, NSShiftKeyMask},      // Right Shift
     {55, 1 << 3, NSCommandKeyMask},    // Left Command
     {54, 1 << 4, NSCommandKeyMask},    // Right Command
     {58, 1 << 5, NSAlternateKeyMask},  // Left Alt
     {61, 1 << 6, NSAlternateKeyMask},  // Right Alt
     {59, 1 << 0, NSControlKeyMask},    // Left Control
     {62, 1 << 13, NSControlKeyMask},   // Right Control
 };
 
-NSEvent* BuildFakeKeyEvent(NSUInteger key_code,
-                           unichar character,
-                           NSUInteger modifier_flags,
-                           NSEventType event_type) {
+NSEvent* BuildFakeKeyEventWithModifiedCharacter(
+    NSUInteger key_code,
+    unichar character,
+    unichar character_ignoring_modifiers,
+    NSUInteger modifier_flags,
+    NSEventType event_type) {
   NSString* string = [NSString stringWithCharacters:&character length:1];
+  NSString* string_ignoring_modifiers =
+      [NSString stringWithCharacters:&character_ignoring_modifiers length:1];
   return [NSEvent keyEventWithType:event_type
                           location:NSZeroPoint
                      modifierFlags:modifier_flags
                          timestamp:0.0
                       windowNumber:0
                            context:nil
                         characters:string
-       charactersIgnoringModifiers:string
+       charactersIgnoringModifiers:string_ignoring_modifiers
                          isARepeat:NO
                            keyCode:key_code];
 }
 
+NSEvent* BuildFakeKeyEvent(NSUInteger key_code,
+                           unichar character,
+                           NSUInteger modifier_flags,
+                           NSEventType event_type) {
+  return BuildFakeKeyEventWithModifiedCharacter(key_code, character, character,
+                                                modifier_flags, event_type);
+}
+
 }  // namespace
 
 // Test that arrow keys don't have numpad modifier set.
 TEST(WebInputEventBuilderMacTest, ArrowKeyNumPad) {
   // Left
   NSEvent* mac_event = BuildFakeKeyEvent(0x7B, NSLeftArrowFunctionKey,
                                          NSNumericPadKeyMask, NSKeyDown);
   WebKeyboardEvent web_event = WebKeyboardEventBuilder::Build(mac_event);
   EXPECT_EQ(0, web_event.modifiers);
   EXPECT_EQ(ui::DomCode::ARROW_LEFT,
@@ skipping 23 matching lines @@
                                 NSKeyDown);
   web_event = WebKeyboardEventBuilder::Build(mac_event);
   EXPECT_EQ(0, web_event.modifiers);
   EXPECT_EQ(ui::DomCode::ARROW_UP, static_cast<ui::DomCode>(web_event.domCode));
   EXPECT_EQ(ui::DomKey::ARROW_UP, web_event.domKey);
 }
 
 // Test that control sequence generate the correct vkey code.
 TEST(WebInputEventBuilderMacTest, ControlSequence) {
   // Ctrl-[ generates escape.
-  NSEvent* mac_event =
-      BuildFakeKeyEvent(0x21, 0x1b, NSControlKeyMask, NSKeyDown);
+  NSEvent* mac_event = BuildFakeKeyEventWithModifiedCharacter(
+      0x21, 0x1b, '[', NSControlKeyMask, NSKeyDown);
   WebKeyboardEvent web_event = WebKeyboardEventBuilder::Build(mac_event);
   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);
+  EXPECT_EQ(ui::DomKey::FromCharacter('['), web_event.domKey);
 }
 
 // Test that numpad keys get mapped correctly.
 TEST(WebInputEventBuilderMacTest, NumPadMapping) {
   KeyMappingEntry table[] = {
       {65, '.', ui::VKEY_DECIMAL, ui::DomCode::NUMPAD_DECIMAL,
        ui::DomKey::FromCharacter('.')},
       {67, '*', ui::VKEY_MULTIPLY, ui::DomCode::NUMPAD_MULTIPLY,
        ui::DomKey::FromCharacter('*')},
       {69, '+', ui::VKEY_ADD, ui::DomCode::NUMPAD_ADD,
@@ skipping 113 matching lines @@
   webEvent = WebKeyboardEventBuilder::Build(macEvent);
   EXPECT_TRUE(webEvent.isSystemKey);
 
   // Cmd + <some other modifier> + <any letter other then B and I> should be
   // treated as system event.
   macEvent = BuildFakeKeyEvent(kVK_ANSI_S, 'S',
                                NSCommandKeyMask | NSShiftKeyMask, NSKeyDown);
   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.
+TEST(WebInputEventBuilderMacTest, DomKeyWithControlKey) {
+  struct DomKeyTestCase {
+    int mac_key_code;
+    unichar character;
+    ui::DomKey dom_key;
+  } table[] = {{kVK_ANSI_A, 'a', ui::DomKey::FromCharacter('a')},

[dtapuska, 2016/02/17 20:42:35]

We likely should add a test case with Shift set.

+               {kVK_ANSI_B, 'b', ui::DomKey::FromCharacter('b')},
+               {kVK_ANSI_C, 'c', ui::DomKey::FromCharacter('c')},
+               {kVK_ANSI_D, 'd', ui::DomKey::FromCharacter('d')},
+               {kVK_ANSI_E, 'e', ui::DomKey::FromCharacter('e')},
+               {kVK_ANSI_F, 'f', ui::DomKey::FromCharacter('f')},
+               {kVK_ANSI_G, 'g', ui::DomKey::FromCharacter('g')},
+               {kVK_ANSI_H, 'h', ui::DomKey::FromCharacter('h')},
+               {kVK_ANSI_I, 'i', ui::DomKey::FromCharacter('i')},
+               {kVK_ANSI_J, 'j', ui::DomKey::FromCharacter('j')},
+               {kVK_ANSI_K, 'k', ui::DomKey::FromCharacter('k')},
+               {kVK_ANSI_L, 'l', ui::DomKey::FromCharacter('l')},
+               {kVK_ANSI_M, 'm', ui::DomKey::FromCharacter('m')},
+               {kVK_ANSI_N, 'n', ui::DomKey::FromCharacter('n')},
+               {kVK_ANSI_O, 'o', ui::DomKey::FromCharacter('o')},
+               {kVK_ANSI_P, 'p', ui::DomKey::FromCharacter('p')},
+               {kVK_ANSI_Q, 'q', ui::DomKey::FromCharacter('q')},
+               {kVK_ANSI_R, 'r', ui::DomKey::FromCharacter('r')},
+               {kVK_ANSI_S, 's', ui::DomKey::FromCharacter('s')},
+               {kVK_ANSI_T, 't', ui::DomKey::FromCharacter('t')},
+               {kVK_ANSI_U, 'u', ui::DomKey::FromCharacter('u')},
+               {kVK_ANSI_V, 'v', ui::DomKey::FromCharacter('v')},
+               {kVK_ANSI_W, 'w', ui::DomKey::FromCharacter('w')},
+               {kVK_ANSI_X, 'x', ui::DomKey::FromCharacter('x')},
+               {kVK_ANSI_Y, 'y', ui::DomKey::FromCharacter('y')},
+               {kVK_ANSI_Z, 'z', ui::DomKey::FromCharacter('z')}};
+
+  for (size_t i = 0; i < arraysize(table); ++i) {
+    NSEvent* mac_event = BuildFakeKeyEventWithModifiedCharacter(
+        table[i].mac_key_code, table[i].character & 0x1F, table[i].character,
+        NSControlKeyMask, NSKeyDown);
+    WebKeyboardEvent web_event = WebKeyboardEventBuilder::Build(mac_event);
+    EXPECT_EQ(table[i].dom_key, web_event.domKey);
+  }
+}