<!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>[207748] branches/safari-602-branch</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/207748">207748</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-10-24 00:18:51 -0700 (Mon, 24 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/207486">r207486</a>. rdar://problem/28409742</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602branchLayoutTestsChangeLog">branches/safari-602-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebCoreChangeLog">branches/safari-602-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebCoredomDocumentcpp">branches/safari-602-branch/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebCorehtmlHTMLTextFormControlElementcpp">branches/safari-602-branch/Source/WebCore/html/HTMLTextFormControlElement.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari602branchLayoutTestsfastformsioshidekeyboardonnoderemovalexpectedtxt">branches/safari-602-branch/LayoutTests/fast/forms/ios/hide-keyboard-on-node-removal-expected.txt</a></li>
<li><a href="#branchessafari602branchLayoutTestsfastformsioshidekeyboardonnoderemovalhtml">branches/safari-602-branch/LayoutTests/fast/forms/ios/hide-keyboard-on-node-removal.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/ChangeLog (207747 => 207748)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/ChangeLog 2016-10-24 07:18:47 UTC (rev 207747)
+++ branches/safari-602-branch/LayoutTests/ChangeLog 2016-10-24 07:18:51 UTC (rev 207748)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2016-10-20 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r207486. rdar://problem/28409742
+
+ 2016-10-18 Ryosuke Niwa <rniwa@webkit.org>
+
+ REGRESSION (r201471): Keyboard remains visible when swiping back on twitter.com
+ https://bugs.webkit.org/show_bug.cgi?id=163581
+ <rdar://problem/27739558>
+
+ Reviewed by Simon Fraser.
+
+ Added a regression test for hiding a keyboard when the focused element is removed from the DOM.
+
+ * fast/forms/ios/hide-keyboard-on-node-removal-expected.txt: Added.
+ * fast/forms/ios/hide-keyboard-on-node-removal.html: Added.
+
+2016-10-20 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r207275. rdar://problem/28810752
</span><span class="cx">
</span><span class="cx"> 2016-10-12 Zalan Bujtas <zalan@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchLayoutTestsfastformsioshidekeyboardonnoderemovalexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-602-branch/LayoutTests/fast/forms/ios/hide-keyboard-on-node-removal-expected.txt (0 => 207748)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/fast/forms/ios/hide-keyboard-on-node-removal-expected.txt (rev 0)
+++ branches/safari-602-branch/LayoutTests/fast/forms/ios/hide-keyboard-on-node-removal-expected.txt 2016-10-24 07:18:51 UTC (rev 207748)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+Test that the keyboard disappears when the focused element is removed.
+To manually test, focus the text field below and type any character on iOS. The keyboard should be dismissed.
+
+PASS
</ins></span></pre></div>
<a id="branchessafari602branchLayoutTestsfastformsioshidekeyboardonnoderemovalhtml"></a>
<div class="addfile"><h4>Added: branches/safari-602-branch/LayoutTests/fast/forms/ios/hide-keyboard-on-node-removal.html (0 => 207748)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/fast/forms/ios/hide-keyboard-on-node-removal.html (rev 0)
+++ branches/safari-602-branch/LayoutTests/fast/forms/ios/hide-keyboard-on-node-removal.html 2016-10-24 07:18:51 UTC (rev 207748)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<meta name="viewport" content="width=device-width">
+</head>
+<body>
+<p>Test that the keyboard disappears when the focused element is removed.<br>
+To manually test, focus the text field below and type any character on iOS. The keyboard should be dismissed.</p>
+<input oninput="this.remove();">
+<div id="result"></div>
+<script>
+
+if (window.testRunner)
+ testRunner.dumpAsText();
+
+if (window.testRunner && testRunner.runUIScript) {
+ testRunner.waitUntilDone();
+
+ var input = document.querySelector('input');
+
+ const x = input.offsetLeft + 5;
+ const y = input.offsetTop + 5;
+ testRunner.runUIScript(`
+ uiController.didShowKeyboardCallback = function() { uiController.uiScriptComplete(); }
+ uiController.singleTapAtPoint(${x}, ${y}, function() {});`,
+ function () {
+ function endTest(result) {
+ document.getElementById('result').textContent = result;
+ testRunner.notifyDone();
+ }
+ setTimeout(endTest.bind(this, 'FAIL'), 5000);
+ testRunner.runUIScript(`
+ uiController.didHideKeyboardCallback = function() { uiController.uiScriptComplete(); }
+ uiController.typeCharacterUsingHardwareKeyboard('a', function () { });`,
+ endTest.bind(this, 'PASS'));
+ });
+}
+
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari602branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (207747 => 207748)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-10-24 07:18:47 UTC (rev 207747)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-10-24 07:18:51 UTC (rev 207748)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2016-10-20 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r207486. rdar://problem/28409742
+
+ 2016-10-18 Ryosuke Niwa <rniwa@webkit.org>
+
+ REGRESSION (r201471): Keyboard remains visible when swiping back on twitter.com
+ https://bugs.webkit.org/show_bug.cgi?id=163581
+ <rdar://problem/27739558>
+
+ Reviewed by Simon Fraser.
+
+ The bug was caused by Chrome::elementDidBlur not getting called, which resulted in
+ StopAssistingNode not getting sent to the UI process.
+
+ Test: fast/forms/ios/hide-keyboard-on-node-removal.html
+
+ * dom/Document.cpp:
+ (WebCore::Document::setFocusedElement): Restore the behavior prior to r201471 by calling
+ Chrome::elementDidBlur explicitly.
+ * html/HTMLTextFormControlElement.cpp:
+ (WebCore::HTMLTextFormControlElement::dispatchBlurEvent): Added a comment about ordering.
+
+2016-10-20 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r207275. rdar://problem/28810752
</span><span class="cx">
</span><span class="cx"> 2016-10-12 Zalan Bujtas <zalan@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/dom/Document.cpp (207747 => 207748)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/dom/Document.cpp 2016-10-24 07:18:47 UTC (rev 207747)
+++ branches/safari-602-branch/Source/WebCore/dom/Document.cpp 2016-10-24 07:18:51 UTC (rev 207748)
</span><span class="lines">@@ -3831,8 +3831,11 @@
</span><span class="cx"> newFocusedElement = nullptr;
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><ins>+ // Match the order in HTMLTextFormControlElement::dispatchBlurEvent.
</ins><span class="cx"> if (is<HTMLInputElement>(*oldFocusedElement))
</span><span class="cx"> downcast<HTMLInputElement>(*oldFocusedElement).endEditing();
</span><ins>+ if (page())
+ page()->chrome().client().elementDidBlur(oldFocusedElement.get());
</ins><span class="cx"> ASSERT(!m_focusedElement);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCorehtmlHTMLTextFormControlElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/html/HTMLTextFormControlElement.cpp (207747 => 207748)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/html/HTMLTextFormControlElement.cpp 2016-10-24 07:18:47 UTC (rev 207747)
+++ branches/safari-602-branch/Source/WebCore/html/HTMLTextFormControlElement.cpp 2016-10-24 07:18:51 UTC (rev 207748)
</span><span class="lines">@@ -100,6 +100,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (supportsPlaceholder())
</span><span class="cx"> updatePlaceholderVisibility();
</span><ins>+ // Match the order in Document::setFocusedElement.
</ins><span class="cx"> handleBlurEvent();
</span><span class="cx"> HTMLFormControlElementWithState::dispatchBlurEvent(WTFMove(newFocusedElement));
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>