<!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>[237011] trunk/Source/WebKit</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/237011">237011</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2018-10-10 11:43:20 -0700 (Wed, 10 Oct 2018)</dd>
</dl>

<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/236678">r236678</a>): Keyboard scrolling with arrow keys doesn't work on iOS
https://bugs.webkit.org/show_bug.cgi?id=190433
<rdar://problem/45111986>

Reviewed by Simon Fraser.

* UIProcess/ios/WKKeyboardScrollingAnimator.mm:
(-[WKKeyboardScrollingAnimator keyboardScrollForEvent:]):
(-[WKKeyboardScrollingAnimator beginWithEvent:]): Deleted.
(-[WKKeyboardScrollViewAnimator beginWithEvent:]): Deleted.
<a href="http://trac.webkit.org/projects/webkit/changeset/236678">r236678</a> changes the characters in charactersIgnoringModifiers to match AppKit.
We similarly need to update WKKeyboardScrollingAnimator's comparison.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitUIProcessiosWKKeyboardScrollingAnimatormm">trunk/Source/WebKit/UIProcess/ios/WKKeyboardScrollingAnimator.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (237010 => 237011)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2018-10-10 18:34:49 UTC (rev 237010)
+++ trunk/Source/WebKit/ChangeLog       2018-10-10 18:43:20 UTC (rev 237011)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2018-10-10  Tim Horton  <timothy_horton@apple.com>
+
+        REGRESSION (r236678): Keyboard scrolling with arrow keys doesn't work on iOS
+        https://bugs.webkit.org/show_bug.cgi?id=190433
+        <rdar://problem/45111986>
+
+        Reviewed by Simon Fraser.
+
+        * UIProcess/ios/WKKeyboardScrollingAnimator.mm:
+        (-[WKKeyboardScrollingAnimator keyboardScrollForEvent:]):
+        (-[WKKeyboardScrollingAnimator beginWithEvent:]): Deleted.
+        (-[WKKeyboardScrollViewAnimator beginWithEvent:]): Deleted.
+        r236678 changes the characters in charactersIgnoringModifiers to match AppKit.
+        We similarly need to update WKKeyboardScrollingAnimator's comparison.
+
</ins><span class="cx"> 2018-10-10  Yusuke Suzuki  <yusukesuzuki@slowstart.org>
</span><span class="cx"> 
</span><span class="cx">         [JSC] Rename createXXX to tryCreateXXX if it can return RefPtr
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosWKKeyboardScrollingAnimatormm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ios/WKKeyboardScrollingAnimator.mm (237010 => 237011)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/ios/WKKeyboardScrollingAnimator.mm 2018-10-10 18:34:49 UTC (rev 237010)
+++ trunk/Source/WebKit/UIProcess/ios/WKKeyboardScrollingAnimator.mm    2018-10-10 18:43:20 UTC (rev 237011)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #import "UIKitSPI.h"
</span><span class="cx"> #import <QuartzCore/CADisplayLink.h>
</span><span class="cx"> #import <WebCore/FloatPoint.h>
</span><ins>+#import <WebCore/KeyEventCodesIOS.h>
</ins><span class="cx"> #import <WebCore/RectEdges.h>
</span><span class="cx"> #import <WebCore/WebEvent.h>
</span><span class="cx"> #import <WebKit/UIKitSPI.h>
</span><span class="lines">@@ -190,21 +191,25 @@
</span><span class="cx">     enum class Key : uint8_t { Other, LeftArrow, RightArrow, UpArrow, DownArrow, PageUp, PageDown, Space };
</span><span class="cx">     
</span><span class="cx">     auto key = ^{
</span><del>-        if ([charactersIgnoringModifiers isEqualToString:UIKeyInputLeftArrow])
</del><ins>+        auto firstCharacter = [charactersIgnoringModifiers characterAtIndex:0];
+        switch (firstCharacter) {
+        case NSLeftArrowFunctionKey:
</ins><span class="cx">             return Key::LeftArrow;
</span><del>-        if ([charactersIgnoringModifiers isEqualToString:UIKeyInputRightArrow])
</del><ins>+        case NSRightArrowFunctionKey:
</ins><span class="cx">             return Key::RightArrow;
</span><del>-        if ([charactersIgnoringModifiers isEqualToString:UIKeyInputUpArrow])
</del><ins>+        case NSUpArrowFunctionKey:
</ins><span class="cx">             return Key::UpArrow;
</span><del>-        if ([charactersIgnoringModifiers isEqualToString:UIKeyInputDownArrow])
</del><ins>+        case NSDownArrowFunctionKey:
</ins><span class="cx">             return Key::DownArrow;
</span><del>-        if ([charactersIgnoringModifiers isEqualToString:UIKeyInputPageDown])
</del><ins>+        case NSPageDownFunctionKey:
</ins><span class="cx">             return Key::PageDown;
</span><del>-        if ([charactersIgnoringModifiers isEqualToString:UIKeyInputPageUp])
</del><ins>+        case NSPageUpFunctionKey:
</ins><span class="cx">             return Key::PageUp;
</span><del>-        if ([charactersIgnoringModifiers characterAtIndex:0] == kWebSpaceKey)
</del><ins>+        case kWebSpaceKey:
</ins><span class="cx">             return Key::Space;
</span><del>-        return Key::Other;
</del><ins>+        default:
+            return Key::Other;
+        };
</ins><span class="cx">     }();
</span><span class="cx">     
</span><span class="cx">     if (key == Key::Other)
</span></span></pre>
</div>
</div>

</body>
</html>