Title: [200969] trunk/Source/WebKit/mac
- Revision
- 200969
- Author
- [email protected]
- Date
- 2016-05-16 14:42:07 -0700 (Mon, 16 May 2016)
Log Message
Remove unused initializer for WebEvent on iOS.
https://bugs.webkit.org/show_bug.cgi?id=157689
Reviewed by Anders Carlsson.
Removing use of characterSet property.
* WebView/WebHTMLView.mm:
(-[WebHTMLView _handleEditingKeyEvent:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (200968 => 200969)
--- trunk/Source/WebKit/mac/ChangeLog 2016-05-16 21:39:04 UTC (rev 200968)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-05-16 21:42:07 UTC (rev 200969)
@@ -1,3 +1,16 @@
+2016-05-13 Enrica Casucci <[email protected]>
+
+ Remove unused initializer for WebEvent on iOS.
+ https://bugs.webkit.org/show_bug.cgi?id=157689
+
+ Reviewed by Anders Carlsson.
+
+ Removing use of characterSet property.
+
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView _handleEditingKeyEvent:]):
+
+
2016-05-13 Commit Queue <[email protected]>
Unreviewed, rolling out r200894.
Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (200968 => 200969)
--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2016-05-16 21:39:04 UTC (rev 200968)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2016-05-16 21:42:07 UTC (rev 200969)
@@ -6511,10 +6511,6 @@
#define kWebBackspaceKey 0x0008
#define kWebReturnKey 0x000d
#define kWebDeleteKey 0x007F
-#define kWebLeftArrowKey 0x00AC
-#define kWebUpArrowKey 0x00AD
-#define kWebRightArrowKey 0x00AE
-#define kWebDownArrowKey 0x00AF
#define kWebDeleteForwardKey 0xF728
- (BOOL)_handleEditingKeyEvent:(KeyboardEvent *)wcEvent
@@ -6526,79 +6522,36 @@
// embedded as the whole view, as in Mail, and tabs should input tabs as expected
// in a text editor.
- // FIXME - this code will break when content editable is supported.
if (const PlatformKeyboardEvent* platformEvent = wcEvent->keyEvent()) {
WebEvent *event = platformEvent->event();
if (![[self _webView] isEditable] && event.isTabKey)
return NO;
- // Now process the key normally
- BOOL shift = platformEvent->shiftKey();
-
- switch (event.characterSet) {
- case WebEventCharacterSetSymbol: {
- SEL sel = 0;
- NSString *s = [event charactersIgnoringModifiers];
- if ([s length] == 0)
- break;
- switch ([s characterAtIndex:0]) {
- case kWebLeftArrowKey:
- sel = shift ? @selector(moveLeftAndModifySelection:) : @selector(moveLeft:);
- break;
- case kWebUpArrowKey:
- sel = shift ? @selector(moveUpAndModifySelection:) : @selector(moveUp:);
- break;
- case kWebRightArrowKey:
- sel = shift ? @selector(moveRightAndModifySelection:) : @selector(moveRight:);
- break;
- case kWebDownArrowKey:
- sel = shift ? @selector(moveDownAndModifySelection:) : @selector(moveDown:);
- break;
- }
- if (sel) {
- [self performSelector:sel withObject:self];
- return YES;
- }
- break;
+ NSString *s = [event characters];
+ if (!s.length)
+ return NO;
+ WebView* webView = [self _webView];
+ switch ([s characterAtIndex:0]) {
+ case kWebBackspaceKey:
+ case kWebDeleteKey:
+ [[webView _UIKitDelegateForwarder] deleteFromInputWithFlags:event.keyboardFlags];
+ return YES;
+ case kWebEnterKey:
+ case kWebReturnKey:
+ if (platformEvent->type() == PlatformKeyboardEvent::Char) {
+ // Map \r from HW keyboard to \n to match the behavior of the soft keyboard.
+ [[webView _UIKitDelegateForwarder] addInputString:@"\n" withFlags:0];
+ return YES;
}
- case WebEventCharacterSetASCII:
- case WebEventCharacterSetUnicode: {
- NSString *s = [event characters];
- if ([s length] == 0)
- break;
- WebView* webView = [self _webView];
- switch ([s characterAtIndex:0]) {
- case kWebBackspaceKey:
- case kWebDeleteKey:
- // FIXME: remove the call to deleteFromInput when UIKit implements deleteFromInputWithFlags.
- if ([webView respondsToSelector:@selector(deleteFromInputWithFlags:)])
- [[webView _UIKitDelegateForwarder] deleteFromInputWithFlags:event.keyboardFlags];
- else
- [[webView _UIKitDelegateForwarder] deleteFromInput];
- return YES;
- case kWebEnterKey:
- case kWebReturnKey:
- if (platformEvent->type() == PlatformKeyboardEvent::Char) {
- // Map \r from HW keyboard to \n to match the behavior of the soft keyboard.
- [[webView _UIKitDelegateForwarder] addInputString:@"\n" withFlags:0];
- return YES;
- }
- return NO;
- case kWebDeleteForwardKey:
- [self deleteForward:self];
- return YES;
- default: {
- if (platformEvent->type() == PlatformKeyboardEvent::Char) {
- [[webView _UIKitDelegateForwarder] addInputString:event.characters withFlags:event.keyboardFlags];
- return YES;
- }
- return NO;
- }
- }
- break;
+ break;
+ case kWebDeleteForwardKey:
+ [self deleteForward:self];
+ return YES;
+ default:
+ if (platformEvent->type() == PlatformKeyboardEvent::Char) {
+ [[webView _UIKitDelegateForwarder] addInputString:event.characters withFlags:event.keyboardFlags];
+ return YES;
}
- default:
- return NO;
}
}
return NO;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
