Changeset 245644 in webkit

Timestamp:

May 22, 2019 1:58:32 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

WebKit does not generate an ESC key event for CMD+.
​https://bugs.webkit.org/show_bug.cgi?id=198137
<rdar://problem/51038641>

Patch by Daniel Bates <​dabates@apple.com> on 2019-05-22
Reviewed by Brent Fulgham.

This patch maps the Command + '.' keystroke to the 'Escape'. This also requires a change to UIKit to properly pass
the key state to WebKit (see <rdar://problem/46431552>).

• platform/ios/WebEvent.mm:

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

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/ios/WebEvent.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-05-22  Daniel Bates  <dabates@apple.com>
+
+        WebKit does not generate an ESC key event for CMD+.
+        https://bugs.webkit.org/show_bug.cgi?id=198137
+        <rdar://problem/51038641>
+
+        Reviewed by Brent Fulgham.
+
+        This patch maps the Command + '.' keystroke to the 'Escape'. This also requires a change to UIKit to properly pass
+        the key state to WebKit (see <rdar://problem/46431552>).
+
+        * platform/ios/WebEvent.mm:
+        (-[WebEvent initWithKeyEventType:timeStamp:characters:charactersIgnoringModifiers:modifiers:isRepeating:withFlags:withInputManagerHint:keyCode:isTabKey:]):
+
 2019-05-22  Ali Juma  <ajuma@chromium.org>
 

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

@@ -194 +194 @@
 
     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;
+        }
         _characters = [normalizedStringWithAppKitCompatibilityMapping(characters, keyCode) retain];
         _charactersIgnoringModifiers = [normalizedStringWithAppKitCompatibilityMapping(charactersIgnoringModifiers, keyCode) retain];