Changeset 247232 in webkit
- Timestamp:
- Jul 8, 2019 4:07:03 PM (5 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r247229 r247232 1 2019-07-08 Daniel Bates <dabates@apple.com> 2 3 Command + . generates Escape with key identifier Period, should be Escape 4 https://bugs.webkit.org/show_bug.cgi?id=199393 5 <rdar://problem/52498001> 6 7 Reviewed by Wenson Hsieh. 8 9 Update test result. 10 11 * fast/events/ios/key-events-comprehensive/key-events-meta-expected.txt: 12 1 13 2019-07-08 Charlie Turner <cturner@igalia.com> 2 14 -
trunk/LayoutTests/fast/events/ios/key-events-comprehensive/key-events-meta-expected.txt
r246450 r247232 147 147 Test Command + .: 148 148 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 149 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: 0150 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: 0149 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 150 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 151 151 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 152 152 -
trunk/Source/WebCore/ChangeLog
r247231 r247232 1 2019-07-08 Daniel Bates <dabates@apple.com> 2 3 Command + . generates Escape with key identifier Period, should be Escape 4 https://bugs.webkit.org/show_bug.cgi?id=199393 5 <rdar://problem/52498001> 6 7 Reviewed by Wenson Hsieh. 8 9 Remap the key code for Command + . before we compute the Windows virtual key code. 10 Otherwise, the Windows virtual key code reveals the pre-mapped key code. 11 12 * platform/ios/WebEvent.mm: 13 (-[WebEvent initWithKeyEventType:timeStamp:characters:charactersIgnoringModifiers:modifiers:isRepeating:withFlags:withInputManagerHint:keyCode:isTabKey:]): 14 1 15 2019-07-08 Alex Christensen <achristensen@webkit.org> 2 16 -
trunk/Source/WebCore/platform/ios/WebEvent.mm
r245644 r247232 186 186 _keyboardFlags = flags; 187 187 _inputManagerHint = [hint retain]; 188 189 BOOL flagsChanged = _keyboardFlags & WebEventKeyboardInputModifierFlagsChanged; 190 if (!flagsChanged) { 191 // Map Command + . to Escape since Apple Smart Keyboards lack an Escape key. 192 // FIXME: This doesn't work for some keyboard layouts, like French. See <rdar://problem/51047011>. 193 if ([charactersIgnoringModifiers isEqualToString:@"."] && (modifiers & WebEventFlagMaskCommandKey)) { 194 keyCode = kHIDUsage_KeyboardEscape; 195 _modifierFlags &= ~WebEventFlagMaskCommandKey; 196 } 197 } 198 188 199 if (keyCode) 189 200 _keyCode = windowsKeyCodeForKeyCode(keyCode); … … 193 204 } 194 205 195 if (!(_keyboardFlags & WebEventKeyboardInputModifierFlagsChanged)) { 196 // Map Command + . to Escape since Apple Smart Keyboards lack an Escape key. 197 if ([charactersIgnoringModifiers isEqualToString:@"."] && (modifiers & WebEventFlagMaskCommandKey)) { 198 keyCode = kHIDUsage_KeyboardEscape; 199 _modifierFlags &= ~WebEventFlagMaskCommandKey; 200 } 206 if (!flagsChanged) { 201 207 _characters = [normalizedStringWithAppKitCompatibilityMapping(characters, keyCode) retain]; 202 208 _charactersIgnoringModifiers = [normalizedStringWithAppKitCompatibilityMapping(charactersIgnoringModifiers, keyCode) retain];
Note: See TracChangeset
for help on using the changeset viewer.