<!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>[244471] trunk/Source</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/244471">244471</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2019-04-19 14:53:22 -0700 (Fri, 19 Apr 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Use existing KeyEventCodesIOS constants instead of duplicating them
https://bugs.webkit.org/show_bug.cgi?id=197081

Rubber-stamped by Wenson Hsieh.

Source/WebKit:

* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView _interpretKeyEvent:isCharEvent:]): While I am here, remove the case for the space key
as it is identical to the default switch case.

Source/WebKitLegacy/mac:

* WebView/WebHTMLView.mm:
(-[WebHTMLView _handleEditingKeyEvent:]):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitUIProcessiosWKContentViewInteractionmm">trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm</a></li>
<li><a href="#trunkSourceWebKitLegacymacChangeLog">trunk/Source/WebKitLegacy/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitLegacymacWebViewWebHTMLViewmm">trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (244470 => 244471)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2019-04-19 21:47:32 UTC (rev 244470)
+++ trunk/Source/WebKit/ChangeLog       2019-04-19 21:53:22 UTC (rev 244471)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2019-04-18  Daniel Bates  <dabates@apple.com>
+
+        Use existing KeyEventCodesIOS constants instead of duplicating them
+        https://bugs.webkit.org/show_bug.cgi?id=197081
+
+        Rubber-stamped by Wenson Hsieh.
+
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView _interpretKeyEvent:isCharEvent:]): While I am here, remove the case for the space key
+        as it is identical to the default switch case.
+
</ins><span class="cx"> 2019-04-19  Keith Rollin  <krollin@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Add postprocess-header-rule scripts
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (244470 => 244471)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm    2019-04-19 21:47:32 UTC (rev 244470)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm       2019-04-19 21:53:22 UTC (rev 244471)
</span><span class="lines">@@ -83,6 +83,7 @@
</span><span class="cx"> #import <WebCore/FloatQuad.h>
</span><span class="cx"> #import <WebCore/FontAttributeChanges.h>
</span><span class="cx"> #import <WebCore/InputMode.h>
</span><ins>+#import <WebCore/KeyEventCodesIOS.h>
</ins><span class="cx"> #import <WebCore/LocalizedStrings.h>
</span><span class="cx"> #import <WebCore/NotImplemented.h>
</span><span class="cx"> #import <WebCore/Pasteboard.h>
</span><span class="lines">@@ -4503,12 +4504,6 @@
</span><span class="cx"> 
</span><span class="cx"> - (BOOL)_interpretKeyEvent:(::WebEvent *)event isCharEvent:(BOOL)isCharEvent
</span><span class="cx"> {
</span><del>-    static const unsigned kWebEnterKey = 0x0003;
-    static const unsigned kWebBackspaceKey = 0x0008;
-    static const unsigned kWebReturnKey = 0x000D;
-    static const unsigned kWebDeleteKey = 0x007F;
-    static const unsigned kWebSpaceKey = 0x20;
-
</del><span class="cx">     if (event.keyboardFlags & WebEventKeyboardInputModifierFlagsChanged)
</span><span class="cx">         return NO;
</span><span class="cx"> 
</span><span class="lines">@@ -4534,30 +4529,21 @@
</span><span class="cx">         return NO;
</span><span class="cx"> 
</span><span class="cx">     switch ([characters characterAtIndex:0]) {
</span><del>-    case kWebBackspaceKey:
-    case kWebDeleteKey:
</del><ins>+    case NSBackspaceCharacter:
+    case NSDeleteCharacter:
</ins><span class="cx">         if (contentEditable) {
</span><span class="cx">             [keyboard deleteFromInputWithFlags:event.keyboardFlags];
</span><span class="cx">             return YES;
</span><span class="cx">         }
</span><span class="cx">         break;
</span><del>-
-    case kWebSpaceKey:
</del><ins>+    case NSEnterCharacter:
+    case NSCarriageReturnCharacter:
</ins><span class="cx">         if (contentEditable && isCharEvent) {
</span><del>-            [keyboard addInputString:event.characters withFlags:event.keyboardFlags withInputManagerHint:event.inputManagerHint];
-            return YES;
-        }
-        break;
-
-    case kWebEnterKey:
-    case kWebReturnKey:
-        if (contentEditable && isCharEvent) {
</del><span class="cx">             // Map \r from HW keyboard to \n to match the behavior of the soft keyboard.
</span><span class="cx">             [keyboard addInputString:@"\n" withFlags:0 withInputManagerHint:nil];
</span><span class="cx">             return YES;
</span><span class="cx">         }
</span><span class="cx">         break;
</span><del>-
</del><span class="cx">     default:
</span><span class="cx">         if (contentEditable && isCharEvent) {
</span><span class="cx">             [keyboard addInputString:event.characters withFlags:event.keyboardFlags withInputManagerHint:event.inputManagerHint];
</span></span></pre></div>
<a id="trunkSourceWebKitLegacymacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (244470 => 244471)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/mac/ChangeLog  2019-04-19 21:47:32 UTC (rev 244470)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog     2019-04-19 21:53:22 UTC (rev 244471)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2019-04-18  Daniel Bates  <dabates@apple.com>
+
+        Use existing KeyEventCodesIOS constants instead of duplicating them
+        https://bugs.webkit.org/show_bug.cgi?id=197081
+
+        Rubber-stamped by Wenson Hsieh.
+
+        * WebView/WebHTMLView.mm:
+        (-[WebHTMLView _handleEditingKeyEvent:]):
+
</ins><span class="cx"> 2019-04-18  Ryosuke Niwa  <rniwa@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         Crash in FrameLoader::stopAllLoaders via [WebView dealloc] inside ~ObjCEventListener
</span></span></pre></div>
<a id="trunkSourceWebKitLegacymacWebViewWebHTMLViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm (244470 => 244471)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm     2019-04-19 21:47:32 UTC (rev 244470)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm        2019-04-19 21:53:22 UTC (rev 244471)
</span><span class="lines">@@ -6069,11 +6069,6 @@
</span><span class="cx"> 
</span><span class="cx"> #if PLATFORM(IOS_FAMILY)
</span><span class="cx">     
</span><del>-#define kWebEnterKey         0x0003
-#define kWebBackspaceKey     0x0008
-#define kWebReturnKey        0x000d
-#define kWebDeleteKey        0x007F
-    
</del><span class="cx"> - (BOOL)_handleEditingKeyEvent:(KeyboardEvent *)wcEvent
</span><span class="cx"> {
</span><span class="cx">     // Use the isEditable state to determine whether or not to process tab key events.
</span><span class="lines">@@ -6105,12 +6100,12 @@
</span><span class="cx">         if (!s.length)
</span><span class="cx">             return NO;
</span><span class="cx">         switch ([s characterAtIndex:0]) {
</span><del>-        case kWebBackspaceKey:
-        case kWebDeleteKey:
</del><ins>+        case NSBackspaceCharacter:
+        case NSDeleteCharacter:
</ins><span class="cx">             [[webView _UIKitDelegateForwarder] deleteFromInputWithFlags:event.keyboardFlags];
</span><span class="cx">             return YES;
</span><del>-        case kWebEnterKey:
-        case kWebReturnKey:
</del><ins>+        case NSEnterCharacter:
+        case NSCarriageReturnCharacter:
</ins><span class="cx">             if (isCharEvent) {
</span><span class="cx">                 // Map \r from HW keyboard to \n to match the behavior of the soft keyboard.
</span><span class="cx">                 [[webView _UIKitDelegateForwarder] addInputString:@"\n" withFlags:0];
</span></span></pre>
</div>
</div>

</body>
</html>