Changeset 247232 in webkit

Timestamp:

Jul 8, 2019 4:07:03 PM (5 years ago)

Author:

dbates@webkit.org

Message:

Command + . generates Escape with key identifier Period, should be Escape
​https://bugs.webkit.org/show_bug.cgi?id=199393
<rdar://problem/52498001>

Reviewed by Wenson Hsieh.

Source/WebCore:

Remap the key code for Command + . before we compute the Windows virtual key code.
Otherwise, the Windows virtual key code reveals the pre-mapped key code.

• platform/ios/WebEvent.mm:

(-[WebEvent initWithKeyEventType:timeStamp:characters:charactersIgnoringModifiers:modifiers:isRepeating:withFlags:withInputManagerHint:keyCode:isTabKey:]):

LayoutTests:

Update test result.

• fast/events/ios/key-events-comprehensive/key-events-meta-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/ios/key-events-comprehensive/key-events-meta-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/ios/WebEvent.mm (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-07-08  Daniel Bates  <dabates@apple.com>
+
+        Command + . generates Escape with key identifier Period, should be Escape
+        https://bugs.webkit.org/show_bug.cgi?id=199393
+        <rdar://problem/52498001>
+
+        Reviewed by Wenson Hsieh.
+
+        Update test result.
+
+        * fast/events/ios/key-events-comprehensive/key-events-meta-expected.txt:
+
 2019-07-08  Charlie Turner  <cturner@igalia.com>
 

trunk/LayoutTests/fast/events/ios/key-events-comprehensive/key-events-meta-expected.txt

@@ -147 +147 @@
 Test Command + .:
 type: keydown, key: Meta, code: MetaLeft, keyIdentifier: Meta, keyCode: 91, charCode: 0, keyCode: 91, which: 91, altKey: false, ctrlKey: false, metaKey: true, shiftKey: false, location: 1, keyLocation: 1
-type: keydown, key: Escape, code: Period, keyIdentifier: U+001B, keyCode: 27, charCode: 0, keyCode: 27, which: 27, altKey: false, ctrlKey: false, metaKey: false, shiftKey: false, location: 0, keyLocation: 0
-type: keypress, key: Escape, code: Period, keyIdentifier: , keyCode: 27, charCode: 27, keyCode: 27, which: 27, altKey: false, ctrlKey: false, metaKey: false, shiftKey: false, location: 0, keyLocation: 0
+type: keydown, key: Escape, code: Escape, keyIdentifier: U+001B, keyCode: 27, charCode: 0, keyCode: 27, which: 27, altKey: false, ctrlKey: false, metaKey: false, shiftKey: false, location: 0, keyLocation: 0
+type: keypress, key: Escape, code: Escape, keyIdentifier: , keyCode: 27, charCode: 27, keyCode: 27, which: 27, altKey: false, ctrlKey: false, metaKey: false, shiftKey: false, location: 0, keyLocation: 0
 type: keyup, key: Meta, code: MetaLeft, keyIdentifier: Meta, keyCode: 91, charCode: 0, keyCode: 91, which: 91, altKey: false, ctrlKey: false, metaKey: false, shiftKey: false, location: 1, keyLocation: 1
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-07-08  Daniel Bates  <dabates@apple.com>
+
+        Command + . generates Escape with key identifier Period, should be Escape
+        https://bugs.webkit.org/show_bug.cgi?id=199393
+        <rdar://problem/52498001>
+
+        Reviewed by Wenson Hsieh.
+
+        Remap the key code for Command + . before we compute the Windows virtual key code.
+        Otherwise, the Windows virtual key code reveals the pre-mapped key code.
+
+        * platform/ios/WebEvent.mm:
+        (-[WebEvent initWithKeyEventType:timeStamp:characters:charactersIgnoringModifiers:modifiers:isRepeating:withFlags:withInputManagerHint:keyCode:isTabKey:]):
+
 2019-07-08  Alex Christensen  <achristensen@webkit.org>
 

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

@@ -186 +186 @@
     _keyboardFlags = flags;
     _inputManagerHint = [hint retain];
+
+    BOOL flagsChanged = _keyboardFlags & WebEventKeyboardInputModifierFlagsChanged;
+    if (!flagsChanged) {
+        // Map Command + . to Escape since Apple Smart Keyboards lack an Escape key.
+        // FIXME: This doesn't work for some keyboard layouts, like French. See <rdar://problem/51047011>.
+        if ([charactersIgnoringModifiers isEqualToString:@"."] && (modifiers & WebEventFlagMaskCommandKey)) {
+            keyCode = kHIDUsage_KeyboardEscape;
+            _modifierFlags &= ~WebEventFlagMaskCommandKey;
+        }
+    }
+
     if (keyCode)
         _keyCode = windowsKeyCodeForKeyCode(keyCode);
@@ -193 +204 @@
     }
 
-    if (!(_keyboardFlags & WebEventKeyboardInputModifierFlagsChanged)) {
-        // Map Command + . to Escape since Apple Smart Keyboards lack an Escape key.
-        if ([charactersIgnoringModifiers isEqualToString:@"."] && (modifiers & WebEventFlagMaskCommandKey)) {
-            keyCode = kHIDUsage_KeyboardEscape;
-            _modifierFlags &= ~WebEventFlagMaskCommandKey;
-        }
+    if (!flagsChanged) {
         _characters = [normalizedStringWithAppKitCompatibilityMapping(characters, keyCode) retain];
         _charactersIgnoringModifiers = [normalizedStringWithAppKitCompatibilityMapping(charactersIgnoringModifiers, keyCode) retain];