<!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>[243543] tags/Safari-608.1.13.2/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/243543">243543</a></dd>
<dt>Author</dt> <dd>alancoon@apple.com</dd>
<dt>Date</dt> <dd>2019-03-27 08:46:26 -0700 (Wed, 27 Mar 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Cherry-pick <a href="http://trac.webkit.org/projects/webkit/changeset/243454">r243454</a>. rdar://problem/48702444

    Animated keyboard scrolling is extremely chaotic
    https://bugs.webkit.org/show_bug.cgi?id=196164
    <rdar://problem/48702444>

    Reviewed by Simon Fraser.

    * UIProcess/ios/WKContentViewInteraction.mm:
    (-[WKContentView _interpretKeyEvent:isCharEvent:]):
    Consume keyboard events instead of interpreting them traditionally
    if WKKeyboardScrollingAnimator is animating.

    * UIProcess/ios/WKKeyboardScrollingAnimator.h:
    * UIProcess/ios/WKKeyboardScrollingAnimator.mm:
    (-[WKKeyboardScrollingAnimator beginWithEvent:]):
    (-[WKKeyboardScrollingAnimator handleKeyEvent:]):
    (-[WKKeyboardScrollingAnimator stopAnimatedScroll]):
    (-[WKKeyboardScrollingAnimator scrollTriggeringKeyIsPressed]):
    (-[WKKeyboardScrollingAnimator displayLinkFired:]):
    (-[WKKeyboardScrollViewAnimator scrollTriggeringKeyIsPressed]):
    Expose the current state of interactive scrolling, and rename the related member.

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@243454 268f45cc-cd09-0410-ab3c-d52691b4dbfc</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari6081132SourceWebKitChangeLog">tags/Safari-608.1.13.2/Source/WebKit/ChangeLog</a></li>
<li><a href="#tagsSafari6081132SourceWebKitUIProcessiosWKContentViewInteractionmm">tags/Safari-608.1.13.2/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm</a></li>
<li><a href="#tagsSafari6081132SourceWebKitUIProcessiosWKKeyboardScrollingAnimatorh">tags/Safari-608.1.13.2/Source/WebKit/UIProcess/ios/WKKeyboardScrollingAnimator.h</a></li>
<li><a href="#tagsSafari6081132SourceWebKitUIProcessiosWKKeyboardScrollingAnimatormm">tags/Safari-608.1.13.2/Source/WebKit/UIProcess/ios/WKKeyboardScrollingAnimator.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari6081132SourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-608.1.13.2/Source/WebKit/ChangeLog (243542 => 243543)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-608.1.13.2/Source/WebKit/ChangeLog   2019-03-27 15:29:33 UTC (rev 243542)
+++ tags/Safari-608.1.13.2/Source/WebKit/ChangeLog      2019-03-27 15:46:26 UTC (rev 243543)
</span><span class="lines">@@ -1,3 +1,54 @@
</span><ins>+2019-03-27  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r243454. rdar://problem/48702444
+
+    Animated keyboard scrolling is extremely chaotic
+    https://bugs.webkit.org/show_bug.cgi?id=196164
+    <rdar://problem/48702444>
+    
+    Reviewed by Simon Fraser.
+    
+    * UIProcess/ios/WKContentViewInteraction.mm:
+    (-[WKContentView _interpretKeyEvent:isCharEvent:]):
+    Consume keyboard events instead of interpreting them traditionally
+    if WKKeyboardScrollingAnimator is animating.
+    
+    * UIProcess/ios/WKKeyboardScrollingAnimator.h:
+    * UIProcess/ios/WKKeyboardScrollingAnimator.mm:
+    (-[WKKeyboardScrollingAnimator beginWithEvent:]):
+    (-[WKKeyboardScrollingAnimator handleKeyEvent:]):
+    (-[WKKeyboardScrollingAnimator stopAnimatedScroll]):
+    (-[WKKeyboardScrollingAnimator scrollTriggeringKeyIsPressed]):
+    (-[WKKeyboardScrollingAnimator displayLinkFired:]):
+    (-[WKKeyboardScrollViewAnimator scrollTriggeringKeyIsPressed]):
+    Expose the current state of interactive scrolling, and rename the related member.
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@243454 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-03-25  Tim Horton  <timothy_horton@apple.com>
+
+            Animated keyboard scrolling is extremely chaotic
+            https://bugs.webkit.org/show_bug.cgi?id=196164
+            <rdar://problem/48702444>
+
+            Reviewed by Simon Fraser.
+
+            * UIProcess/ios/WKContentViewInteraction.mm:
+            (-[WKContentView _interpretKeyEvent:isCharEvent:]):
+            Consume keyboard events instead of interpreting them traditionally
+            if WKKeyboardScrollingAnimator is animating.
+
+            * UIProcess/ios/WKKeyboardScrollingAnimator.h:
+            * UIProcess/ios/WKKeyboardScrollingAnimator.mm:
+            (-[WKKeyboardScrollingAnimator beginWithEvent:]):
+            (-[WKKeyboardScrollingAnimator handleKeyEvent:]):
+            (-[WKKeyboardScrollingAnimator stopAnimatedScroll]):
+            (-[WKKeyboardScrollingAnimator scrollTriggeringKeyIsPressed]):
+            (-[WKKeyboardScrollingAnimator displayLinkFired:]):
+            (-[WKKeyboardScrollViewAnimator scrollTriggeringKeyIsPressed]):
+            Expose the current state of interactive scrolling, and rename the related member.
+
</ins><span class="cx"> 2019-03-22  Alan Coon  <alancoon@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Cherry-pick r243392. rdar://problem/49123855
</span></span></pre></div>
<a id="tagsSafari6081132SourceWebKitUIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-608.1.13.2/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (243542 => 243543)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-608.1.13.2/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm   2019-03-27 15:29:33 UTC (rev 243542)
+++ tags/Safari-608.1.13.2/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm      2019-03-27 15:46:26 UTC (rev 243543)
</span><span class="lines">@@ -4449,7 +4449,7 @@
</span><span class="cx">     if (!contentEditable && event.isTabKey)
</span><span class="cx">         return NO;
</span><span class="cx"> 
</span><del>-    if ([_keyboardScrollingAnimator beginWithEvent:event])
</del><ins>+    if ([_keyboardScrollingAnimator beginWithEvent:event] || [_keyboardScrollingAnimator scrollTriggeringKeyIsPressed])
</ins><span class="cx">         return YES;
</span><span class="cx"> 
</span><span class="cx">     UIKeyboardImpl *keyboard = [UIKeyboardImpl sharedInstance];
</span></span></pre></div>
<a id="tagsSafari6081132SourceWebKitUIProcessiosWKKeyboardScrollingAnimatorh"></a>
<div class="modfile"><h4>Modified: tags/Safari-608.1.13.2/Source/WebKit/UIProcess/ios/WKKeyboardScrollingAnimator.h (243542 => 243543)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-608.1.13.2/Source/WebKit/UIProcess/ios/WKKeyboardScrollingAnimator.h 2019-03-27 15:29:33 UTC (rev 243542)
+++ tags/Safari-608.1.13.2/Source/WebKit/UIProcess/ios/WKKeyboardScrollingAnimator.h    2019-03-27 15:46:26 UTC (rev 243543)
</span><span class="lines">@@ -62,6 +62,8 @@
</span><span class="cx"> - (BOOL)beginWithEvent:(::WebEvent *)event;
</span><span class="cx"> - (void)handleKeyEvent:(::WebEvent *)event;
</span><span class="cx"> 
</span><ins>+- (BOOL)scrollTriggeringKeyIsPressed;
+
</ins><span class="cx"> @property (nonatomic, weak) id <WKKeyboardScrollViewAnimatorDelegate> delegate;
</span><span class="cx"> 
</span><span class="cx"> @end
</span></span></pre></div>
<a id="tagsSafari6081132SourceWebKitUIProcessiosWKKeyboardScrollingAnimatormm"></a>
<div class="modfile"><h4>Modified: tags/Safari-608.1.13.2/Source/WebKit/UIProcess/ios/WKKeyboardScrollingAnimator.mm (243542 => 243543)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-608.1.13.2/Source/WebKit/UIProcess/ios/WKKeyboardScrollingAnimator.mm        2019-03-27 15:29:33 UTC (rev 243542)
+++ tags/Safari-608.1.13.2/Source/WebKit/UIProcess/ios/WKKeyboardScrollingAnimator.mm   2019-03-27 15:46:26 UTC (rev 243543)
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> 
</span><span class="cx">     Optional<WebKit::KeyboardScroll> _currentScroll;
</span><span class="cx"> 
</span><del>-    BOOL _hasPressedScrollingKey;
</del><ins>+    BOOL _scrollTriggeringKeyIsPressed;
</ins><span class="cx"> 
</span><span class="cx">     WebCore::FloatSize _velocity; // Points per second.
</span><span class="cx"> 
</span><span class="lines">@@ -295,13 +295,13 @@
</span><span class="cx">     if (!scroll)
</span><span class="cx">         return NO;
</span><span class="cx"> 
</span><del>-    if (_hasPressedScrollingKey)
</del><ins>+    if (_scrollTriggeringKeyIsPressed)
</ins><span class="cx">         return NO;
</span><span class="cx"> 
</span><span class="cx">     if (![_scrollable rubberbandableDirections].at(boxSide(scroll->direction)))
</span><span class="cx">         return NO;
</span><span class="cx"> 
</span><del>-    _hasPressedScrollingKey = YES;
</del><ins>+    _scrollTriggeringKeyIsPressed = YES;
</ins><span class="cx">     _currentScroll = scroll;
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(ANIMATED_KEYBOARD_SCROLLING)
</span><span class="lines">@@ -328,13 +328,13 @@
</span><span class="cx"> 
</span><span class="cx"> - (void)handleKeyEvent:(::WebEvent *)event
</span><span class="cx"> {
</span><del>-    if (!_hasPressedScrollingKey)
</del><ins>+    if (!_scrollTriggeringKeyIsPressed)
</ins><span class="cx">         return;
</span><span class="cx"> 
</span><span class="cx">     auto scroll = [self keyboardScrollForEvent:event];
</span><span class="cx">     if (!scroll || event.type == WebEventKeyUp) {
</span><span class="cx">         [self stopAnimatedScroll];
</span><del>-        _hasPressedScrollingKey = NO;
</del><ins>+        _scrollTriggeringKeyIsPressed = NO;
</ins><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -382,6 +382,11 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+- (BOOL)scrollTriggeringKeyIsPressed
+{
+    return _scrollTriggeringKeyIsPressed;
+}
+
</ins><span class="cx"> - (void)willStartInteractiveScroll
</span><span class="cx"> {
</span><span class="cx">     // If the user touches the screen to start an interactive scroll, stop everything.
</span><span class="lines">@@ -458,7 +463,7 @@
</span><span class="cx"> 
</span><span class="cx">     // If we've effectively stopped scrolling, and no key is pressed,
</span><span class="cx">     // shut down the display link.
</span><del>-    if (!_hasPressedScrollingKey && _velocity.diagonalLengthSquared() < 1) {
</del><ins>+    if (!_scrollTriggeringKeyIsPressed && _velocity.diagonalLengthSquared() < 1) {
</ins><span class="cx">         [_scrollable didFinishScrolling];
</span><span class="cx">         [self stopDisplayLink];
</span><span class="cx">         _velocity = { };
</span><span class="lines">@@ -564,6 +569,11 @@
</span><span class="cx">     return [_animator handleKeyEvent:event];
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+- (BOOL)scrollTriggeringKeyIsPressed
+{
+    return [_animator scrollTriggeringKeyIsPressed];
+}
+
</ins><span class="cx"> - (BOOL)isKeyboardScrollable
</span><span class="cx"> {
</span><span class="cx">     if (!_delegateRespondsToIsKeyboardScrollable)
</span></span></pre>
</div>
</div>

</body>
</html>