[Mac DomCode] Swap 'IntlBackslash' and 'Backquote' on ISO keyboard

ui/events/keycodes/keyboard_code_conversion_mac.mm

 // 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.
 
 #import "ui/events/keycodes/keyboard_code_conversion_mac.h"
 
 #include <algorithm>
 
 #import <Carbon/Carbon.h>
 
@@ skipping 770 matching lines @@
 
     characters = [event charactersIgnoringModifiers];
     if ([characters length] > 0)
       code = KeyboardCodeFromCharCode([characters characterAtIndex:0]);
     if (code)
       return code;
   }
   return KeyboardCodeFromKeyCode([event keyCode]);
 }
 
+int ISOKeyboardKeyCodeMap(int nativeKeyCode) {
+  // OS X will swap 'Backquote' and 'IntlBackslash' if it's an ISO keyboard.
+  // https://crbug.com/600607
+  switch (nativeKeyCode) {
+    case kVK_ISO_Section:
+      return kVK_ANSI_Grave;
+    case kVK_ANSI_Grave:
+      return kVK_ISO_Section;
+    default:
+      return nativeKeyCode;
+  }
+}
+
 DomCode DomCodeFromNSEvent(NSEvent* event) {
+  if (KBGetLayoutType(LMGetKbdType()) == kKeyboardISO) {

[chongz, 2016/05/02 21:33:25]

I'm not sure how to test this code, it seems magic to me that
|KBGetLayoutType(LMGetKbdType())| can return the keyboard I'm typing on (without
touching |event|) even if I have two keyboards connected.

[garykac, 2016/05/02 22:03:23]

For which keyboards does this return kKeyboardISO?

We know this problem occurs for the 102-key keyboard when set to ISO, but other
keyboards (like Japanese) can (AIUI) be set to ISO but do not suffer this
problem (i.e., the Grave key is correct).

I only tested with a PC Japanese keyboard. I'm ordering a Mac Japanese keyboard
to test.

[chongz, 2016/05/02 22:31:12]

It returns |kKeyboardISO| for 
1. Apple's ISO Fr Canadian keyboard (cannot change layout)
2. PC JIS keyboard set to ISO
3. PC ANSI keyboard set to ISO

From my tests this problem occurs to all three kinds of settings above. e.g. On
my PC JIS keyboard with layout set to ISO, the Grace key is wrong and will
produce 'IntlBackslash'.

I don't have a Mac JIS keyboard though.

+    return ui::KeycodeConverter::NativeKeycodeToDomCode(
+        ISOKeyboardKeyCodeMap([event keyCode]));
+  }
+
   return ui::KeycodeConverter::NativeKeycodeToDomCode([event keyCode]);
 }
 
 DomKey DomKeyFromNSEvent(NSEvent* event) {
   // Apply the lookup based on the character first since that has the
   // Keyboard layout and modifiers already applied; whereas the keyCode
   // doesn't.
   if ([event type] == NSKeyDown || [event type] == NSKeyUp) {
     // Cannot use [event characters] to check whether it's a dead key, because
     // KeyUp event has the character form of the dead key in [event characters].
@@ skipping 33 matching lines @@
             &unused_is_dead_key);
       }
       if (!std::iscntrl(dom_key_char))
         return DomKeyFromCharCode(dom_key_char);
     }
   }
   return DomKeyFromKeyCode([event keyCode]);
 }
 
 }  // namespace ui