<!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>[202295] 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/202295">202295</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-06-21 15:19:37 -0700 (Tue, 21 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Typing text into a text field or text area causes screen to scroll down (hiding text entry)
https://bugs.webkit.org/show_bug.cgi?id=158970
Reviewed by Ryosuke Niwa.
Source/WebCore:
insertTextWithoutSendingTextEvent() should only reveal the selection up to the main frame on iOS,
since the UI process can zoom and scroll the view to the text input.
Test: fast/forms/ios/typing-in-input-in-iframe.html
* editing/Editor.cpp:
(WebCore::Editor::insertTextWithoutSendingTextEvent):
LayoutTests:
Test that focuses an input in a frame and then types a character, then checks for scrolling.
* fast/forms/ios/typing-in-input-in-iframe-expected.txt: Added.
* fast/forms/ios/typing-in-input-in-iframe.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorcpp">trunk/Source/WebCore/editing/Editor.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastformsiostypingininputiniframeexpectedtxt">trunk/LayoutTests/fast/forms/ios/typing-in-input-in-iframe-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastformsiostypingininputiniframehtml">trunk/LayoutTests/fast/forms/ios/typing-in-input-in-iframe.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (202294 => 202295)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-06-21 21:11:21 UTC (rev 202294)
+++ trunk/LayoutTests/ChangeLog 2016-06-21 22:19:37 UTC (rev 202295)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2016-06-20 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ [iOS] Typing text into a text field or text area causes screen to scroll down (hiding text entry)
+ https://bugs.webkit.org/show_bug.cgi?id=158970
+
+ Reviewed by Ryosuke Niwa.
+
+ Test that focuses an input in a frame and then types a character, then checks for scrolling.
+
+ * fast/forms/ios/typing-in-input-in-iframe-expected.txt: Added.
+ * fast/forms/ios/typing-in-input-in-iframe.html: Added.
+
+2016-06-20 Simon Fraser <simon.fraser@apple.com>
+
</ins><span class="cx"> Focus event dispatched in iframe causes parent document to scroll incorrectly
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=158629
</span><span class="cx"> rdar://problem/26521616
</span></span></pre></div>
<a id="trunkLayoutTestsfastformsiostypingininputiniframeexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/forms/ios/typing-in-input-in-iframe-expected.txt (0 => 202295)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/ios/typing-in-input-in-iframe-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/forms/ios/typing-in-input-in-iframe-expected.txt 2016-06-21 22:19:37 UTC (rev 202295)
</span><span class="lines">@@ -0,0 +1,5 @@
</span><ins>+Tests that typing into a text input in an iframe should not scroll.
+
+PASS: page did not scroll.
+Click to focus input
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastformsiostypingininputiniframehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/forms/ios/typing-in-input-in-iframe.html (0 => 202295)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/ios/typing-in-input-in-iframe.html (rev 0)
+++ trunk/LayoutTests/fast/forms/ios/typing-in-input-in-iframe.html 2016-06-21 22:19:37 UTC (rev 202295)
</span><span class="lines">@@ -0,0 +1,89 @@
</span><ins>+<!DOCTYPE html> <!-- webkit-test-runner [ useFlexibleViewport=true ] -->
+
+<html>
+<head>
+ <meta name="viewport" content="initial-scale=0.5">
+ <style>
+ button {
+ display: block;
+ }
+ iframe {
+ margin-top: 800px;
+ }
+ </style>
+
+ <script src="resources/zooming-test-utils.js"></script>
+ <script>
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ }
+
+ if (window.internals)
+ internals.settings.setFrameFlatteningEnabled(true);
+
+ function getTypingUIScript()
+ {
+ return `
+ (function() {
+ uiController.typeCharacterUsingHardwareKeyboard('a', function() {
+ uiController.uiScriptComplete();
+ });
+ })();`
+ }
+
+ function buttonClicked()
+ {
+ document.getElementById('frame').contentDocument.getElementById('input').focus();
+ }
+
+ function pageDidScroll()
+ {
+ document.getElementById('result').textContent = 'FAIL: page scrolled to ' + document.scrollingElement.scrollTop;
+ }
+
+ function testTyping()
+ {
+ window.addEventListener('scroll', pageDidScroll, false);
+
+ var uiScript = getTypingUIScript();
+ testRunner.runUIScript(uiScript, function() {
+ // Wait for any scroll to happen.
+ window.setTimeout(function() {
+ if (window.testRunner)
+ testRunner.notifyDone();
+ }, 100);
+ });
+ }
+
+ function doTest()
+ {
+ // Get the text field focused via a user event so we zoom to it.
+ var point = getPointInsideElement(document.getElementById('target'), 10, 10);
+
+ var uiScript = zoomAfterSingleTapUIScript(point.x, point.y, true);
+ testRunner.runUIScript(uiScript, function(result) {
+ window.setTimeout(function() {
+ testTyping();
+ }, 0);
+ });
+ }
+
+ window.addEventListener('load', doTest, false);
+ </script>
+</head>
+<body>
+
+<p>Tests that typing into a text input in an iframe should not scroll.</p>
+<div id="result">
+ PASS: page did not scroll.
+</div>
+
+<button id="target" onclick="buttonClicked()">Click to focus input</button>
+
+<iframe id="frame" srcdoc="<style>input { margin: 400px 20px; }</style>
+<input id='input' type='text'>
+"></iframe>
+
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202294 => 202295)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-21 21:11:21 UTC (rev 202294)
+++ trunk/Source/WebCore/ChangeLog 2016-06-21 22:19:37 UTC (rev 202295)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-06-20 Simon Fraser <simon.fraser@apple.com>
+
+ [iOS] Typing text into a text field or text area causes screen to scroll down (hiding text entry)
+ https://bugs.webkit.org/show_bug.cgi?id=158970
+
+ Reviewed by Ryosuke Niwa.
+
+ insertTextWithoutSendingTextEvent() should only reveal the selection up to the main frame on iOS,
+ since the UI process can zoom and scroll the view to the text input.
+
+ Test: fast/forms/ios/typing-in-input-in-iframe.html
+
+ * editing/Editor.cpp:
+ (WebCore::Editor::insertTextWithoutSendingTextEvent):
+
</ins><span class="cx"> 2016-06-21 Adam Bergkvist <adam.bergkvist@ericsson.com>
</span><span class="cx">
</span><span class="cx"> WebRTC: Remove unused MediaEndpointClient::gotRemoteSource function
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editor.cpp (202294 => 202295)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editor.cpp 2016-06-21 21:11:21 UTC (rev 202294)
+++ trunk/Source/WebCore/editing/Editor.cpp 2016-06-21 22:19:37 UTC (rev 202295)
</span><span class="lines">@@ -1203,8 +1203,14 @@
</span><span class="cx">
</span><span class="cx"> // Reveal the current selection
</span><span class="cx"> if (Frame* editedFrame = document->frame())
</span><del>- if (Page* page = editedFrame->page())
- page->focusController().focusedOrMainFrame().selection().revealSelection(SelectionRevealMode::Reveal, ScrollAlignment::alignCenterIfNeeded);
</del><ins>+ if (Page* page = editedFrame->page()) {
+#if PLATFORM(IOS)
+ SelectionRevealMode revealMode = SelectionRevealMode::RevealUpToMainFrame;
+#else
+ SelectionRevealMode revealMode = SelectionRevealMode::Reveal;
+#endif
+ page->focusController().focusedOrMainFrame().selection().revealSelection(revealMode, ScrollAlignment::alignCenterIfNeeded);
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>