<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[200969] trunk/Source/WebKit/mac</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/200969">200969</a></dd>
<dt>Author</dt> <dd>enrica@apple.com</dd>
<dt>Date</dt> <dd>2016-05-16 14:42:07 -0700 (Mon, 16 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>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:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebHTMLViewmm">trunk/Source/WebKit/mac/WebView/WebHTMLView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (200968 => 200969)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-05-13 Enrica Casucci <enrica@apple.com>
+
+ 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:]):
+
+
</ins><span class="cx"> 2016-05-13 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r200894.
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebHTMLViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (200968 => 200969)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -6511,10 +6511,6 @@
</span><span class="cx"> #define kWebBackspaceKey 0x0008
</span><span class="cx"> #define kWebReturnKey 0x000d
</span><span class="cx"> #define kWebDeleteKey 0x007F
</span><del>-#define kWebLeftArrowKey 0x00AC
-#define kWebUpArrowKey 0x00AD
-#define kWebRightArrowKey 0x00AE
-#define kWebDownArrowKey 0x00AF
</del><span class="cx"> #define kWebDeleteForwardKey 0xF728
</span><span class="cx">
</span><span class="cx"> - (BOOL)_handleEditingKeyEvent:(KeyboardEvent *)wcEvent
</span><span class="lines">@@ -6526,79 +6522,36 @@
</span><span class="cx"> // embedded as the whole view, as in Mail, and tabs should input tabs as expected
</span><span class="cx"> // in a text editor.
</span><span class="cx">
</span><del>- // FIXME - this code will break when content editable is supported.
</del><span class="cx"> if (const PlatformKeyboardEvent* platformEvent = wcEvent->keyEvent()) {
</span><span class="cx"> WebEvent *event = platformEvent->event();
</span><span class="cx"> if (![[self _webView] isEditable] && event.isTabKey)
</span><span class="cx"> return NO;
</span><span class="cx">
</span><del>- // 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;
</del><ins>+ 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;
</ins><span class="cx"> }
</span><del>- 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;
</del><ins>+ break;
+ case kWebDeleteForwardKey:
+ [self deleteForward:self];
+ return YES;
+ default:
+ if (platformEvent->type() == PlatformKeyboardEvent::Char) {
+ [[webView _UIKitDelegateForwarder] addInputString:event.characters withFlags:event.keyboardFlags];
+ return YES;
</ins><span class="cx"> }
</span><del>- default:
- return NO;
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> return NO;
</span></span></pre>
</div>
</div>
</body>
</html>