Changeset 240604 in webkit

Timestamp:

Jan 28, 2019 3:00:41 PM (5 years ago)

Author:

dbates@webkit.org

Message:

[iOS] Make Window virtual key code computation match Mac
​https://bugs.webkit.org/show_bug.cgi?id=193452

Reviewed by Ryosuke Niwa.

Source/WebCore:

Use the same approach for computing the Windows virtual key code on iOS as we do on Mac for
web compatibility. On Mac, we prefer to compute the Windows virtual key code from the input
strings of the key event and use the key event's keycode as a last resort.

Test: fast/events/ios/key-events-meta-alt-combinations.html

• platform/ios/PlatformEventFactoryIOS.h:
• platform/ios/PlatformEventFactoryIOS.mm:

(WebCore::isKeypadEvent): Added.
(WebCore::windowsKeyCodeForKeyEvent): Added.
(WebCore::PlatformKeyboardEventBuilder::PlatformKeyboardEventBuilder): Modified to call
WebCore::windowsKeyCodeForKeyEvent() to compute the Windows virtual key code.

Source/WebKit:

Compute the Windows virtual key code from the WebEvent.

• Shared/ios/WebIOSEventFactory.mm:

(WebIOSEventFactory::createWebKeyboardEvent):

LayoutTests:

Add a test that ensures we do not regress DOM key events dispatches for combinations
of Option and Command + Option key commands.

• fast/events/ios/key-events-meta-alt-combinations-expected.txt: Added.
• fast/events/ios/key-events-meta-alt-combinations.html: Added.
• fast/events/ios/resources/key-tester.js: Added.

