<!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>[208745] 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/208745">208745</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2016-11-15 12:14:02 -0800 (Tue, 15 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Correct handling of changing input type
https://bugs.webkit.org/show_bug.cgi?id=164759
<rdar://problem/29211174>
Reviewed by Darin Adler.
Source/WebCore:
Test: fast/forms/search-cancel-button-change-input.html
It is possible for JavaScript to change the type property of an input field. WebKit
needs to gracefully handle this case.
Add a type traits specialization so we can properly downcast InputType elements.
Use this to only call search functions on actual search input types.
* html/HTMLInputElement.cpp:
(WebCore::HTMLInputElement::onSearch): Only perform search functions if the
input type is actually a search field.
* html/InputType.h: Add type traits specialization for 'downcast' template.
* html/SearchInputType.h: Ditto.
LayoutTests:
* fast/forms/search-cancel-button-change-input-expected.txt: Added.
* fast/forms/search-cancel-button-change-input.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="#trunkSourceWebCoreWebCoreorder">trunk/Source/WebCore/WebCore.order</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLInputElementcpp">trunk/Source/WebCore/html/HTMLInputElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlInputTypeh">trunk/Source/WebCore/html/InputType.h</a></li>
<li><a href="#trunkSourceWebCorehtmlSearchInputTypeh">trunk/Source/WebCore/html/SearchInputType.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastformssearchcancelbuttonchangeinputexpectedtxt">trunk/LayoutTests/fast/forms/search-cancel-button-change-input-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastformssearchcancelbuttonchangeinputhtml">trunk/LayoutTests/fast/forms/search-cancel-button-change-input.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (208744 => 208745)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-11-15 20:12:26 UTC (rev 208744)
+++ trunk/LayoutTests/ChangeLog 2016-11-15 20:14:02 UTC (rev 208745)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-11-14 Brent Fulgham <bfulgham@apple.com>
+
+ Correct handling of changing input type
+ https://bugs.webkit.org/show_bug.cgi?id=164759
+ <rdar://problem/29211174>
+
+ Reviewed by Darin Adler.
+
+ * fast/forms/search-cancel-button-change-input-expected.txt: Added.
+ * fast/forms/search-cancel-button-change-input.html: Added.
+
</ins><span class="cx"> 2016-11-15 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> slot doesn't work as a flex container
</span></span></pre></div>
<a id="trunkLayoutTestsfastformssearchcancelbuttonchangeinputexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/forms/search-cancel-button-change-input-expected.txt (0 => 208745)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/search-cancel-button-change-input-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/forms/search-cancel-button-change-input-expected.txt 2016-11-15 20:14:02 UTC (rev 208745)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+Tests that changing input type in a cancel button handler works properly.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS Search event was not triggered.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastformssearchcancelbuttonchangeinputhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/forms/search-cancel-button-change-input.html (0 => 208745)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/search-cancel-button-change-input.html (rev 0)
+++ trunk/LayoutTests/fast/forms/search-cancel-button-change-input.html 2016-11-15 20:14:02 UTC (rev 208745)
</span><span class="lines">@@ -0,0 +1,58 @@
</span><ins>+<!DOCTYPE HTML>
+<html>
+<head>
+<script src="../../resources/js-test.js"></script>
+<script src="resources/common.js"></script>
+<script>
+description('Tests that changing input type in a cancel button handler works properly.');
+
+window.jsTestIsAsync = true;
+
+var inputElement;
+var workProduct = [];
+
+function finish() {
+ testPassed("Search event was not triggered.");
+ finishJSTest();
+}
+
+function handleSearch(e) {
+ testFailed("A search event was triggered.");
+ finishJSTest();
+}
+
+function changeType(e) {
+ inputElement["type"] = "image"
+ setTimeout(function() {
+ finish();
+ }, 0);
+}
+
+function clickCancel() {
+ var cancelButtonPosition = searchCancelButtonPosition(inputElement);
+
+ eventSender.mouseMoveTo(cancelButtonPosition.x, cancelButtonPosition.y);
+ eventSender.mouseDown();
+ eventSender.mouseUp();
+}
+
+function runTest() {
+ if (!window.testRunner) {
+ testRunner.dumpAsText(true);
+ testRunner.waitUntilDone();
+ }
+
+ inputElement = document.getElementById("target");
+
+ inputElement.addEventListener("input", changeType);
+
+ setTimeout(function() {
+ clickCancel();
+ }, 0);
+}
+</script>
+</head>
+<body onload="runTest()">
+ <input id="target" type="search" onSearch="handleSearch();" value="Click the cancel button."></input>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208744 => 208745)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-15 20:12:26 UTC (rev 208744)
+++ trunk/Source/WebCore/ChangeLog 2016-11-15 20:14:02 UTC (rev 208745)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-11-14 Brent Fulgham <bfulgham@apple.com>
+
+ Correct handling of changing input type
+ https://bugs.webkit.org/show_bug.cgi?id=164759
+ <rdar://problem/29211174>
+
+ Reviewed by Darin Adler.
+
+ Test: fast/forms/search-cancel-button-change-input.html
+
+ It is possible for JavaScript to change the type property of an input field. WebKit
+ needs to gracefully handle this case.
+
+ Add a type traits specialization so we can properly downcast InputType elements.
+ Use this to only call search functions on actual search input types.
+
+ * html/HTMLInputElement.cpp:
+ (WebCore::HTMLInputElement::onSearch): Only perform search functions if the
+ input type is actually a search field.
+ * html/InputType.h: Add type traits specialization for 'downcast' template.
+ * html/SearchInputType.h: Ditto.
+
</ins><span class="cx"> 2016-11-15 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> CounterNode::insertAfter and ::removeChild should take references.
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreorder"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.order (208744 => 208745)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.order 2016-11-15 20:12:26 UTC (rev 208744)
+++ trunk/Source/WebCore/WebCore.order 2016-11-15 20:14:02 UTC (rev 208745)
</span><span class="lines">@@ -5834,7 +5834,6 @@
</span><span class="cx"> __ZN7WebCore17MarkupAccumulator13appendElementERN3WTF13StringBuilderEPNS_7ElementEPNS1_7HashMapIPNS1_16AtomicStringImplES8_NS1_7PtrHashIS8_EENS1_10HashTraitsIS8_EESC_EE
</span><span class="cx"> __ZN7WebCore17MarkupAccumulator13appendOpenTagERN3WTF13StringBuilderEPNS_7ElementEPNS1_7HashMapIPNS1_16AtomicStringImplES8_NS1_7PtrHashIS8_EENS1_10HashTraitsIS8_EESC_EE
</span><span class="cx"> __ZNK7WebCore7Element22nodeNamePreservingCaseEv
</span><del>-__ZNK7WebCore13QualifiedName8toStringEv
</del><span class="cx"> __ZNK7WebCore7Element13hasAttributesEv
</span><span class="cx"> __ZN7WebCore17MarkupAccumulator22appendCustomAttributesERN3WTF13StringBuilderEPNS_7ElementEPNS1_7HashMapIPNS1_16AtomicStringImplES8_NS1_7PtrHashIS8_EENS1_10HashTraitsIS8_EESC_EE
</span><span class="cx"> __ZN7WebCore17MarkupAccumulator14appendCloseTagERN3WTF13StringBuilderEPNS_7ElementE
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLInputElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLInputElement.cpp (208744 => 208745)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLInputElement.cpp 2016-11-15 20:12:26 UTC (rev 208744)
+++ trunk/Source/WebCore/html/HTMLInputElement.cpp 2016-11-15 20:14:02 UTC (rev 208745)
</span><span class="lines">@@ -1459,9 +1459,13 @@
</span><span class="cx">
</span><span class="cx"> void HTMLInputElement::onSearch()
</span><span class="cx"> {
</span><del>- ASSERT(isSearchField());
</del><ins>+ // The type of the input element could have changed during event handling. If we are no longer
+ // a search field, don't try to do search things.
+ if (!isSearchField())
+ return;
+
</ins><span class="cx"> if (m_inputType)
</span><del>- static_cast<SearchInputType*>(m_inputType.get())->stopSearchEventTimer();
</del><ins>+ downcast<SearchInputType>(*m_inputType.get()).stopSearchEventTimer();
</ins><span class="cx"> dispatchEvent(Event::create(eventNames().searchEvent, true, false));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlInputTypeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/InputType.h (208744 => 208745)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/InputType.h 2016-11-15 20:12:26 UTC (rev 208744)
+++ trunk/Source/WebCore/html/InputType.h 2016-11-15 20:14:02 UTC (rev 208745)
</span><span class="lines">@@ -322,3 +322,8 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><ins>+
+#define SPECIALIZE_TYPE_TRAITS_INPUT_TYPE(ToValueTypeName, predicate) \
+SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::ToValueTypeName) \
+static bool isType(const WebCore::InputType& input) { return input.predicate; } \
+SPECIALIZE_TYPE_TRAITS_END()
</ins></span></pre></div>
<a id="trunkSourceWebCorehtmlSearchInputTypeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/SearchInputType.h (208744 => 208745)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/SearchInputType.h 2016-11-15 20:12:26 UTC (rev 208744)
+++ trunk/Source/WebCore/html/SearchInputType.h 2016-11-15 20:14:02 UTC (rev 208745)
</span><span class="lines">@@ -70,3 +70,5 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><ins>+
+SPECIALIZE_TYPE_TRAITS_INPUT_TYPE(SearchInputType, isSearchField())
</ins></span></pre>
</div>
</div>
</body>
</html>