<!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>[170518] trunk</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/170518">170518</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2014-06-26 21:31:25 -0700 (Thu, 26 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS][WK2] Distant focusable element may not be scrolled into view when focused using keyboard
https://bugs.webkit.org/show_bug.cgi?id=134309
<rdar://problem/17427385>
Reviewed by Darin Adler.
.:
Add a manual test to ensure that we scroll to a distant focused text field when it's focused
using the keyboard.
* ManualTests/ios/scroll-to-distant-keyboard-focused-text-field.html: Added.
Source/WebKit2:
Fixes an issue where the focusable element may not be scrolled into view when it's focused by
using the keyboard accessory (i.e. the < and > buttons). In particular, we don't scroll a
keyboard focused text field into view when it's positioned significantly outside the visible region.
* UIProcess/ios/WKContentViewInteraction.h: Added an instance variable called _didAccessoryTabInitiateFocus
to track whether an accessory tab initiated the focus of the focusable element.
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView cleanupInteraction]): Clear _didAccessoryTabInitiateFocus so that we're in a good state
should the WebProcess crash between the time the UIProcess receives the accessory tab request and the
WebProcess calls back to the UIProcess to zoom/scroll to the newly focused element.
(-[WKContentView _displayFormNodeInputView]): Modified to pass an empty rectangle for the selection
rectangle to -_zoomToFocusRect to avoid constraining the scroll to the newly focused element when it
was focused using the keyboard accessory tab buttons
(-[WKContentView accessoryTab:]): Modified to set _didAccessoryTabInitiateFocus to YES. We'll set
this boolean to NO in -_displayFormNodeInputView.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewInteractionh">trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm">trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/ManualTests/ios/</li>
<li><a href="#trunkManualTestsiosscrolltodistantkeyboardfocusedtextfieldhtml">trunk/ManualTests/ios/scroll-to-distant-keyboard-focused-text-field.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (170517 => 170518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2014-06-27 03:20:34 UTC (rev 170517)
+++ trunk/ChangeLog 2014-06-27 04:31:25 UTC (rev 170518)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-06-26 Daniel Bates <dabates@apple.com>
+
+ [iOS][WK2] Distant focusable element may not be scrolled into view when focused using keyboard
+ https://bugs.webkit.org/show_bug.cgi?id=134309
+ <rdar://problem/17427385>
+
+ Reviewed by Darin Adler.
+
+ Add a manual test to ensure that we scroll to a distant focused text field when it's focused
+ using the keyboard.
+
+ * ManualTests/ios/scroll-to-distant-keyboard-focused-text-field.html: Added.
+
</ins><span class="cx"> 2014-06-25 Laszlo Gombos <l.gombos@samsung.com>
</span><span class="cx">
</span><span class="cx"> Remove build guard for progress element
</span></span></pre></div>
<a id="trunkManualTestsiosscrolltodistantkeyboardfocusedtextfieldhtml"></a>
<div class="addfile"><h4>Added: trunk/ManualTests/ios/scroll-to-distant-keyboard-focused-text-field.html (0 => 170518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ManualTests/ios/scroll-to-distant-keyboard-focused-text-field.html (rev 0)
+++ trunk/ManualTests/ios/scroll-to-distant-keyboard-focused-text-field.html 2014-06-27 04:31:25 UTC (rev 170518)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<meta name="viewport" content="height=device-height">
+<style>
+#input1 {
+ position: absolute;
+ top: 880px;
+ left: 200px;
+}
+
+body {
+ height: 900px;
+}
+</style>
+</head>
+<body>
+<p>This test can be used to ensure that we scroll to the newly focused field when using the keyboard to switch focus from a text field positioned at the bottom of the page to a text field positioned at the top of the page.</p>
+<ol>
+ <li>Scroll all the way to the bottom of the page.</li>
+ <li>Tap the text field with text &quot;Field 2&quot;</li>
+ <li>Tap the '&lt;' above the keyboard to move the focus to the previous text field on the page, &quot;Field 1&quot;.</li>
+</ol>
+<p>This test PASSED if we scroll to &quot;Field 1&quot; such that it's visible.</p>
+<input type="text" id="input0" value="Field 1">
+<input type="text" id="input1" value="Field 2">
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (170517 => 170518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-27 03:20:34 UTC (rev 170517)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-27 04:31:25 UTC (rev 170518)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-06-26 Daniel Bates <dabates@apple.com>
+
+ [iOS][WK2] Distant focusable element may not be scrolled into view when focused using keyboard
+ https://bugs.webkit.org/show_bug.cgi?id=134309
+ <rdar://problem/17427385>
+
+ Reviewed by Darin Adler.
+
+ Fixes an issue where the focusable element may not be scrolled into view when it's focused by
+ using the keyboard accessory (i.e. the < and > buttons). In particular, we don't scroll a
+ keyboard focused text field into view when it's positioned significantly outside the visible region.
+
+ * UIProcess/ios/WKContentViewInteraction.h: Added an instance variable called _didAccessoryTabInitiateFocus
+ to track whether an accessory tab initiated the focus of the focusable element.
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView cleanupInteraction]): Clear _didAccessoryTabInitiateFocus so that we're in a good state
+ should the WebProcess crash between the time the UIProcess receives the accessory tab request and the
+ WebProcess calls back to the UIProcess to zoom/scroll to the newly focused element.
+ (-[WKContentView _displayFormNodeInputView]): Modified to pass an empty rectangle for the selection
+ rectangle to -_zoomToFocusRect to avoid constraining the scroll to the newly focused element when it
+ was focused using the keyboard accessory tab buttons
+ (-[WKContentView accessoryTab:]): Modified to set _didAccessoryTabInitiateFocus to YES. We'll set
+ this boolean to NO in -_displayFormNodeInputView.
+
</ins><span class="cx"> 2014-06-26 Timothy Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS][WK2] Implement WKPDFView smart magnification
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h (170517 => 170518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2014-06-27 03:20:34 UTC (rev 170517)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2014-06-27 04:31:25 UTC (rev 170518)
</span><span class="lines">@@ -139,6 +139,7 @@
</span><span class="cx"> BOOL _selectionNeedsUpdate;
</span><span class="cx"> BOOL _usingGestureForSelection;
</span><span class="cx"> BOOL _inspectorNodeSearchEnabled;
</span><ins>+ BOOL _didAccessoryTabInitiateFocus;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (170517 => 170518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-06-27 03:20:34 UTC (rev 170517)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-06-27 04:31:25 UTC (rev 170518)
</span><span class="lines">@@ -263,6 +263,7 @@
</span><span class="cx"> _textSelectionAssistant = nil;
</span><span class="cx"> _actionSheetAssistant = nil;
</span><span class="cx"> _smartMagnificationController = nil;
</span><ins>+ _didAccessoryTabInitiateFocus = NO;
</ins><span class="cx"> [_formInputSession invalidate];
</span><span class="cx"> _formInputSession = nil;
</span><span class="cx"> [_highlightView removeFromSuperview];
</span><span class="lines">@@ -638,12 +639,13 @@
</span><span class="cx"> - (void)_displayFormNodeInputView
</span><span class="cx"> {
</span><span class="cx"> [self _zoomToFocusRect:_assistedNodeInformation.elementRect
</span><del>- selectionRect:_assistedNodeInformation.selectionRect
</del><ins>+ selectionRect: _didAccessoryTabInitiateFocus ? IntRect() : _assistedNodeInformation.selectionRect
</ins><span class="cx"> fontSize:_assistedNodeInformation.nodeFontSize
</span><span class="cx"> minimumScale:_assistedNodeInformation.minimumScaleFactor
</span><span class="cx"> maximumScale:_assistedNodeInformation.maximumScaleFactor
</span><span class="cx"> allowScaling:(_assistedNodeInformation.allowsUserScaling && !UICurrentUserInterfaceIdiomIsPad())
</span><span class="cx"> forceScroll:[self requiresAccessoryView]];
</span><ins>+ _didAccessoryTabInitiateFocus = NO;
</ins><span class="cx"> [self _updateAccessory];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1729,6 +1731,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)accessoryTab:(BOOL)isNext
</span><span class="cx"> {
</span><ins>+ _didAccessoryTabInitiateFocus = YES; // Will be cleared in either -_displayFormNodeInputView or -cleanupInteraction.
</ins><span class="cx"> _page->focusNextAssistedNode(isNext);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>