(computeDifference):
(areArraysEqual):
(areKeyCommandsEqual):
(KeyCommand):
(KeyCommand.prototype.toString):
(keyCommandsHasCommand):
(computeSubsets.compareByModifierOrder):
(handleKeyUp):
(handleKeyPress):
(log):
(logKeyEvent):
(displayNameForTest):
(nextKeyPress):
(runTest):
(setUp):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/ios/key-events-meta-alt-combinations-expected.txt (added)
• LayoutTests/fast/events/ios/key-events-meta-alt-combinations.html (added)
• LayoutTests/fast/events/ios/resources (added)
• LayoutTests/fast/events/ios/resources/key-tester.js (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/ios/PlatformEventFactoryIOS.h (modified) (1 diff)
• Source/WebCore/platform/ios/PlatformEventFactoryIOS.mm (modified) (3 diffs)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/Shared/ios/WebIOSEventFactory.mm (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-01-28  Daniel Bates  <dabates@apple.com>
+
+        [iOS] Make Window virtual key code computation match Mac
+        https://bugs.webkit.org/show_bug.cgi?id=193452
+
+        Reviewed by Ryosuke Niwa.
+
+        Add a test that ensures we do not regress DOM key events dispatches for combinations
+        of Option and Command + Option key commands.
+
+        * fast/events/ios/key-events-meta-alt-combinations-expected.txt: Added.
+        * fast/events/ios/key-events-meta-alt-combinations.html: Added.
+        * fast/events/ios/resources/key-tester.js: Added.
+        (computeDifference):
+        (areArraysEqual):
+        (areKeyCommandsEqual):
+        (KeyCommand):
+        (KeyCommand.prototype.toString):
+        (keyCommandsHasCommand):
+        (computeSubsets.compareByModifierOrder):
+        (handleKeyUp):
+        (handleKeyPress):
+        (log):
+        (logKeyEvent):
+        (displayNameForTest):
+        (nextKeyPress):
+        (runTest):
+        (setUp):
+
 2019-01-28  Antoine Quint  <graouts@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-01-28  Daniel Bates  <dabates@apple.com>
+
+        [iOS] Make Window virtual key code computation match Mac
+        https://bugs.webkit.org/show_bug.cgi?id=193452
+
+        Reviewed by Ryosuke Niwa.
+
+        Use the same approach for computing the Windows virtual key code on iOS as we do on Mac for
+        web compatibility. On Mac, we prefer to compute the  Windows virtual key code from the input
+        strings of the key event and use the key event's keycode as a last resort.
+
+        Test: fast/events/ios/key-events-meta-alt-combinations.html
+
+        * platform/ios/PlatformEventFactoryIOS.h:
+        * platform/ios/PlatformEventFactoryIOS.mm:
+        (WebCore::isKeypadEvent): Added.
+        (WebCore::windowsKeyCodeForKeyEvent): Added.
+        (WebCore::PlatformKeyboardEventBuilder::PlatformKeyboardEventBuilder): Modified to call
+        WebCore::windowsKeyCodeForKeyEvent() to compute the Windows virtual key code.
+
 2019-01-28  Antoine Quint  <graouts@apple.com>
 

trunk/Source/WebCore/platform/ios/PlatformEventFactoryIOS.h

@@ -54 +54 @@
 WEBCORE_EXPORT String codeForKeyEvent(WebEvent *);
 WEBCORE_EXPORT String keyIdentifierForKeyEvent(WebEvent *);
+WEBCORE_EXPORT int windowsKeyCodeForKeyEvent(WebEvent*);
 
 } // namespace WebCore

trunk/Source/WebCore/platform/ios/PlatformEventFactoryIOS.mm

@@ -1 +1 @@
 /*
- * Copyright (C) 2004, 2006, 2007, 2008, 2009, 2010, 2011, 2014 Apple Inc. All rights reserved.
+ * Copyright (C) 2004, 2006-2011, 2014, 2019 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -421 +421 @@
 }
 
+static bool isKeypadEvent(WebEvent* event)
+{
+    // Check that this is the type of event that has a keyCode.
+    if (event.type != WebEventKeyDown && event.type != WebEventKeyUp)
+        return false;
+
+    // With the exception of keypad comma, the following corresponds to the criterion for UIKeyModifierNumericPad.
+    // FIXME: Recognize keypad comma.
+    switch (event.keyCode) {
+    case VK_CLEAR: // Num Pad Clear
+    case VK_OEM_PLUS: // Num Pad =
+    case VK_DIVIDE:
+    case VK_MULTIPLY:
+    case VK_SUBTRACT:
+    case VK_ADD:
+    case VK_RETURN: // Num Pad Enter
+    case VK_DECIMAL: // Num Pad .
+    case VK_NUMPAD0:
+    case VK_NUMPAD1:
+    case VK_NUMPAD2:
+    case VK_NUMPAD3:
+    case VK_NUMPAD4:
+    case VK_NUMPAD5:
+    case VK_NUMPAD6:
+    case VK_NUMPAD7:
+    case VK_NUMPAD8:
+    case VK_NUMPAD9:
+        return true;
+    }
+    return false;
+}
+
+int windowsKeyCodeForKeyEvent(WebEvent* event)
+{
+    if (event.keyboardFlags & WebEventKeyboardInputModifierFlagsChanged)
+        return event.keyCode;
+
+    // There are several kinds of characters for which we produce key code from char code:
+    // 1. Roman letters. Windows keyboard layouts affect both virtual key codes and character codes for these,
+    //    so e.g. 'A' gets the same keyCode on QWERTY, AZERTY or Dvorak layouts.
+    // 2. Keys for which there is no known iOS virtual key codes, like PrintScreen.
+    // 3. Certain punctuation keys. On Windows, these are also remapped depending on current keyboard layout,
+    //    but see comment in windowsKeyCodeForCharCode().
+    if (!isKeypadEvent(event) && (event.type == WebEventKeyDown || event.type == WebEventKeyUp)) {
+        // Cmd switches Roman letters for Dvorak-QWERTY layout, so try modified characters first.
+        NSString *string = event.characters;
+        int code = string.length > 0 ? windowsKeyCodeForCharCode([string characterAtIndex:0]) : 0;
+        if (code)
+            return code;
+
+        // Ctrl+A on an AZERTY keyboard would get VK_Q keyCode if we relied on -[WebEvent keyCode] below.
+        string = event.charactersIgnoringModifiers;
+        code = string.length > 0 ? windowsKeyCodeForCharCode([string characterAtIndex:0]) : 0;
+        if (code)
+            return code;
+    }
+
+    // Use iOS virtual key code directly for any keys not handled above.
+    // E.g. the key next to Caps Lock has the same Event.keyCode on U.S. keyboard ('A') and on
+    // Russian keyboard (CYRILLIC LETTER EF).
+    return event.keyCode;
+}
+
 class PlatformKeyboardEventBuilder : public PlatformKeyboardEvent {
 public:
@@ -443 +506 @@
         m_code = codeForKeyEvent(event);
         m_keyIdentifier = keyIdentifierForKeyEvent(event);
-        m_windowsVirtualKeyCode = event.keyCode;
+        m_windowsVirtualKeyCode = windowsKeyCodeForKeyEvent(event);
         m_isKeypad = false; // iOS does not distinguish the numpad. See <rdar://problem/7190835>.
         m_isSystemKey = false;

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-01-28  Daniel Bates  <dabates@apple.com>
+
+        [iOS] Make Window virtual key code computation match Mac
+        https://bugs.webkit.org/show_bug.cgi?id=193452
+
+        Reviewed by Ryosuke Niwa.
+
+        Compute the Windows virtual key code from the WebEvent.
+
+        * Shared/ios/WebIOSEventFactory.mm:
+        (WebIOSEventFactory::createWebKeyboardEvent):
+
 2019-01-28  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebKit/Shared/ios/WebIOSEventFactory.mm

@@ -69 +69 @@
     String code = WebCore::codeForKeyEvent(event);
     String keyIdentifier = WebCore::keyIdentifierForKeyEvent(event);
-    int windowsVirtualKeyCode = event.keyCode;
+    int windowsVirtualKeyCode = WebCore::windowsKeyCodeForKeyEvent(event);
     // FIXME: This is not correct. WebEvent.keyCode represents the Windows native virtual key code.
     int nativeVirtualKeyCode = event.keyCode;