<!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>[193357] branches/safari-601.1.46-branch/Source/WebKit2</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/193357">193357</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-12-03 11:41:19 -0800 (Thu, 03 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/192811">r192811</a>. rdar://problem/23730032</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchSourceWebKit2ChangeLog">branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebKit2UIProcessiosWKContentViewInteractionmm">branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601146branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog (193356 => 193357)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-12-03 19:34:21 UTC (rev 193356)
+++ branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-12-03 19:41:19 UTC (rev 193357)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-12-02 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r192811. rdar://problem/23730032
+
+ 2015-11-30 Tim Horton <timothy_horton@apple.com>
+
+ [iOS] Option-up and Option-down should scroll a little less than a full page
+ https://bugs.webkit.org/show_bug.cgi?id=151538
+ <rdar://problem/23642675>
+
+ Reviewed by Simon Fraser.
+
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _scrollOffsetForEvent:]):
+ (-[WKContentView _interpretKeyEvent:isCharEvent:]):
+ Clean up the code a little, and adjust so that we *always* use pageStep
+ instead of just scrolling by the unobscured rect when scrolling by a page.
+ Previously, we did for the spacebar, but not for option-up and option-down.
+
</ins><span class="cx"> 2015-12-01 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r192432. rdar://problem/23558672
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (193356 => 193357)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-12-03 19:34:21 UTC (rev 193356)
+++ branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-12-03 19:41:19 UTC (rev 193357)
</span><span class="lines">@@ -2700,6 +2700,70 @@
</span><span class="cx"> _uiEventBeingResent = nil;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (Optional<FloatPoint>)_scrollOffsetForEvent:(WebIOSEvent *)event
+{
+ static const unsigned kWebSpaceKey = 0x20;
+
+ if (_page->editorState().isContentEditable)
+ return Nullopt;
+
+ NSString *charactersIgnoringModifiers = event.charactersIgnoringModifiers;
+ if (!charactersIgnoringModifiers.length)
+ return Nullopt;
+
+ enum ScrollingIncrement { Document, Page, Line };
+ enum ScrollingDirection { Up, Down, Left, Right };
+
+ auto computeOffset = ^(ScrollingIncrement increment, ScrollingDirection direction) {
+ bool isHorizontal = (direction == Left || direction == Right);
+
+ CGFloat scrollDistance = ^ CGFloat {
+ switch (increment) {
+ case Document:
+ ASSERT(!isHorizontal);
+ return self.bounds.size.height;
+ case Page:
+ ASSERT(!isHorizontal);
+ return Scrollbar::pageStep(_page->unobscuredContentRect().height(), self.bounds.size.height);
+ case Line:
+ return Scrollbar::pixelsPerLineStep();
+ }
+ ASSERT_NOT_REACHED();
+ return 0;
+ }();
+
+ if (direction == Up || direction == Left)
+ scrollDistance = -scrollDistance;
+
+ return (isHorizontal ? FloatPoint(scrollDistance, 0) : FloatPoint(0, scrollDistance));
+ };
+
+ if ([charactersIgnoringModifiers isEqualToString:UIKeyInputLeftArrow])
+ return computeOffset(Line, Left);
+ if ([charactersIgnoringModifiers isEqualToString:UIKeyInputRightArrow])
+ return computeOffset(Line, Right);
+
+ ScrollingIncrement incrementForVerticalArrowKey = Line;
+ if (event.modifierFlags & WebEventFlagMaskAlternate)
+ incrementForVerticalArrowKey = Page;
+ else if (event.modifierFlags & WebEventFlagMaskCommand)
+ incrementForVerticalArrowKey = Document;
+ if ([charactersIgnoringModifiers isEqualToString:UIKeyInputUpArrow])
+ return computeOffset(incrementForVerticalArrowKey, Up);
+ if ([charactersIgnoringModifiers isEqualToString:UIKeyInputDownArrow])
+ return computeOffset(incrementForVerticalArrowKey, Down);
+
+ if ([charactersIgnoringModifiers isEqualToString:UIKeyInputPageDown])
+ return computeOffset(Page, Down);
+ if ([charactersIgnoringModifiers isEqualToString:UIKeyInputPageUp])
+ return computeOffset(Page, Up);
+
+ if ([charactersIgnoringModifiers characterAtIndex:0] == kWebSpaceKey)
+ return computeOffset(Page, (event.modifierFlags & WebEventFlagMaskShift) ? Up : Down);
+
+ return Nullopt;
+}
+
</ins><span class="cx"> - (BOOL)_interpretKeyEvent:(WebIOSEvent *)event isCharEvent:(BOOL)isCharEvent
</span><span class="cx"> {
</span><span class="cx"> static const unsigned kWebEnterKey = 0x0003;
</span><span class="lines">@@ -2710,52 +2774,19 @@
</span><span class="cx"> static const unsigned kWebSpaceKey = 0x20;
</span><span class="cx">
</span><span class="cx"> BOOL contentEditable = _page->editorState().isContentEditable;
</span><del>- WebCore::FloatRect unobscuredContentRect = _page->unobscuredContentRect();
</del><span class="cx">
</span><span class="cx"> if (!contentEditable && event.isTabKey)
</span><span class="cx"> return NO;
</span><span class="cx">
</span><del>- BOOL shift = event.modifierFlags & WebEventFlagMaskShift;
- BOOL command = event.modifierFlags & WebEventFlagMaskCommand;
- BOOL option = event.modifierFlags & WebEventFlagMaskAlternate;
- NSString *charactersIgnoringModifiers = [event charactersIgnoringModifiers];
- BOOL shouldScroll = YES;
- FloatPoint scrollOffset;
-
- if ([charactersIgnoringModifiers isEqualToString:UIKeyInputLeftArrow])
- scrollOffset.setX(-Scrollbar::pixelsPerLineStep());
- else if ([charactersIgnoringModifiers isEqualToString:UIKeyInputUpArrow]) {
- if (option)
- scrollOffset.setY(-unobscuredContentRect.height());
- else if (command)
- scrollOffset.setY(-self.bounds.size.height);
- else
- scrollOffset.setY(-Scrollbar::pixelsPerLineStep());
- } else if ([charactersIgnoringModifiers isEqualToString:UIKeyInputRightArrow])
- scrollOffset.setX(Scrollbar::pixelsPerLineStep());
- else if ([charactersIgnoringModifiers isEqualToString:UIKeyInputDownArrow]) {
- if (option)
- scrollOffset.setY(unobscuredContentRect.height());
- else if (command)
- scrollOffset.setY(self.bounds.size.height);
- else
- scrollOffset.setY(Scrollbar::pixelsPerLineStep());
- } else if ([charactersIgnoringModifiers isEqualToString:UIKeyInputPageDown])
- scrollOffset.setY(unobscuredContentRect.height());
- else if ([charactersIgnoringModifiers isEqualToString:UIKeyInputPageUp])
- scrollOffset.setY(-unobscuredContentRect.height());
- else
- shouldScroll = NO;
-
- if (shouldScroll) {
- [_webView _scrollByContentOffset:scrollOffset];
</del><ins>+ if (Optional<FloatPoint> scrollOffset = [self _scrollOffsetForEvent:event]) {
+ [_webView _scrollByContentOffset:scrollOffset.value()];
</ins><span class="cx"> return YES;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> UIKeyboardImpl *keyboard = [UIKeyboardImpl sharedInstance];
</span><del>- NSString *characters = [event characters];
</del><ins>+ NSString *characters = event.characters;
</ins><span class="cx">
</span><del>- if (![characters length])
</del><ins>+ if (!characters.length)
</ins><span class="cx"> return NO;
</span><span class="cx">
</span><span class="cx"> switch ([characters characterAtIndex:0]) {
</span><span class="lines">@@ -2772,12 +2803,7 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case kWebSpaceKey:
</span><del>- if (!contentEditable) {
- int pageStep = Scrollbar::pageStep(unobscuredContentRect.height(), self.bounds.size.height);
- [_webView _scrollByContentOffset:FloatPoint(0, shift ? -pageStep : pageStep)];
- return YES;
- }
- if (isCharEvent) {
</del><ins>+ if (contentEditable && isCharEvent) {
</ins><span class="cx"> [keyboard addInputString:event.characters withFlags:event.keyboardFlags];
</span><span class="cx"> return YES;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>