<!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>[242695] 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/242695">242695</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2019-03-10 19:54:55 -0700 (Sun, 10 Mar 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>iOS: Using ⌥ to scroll horizontally is no different than arrow key
https://bugs.webkit.org/show_bug.cgi?id=195268
<rdar://problem/48326682>

Reviewed by Brent Fulgham.

* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView keyboardScrollViewAnimator:distanceForIncrement:inDirection:]):
(-[WKContentView keyboardScrollViewAnimator:distanceForIncrement:]): Deleted.
* UIProcess/ios/WKKeyboardScrollingAnimator.h:
* UIProcess/ios/WKKeyboardScrollingAnimator.mm:
(-[WKKeyboardScrollingAnimator keyboardScrollForEvent:]):
(-[WKKeyboardScrollViewAnimator setDelegate:]):
(-[WKKeyboardScrollViewAnimator distanceForIncrement:inDirection:]):
(-[WKKeyboardScrollViewAnimator distanceForIncrement:]): Deleted.
Add a direction parameter to -distanceForIncrement:, so the client
can return a different page/document size based on the scrolling axis.
Adopt it both in the default implementation and in WKContentViewInteraction.
Make the option key scroll by page when scrolling horizontally, like it
does when scrolling vertically.</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="#trunkSourceWebKitUIProcessiosWKKeyboardScrollingAnimatorh">trunk/Source/WebKit/UIProcess/ios/WKKeyboardScrollingAnimator.h</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 (242694 => 242695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2019-03-11 02:36:23 UTC (rev 242694)
+++ trunk/Source/WebKit/ChangeLog       2019-03-11 02:54:55 UTC (rev 242695)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2019-03-10  Tim Horton  <timothy_horton@apple.com>
+
+        iOS: Using ⌥ to scroll horizontally is no different than arrow key
+        https://bugs.webkit.org/show_bug.cgi?id=195268
+        <rdar://problem/48326682>
+
+        Reviewed by Brent Fulgham.
+
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView keyboardScrollViewAnimator:distanceForIncrement:inDirection:]):
+        (-[WKContentView keyboardScrollViewAnimator:distanceForIncrement:]): Deleted.
+        * UIProcess/ios/WKKeyboardScrollingAnimator.h:
+        * UIProcess/ios/WKKeyboardScrollingAnimator.mm:
+        (-[WKKeyboardScrollingAnimator keyboardScrollForEvent:]):
+        (-[WKKeyboardScrollViewAnimator setDelegate:]):
+        (-[WKKeyboardScrollViewAnimator distanceForIncrement:inDirection:]):
+        (-[WKKeyboardScrollViewAnimator distanceForIncrement:]): Deleted.
+        Add a direction parameter to -distanceForIncrement:, so the client
+        can return a different page/document size based on the scrolling axis.
+        Adopt it both in the default implementation and in WKContentViewInteraction.
+        Make the option key scroll by page when scrolling horizontally, like it
+        does when scrolling vertically.
+
</ins><span class="cx"> 2019-03-10  David Quesada  <david_quesada@apple.com>
</span><span class="cx"> 
</span><span class="cx">         ASSERT(m_downloads.isEmpty()) fails in DownloadProxyMap::~DownloadProxyMap()
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (242694 => 242695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm    2019-03-11 02:36:23 UTC (rev 242694)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm       2019-03-11 02:54:55 UTC (rev 242695)
</span><span class="lines">@@ -4432,13 +4432,19 @@
</span><span class="cx">     return YES;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-- (CGFloat)keyboardScrollViewAnimator:(WKKeyboardScrollViewAnimator *)animator distanceForIncrement:(WebKit::ScrollingIncrement)increment
</del><ins>+- (CGFloat)keyboardScrollViewAnimator:(WKKeyboardScrollViewAnimator *)animator distanceForIncrement:(WebKit::ScrollingIncrement)increment inDirection:(WebKit::ScrollingDirection)direction
</ins><span class="cx"> {
</span><ins>+    BOOL directionIsHorizontal = direction == WebKit::ScrollingDirection::Left || direction == WebKit::ScrollingDirection::Right;
+
</ins><span class="cx">     switch (increment) {
</span><del>-    case WebKit::ScrollingIncrement::Document:
-        return [self convertRect:self.bounds toView:_webView].size.height;
-    case WebKit::ScrollingIncrement::Page:
-        return [self convertSize:CGSizeMake(0, WebCore::Scrollbar::pageStep(_page->unobscuredContentRect().height(), self.bounds.size.height)) toView:_webView].height;
</del><ins>+    case WebKit::ScrollingIncrement::Document: {
+        CGSize documentSize = [self convertRect:self.bounds toView:_webView].size;
+        return directionIsHorizontal ? documentSize.width : documentSize.height;
+    }
+    case WebKit::ScrollingIncrement::Page: {
+        CGSize pageSize = [self convertSize:CGSizeMake(0, WebCore::Scrollbar::pageStep(_page->unobscuredContentRect().height(), self.bounds.size.height)) toView:_webView];
+        return directionIsHorizontal ? pageSize.width : pageSize.height;
+    }
</ins><span class="cx">     case WebKit::ScrollingIncrement::Line:
</span><span class="cx">         return [self convertSize:CGSizeMake(0, WebCore::Scrollbar::pixelsPerLineStep()) toView:_webView].height;
</span><span class="cx">     }
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosWKKeyboardScrollingAnimatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ios/WKKeyboardScrollingAnimator.h (242694 => 242695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/ios/WKKeyboardScrollingAnimator.h  2019-03-11 02:36:23 UTC (rev 242694)
+++ trunk/Source/WebKit/UIProcess/ios/WKKeyboardScrollingAnimator.h     2019-03-11 02:54:55 UTC (rev 242695)
</span><span class="lines">@@ -37,6 +37,13 @@
</span><span class="cx">     Line
</span><span class="cx"> };
</span><span class="cx"> 
</span><ins>+enum class ScrollingDirection : uint8_t {
+    Up,
+    Down,
+    Left,
+    Right
+};
+
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> @class UIScrollView;
</span><span class="lines">@@ -62,7 +69,7 @@
</span><span class="cx"> @protocol WKKeyboardScrollViewAnimatorDelegate <NSObject>
</span><span class="cx"> @optional
</span><span class="cx"> - (BOOL)isScrollableForKeyboardScrollViewAnimator:(WKKeyboardScrollViewAnimator *)animator;
</span><del>-- (CGFloat)keyboardScrollViewAnimator:(WKKeyboardScrollViewAnimator *)animator distanceForIncrement:(WebKit::ScrollingIncrement)increment;
</del><ins>+- (CGFloat)keyboardScrollViewAnimator:(WKKeyboardScrollViewAnimator *)animator distanceForIncrement:(WebKit::ScrollingIncrement)increment inDirection:(WebKit::ScrollingDirection)direction;
</ins><span class="cx"> - (void)keyboardScrollViewAnimatorWillScroll:(WKKeyboardScrollViewAnimator *)animator;
</span><span class="cx"> - (void)keyboardScrollViewAnimatorDidFinishScrolling:(WKKeyboardScrollViewAnimator *)animator;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosWKKeyboardScrollingAnimatormm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ios/WKKeyboardScrollingAnimator.mm (242694 => 242695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/ios/WKKeyboardScrollingAnimator.mm 2019-03-11 02:36:23 UTC (rev 242694)
+++ trunk/Source/WebKit/UIProcess/ios/WKKeyboardScrollingAnimator.mm    2019-03-11 02:54:55 UTC (rev 242695)
</span><span class="lines">@@ -42,8 +42,6 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebKit {
</span><span class="cx"> 
</span><del>-enum class ScrollingDirection : uint8_t { Up, Down, Left, Right };
-
</del><span class="cx"> struct KeyboardScroll {
</span><span class="cx">     WebCore::FloatSize offset; // Points per increment.
</span><span class="cx">     WebCore::FloatSize maximumVelocity; // Points per second.
</span><span class="lines">@@ -69,7 +67,7 @@
</span><span class="cx"> @protocol WKKeyboardScrollableInternal <NSObject>
</span><span class="cx"> @required
</span><span class="cx"> - (BOOL)isKeyboardScrollable;
</span><del>-- (CGFloat)distanceForIncrement:(WebKit::ScrollingIncrement)increment;
</del><ins>+- (CGFloat)distanceForIncrement:(WebKit::ScrollingIncrement)increment inDirection:(WebKit::ScrollingDirection)direction;
</ins><span class="cx"> - (void)scrollToContentOffset:(WebCore::FloatPoint)offset animated:(BOOL)animated;
</span><span class="cx"> - (void)scrollWithScrollToExtentAnimationTo:(CGPoint)offset;
</span><span class="cx"> - (CGPoint)contentOffset;
</span><span class="lines">@@ -233,6 +231,8 @@
</span><span class="cx">         switch (key) {
</span><span class="cx">         case Key::LeftArrow:
</span><span class="cx">         case Key::RightArrow:
</span><ins>+            if (altPressed)
+                return WebKit::ScrollingIncrement::Page;
</ins><span class="cx">             return WebKit::ScrollingIncrement::Line;
</span><span class="cx">         case Key::UpArrow:
</span><span class="cx">         case Key::DownArrow:
</span><span class="lines">@@ -271,7 +271,7 @@
</span><span class="cx">         };
</span><span class="cx">     }();
</span><span class="cx"> 
</span><del>-    CGFloat scrollDistance = [_scrollable distanceForIncrement:increment];
</del><ins>+    CGFloat scrollDistance = [_scrollable distanceForIncrement:increment inDirection:direction];
</ins><span class="cx"> 
</span><span class="cx">     WebKit::KeyboardScroll scroll;
</span><span class="cx">     scroll.offset = unitVector(direction).scaled(scrollDistance);
</span><span class="lines">@@ -544,7 +544,7 @@
</span><span class="cx">     _delegate = delegate;
</span><span class="cx"> 
</span><span class="cx">     _delegateRespondsToIsKeyboardScrollable = [_delegate respondsToSelector:@selector(isScrollableForKeyboardScrollViewAnimator:)];
</span><del>-    _delegateRespondsToDistanceForIncrement = [_delegate respondsToSelector:@selector(keyboardScrollViewAnimator:distanceForIncrement:)];
</del><ins>+    _delegateRespondsToDistanceForIncrement = [_delegate respondsToSelector:@selector(keyboardScrollViewAnimator:distanceForIncrement:inDirection:)];
</ins><span class="cx">     _delegateRespondsToWillScroll = [_delegate respondsToSelector:@selector(keyboardScrollViewAnimatorWillScroll:)];
</span><span class="cx">     _delegateRespondsToDidFinishScrolling = [_delegate respondsToSelector:@selector(keyboardScrollViewAnimatorDidFinishScrolling:)];
</span><span class="cx"> }
</span><span class="lines">@@ -571,7 +571,7 @@
</span><span class="cx">     return [_delegate isScrollableForKeyboardScrollViewAnimator:self];
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-- (CGFloat)distanceForIncrement:(WebKit::ScrollingIncrement)increment
</del><ins>+- (CGFloat)distanceForIncrement:(WebKit::ScrollingIncrement)increment inDirection:(WebKit::ScrollingDirection)direction
</ins><span class="cx"> {
</span><span class="cx">     auto scrollView = _scrollView.getAutoreleased();
</span><span class="cx">     if (!scrollView)
</span><span class="lines">@@ -580,12 +580,14 @@
</span><span class="cx">     const CGFloat defaultPageScrollFraction = 0.8;
</span><span class="cx">     const CGFloat defaultLineScrollHeight = 40;
</span><span class="cx"> 
</span><ins>+    BOOL directionIsHorizontal = direction == WebKit::ScrollingDirection::Left || direction == WebKit::ScrollingDirection::Right;
+
</ins><span class="cx">     if (!_delegateRespondsToDistanceForIncrement) {
</span><span class="cx">         switch (increment) {
</span><span class="cx">         case WebKit::ScrollingIncrement::Document:
</span><del>-            return scrollView.contentSize.height;
</del><ins>+            return directionIsHorizontal ? scrollView.contentSize.width : scrollView.contentSize.height;
</ins><span class="cx">         case WebKit::ScrollingIncrement::Page:
</span><del>-            return scrollView.frame.size.height * defaultPageScrollFraction;
</del><ins>+            return (directionIsHorizontal ? scrollView.frame.size.width : scrollView.frame.size.height) * defaultPageScrollFraction;
</ins><span class="cx">         case WebKit::ScrollingIncrement::Line:
</span><span class="cx">             return defaultLineScrollHeight * scrollView.zoomScale;
</span><span class="cx">         }
</span><span class="lines">@@ -593,7 +595,7 @@
</span><span class="cx">         return 0;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    return [_delegate keyboardScrollViewAnimator:self distanceForIncrement:increment];
</del><ins>+    return [_delegate keyboardScrollViewAnimator:self distanceForIncrement:increment inDirection:direction];
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (void)scrollToContentOffset:(WebCore::FloatPoint)contentOffsetDelta animated:(BOOL)animated
</span></span></pre>
</div>
</div>

</body>
</html>