<!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>[203456] 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/203456">203456</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-07-20 09:37:40 -0700 (Wed, 20 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix null handling of HTMLSelectElement.value attribute
https://bugs.webkit.org/show_bug.cgi?id=159925
Reviewed by Benjamin Poulain.
Source/WebCore:
Fix null handling of HTMLSelectElement.value attribute:
- https://html.spec.whatwg.org/multipage/forms.html#htmlselectelement
We were treating null as the null String which would end up setting
selectedIndex to -1. However, we should treat null as the String "null"
which would set the selectedIndex to the index of the <option> element
whose value is "null".
Firefox and Chrome match the specification.
Test: fast/dom/HTMLSelectElement/value-null-handling.html
* html/HTMLSelectElement.cpp:
(WebCore::HTMLSelectElement::setValue):
* html/HTMLSelectElement.idl:
LayoutTests:
Add layout test coverage. I have verified that this test is passing in
both Firefox and Chrome.
* fast/dom/HTMLSelectElement/value-null-handling-expected.txt: Added.
* fast/dom/HTMLSelectElement/value-null-handling.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="#trunkSourceWebCorehtmlHTMLSelectElementcpp">trunk/Source/WebCore/html/HTMLSelectElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLSelectElementidl">trunk/Source/WebCore/html/HTMLSelectElement.idl</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastdomHTMLSelectElementvaluenullhandlingexpectedtxt">trunk/LayoutTests/fast/dom/HTMLSelectElement/value-null-handling-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomHTMLSelectElementvaluenullhandlinghtml">trunk/LayoutTests/fast/dom/HTMLSelectElement/value-null-handling.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (203455 => 203456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2016-07-20 15:50:45 UTC (rev 203455)
+++ trunk/LayoutTests/ChangeLog        2016-07-20 16:37:40 UTC (rev 203456)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-07-20 Chris Dumez <cdumez@apple.com>
+
+ Fix null handling of HTMLSelectElement.value attribute
+ https://bugs.webkit.org/show_bug.cgi?id=159925
+
+ Reviewed by Benjamin Poulain.
+
+ Add layout test coverage. I have verified that this test is passing in
+ both Firefox and Chrome.
+
+ * fast/dom/HTMLSelectElement/value-null-handling-expected.txt: Added.
+ * fast/dom/HTMLSelectElement/value-null-handling.html: Added.
+
</ins><span class="cx"> 2016-07-20 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Consolidating duplicate TestExpectations for fast/images/animated-png.html.
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomHTMLSelectElementvaluenullhandlingexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/HTMLSelectElement/value-null-handling-expected.txt (0 => 203456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/HTMLSelectElement/value-null-handling-expected.txt         (rev 0)
+++ trunk/LayoutTests/fast/dom/HTMLSelectElement/value-null-handling-expected.txt        2016-07-20 16:37:40 UTC (rev 203456)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+Tests null handling of HTMLSelectElement.value attribute
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+select.value = 'a'
+PASS select.value is "a"
+PASS select.selectedIndex is 0
+select.value = null
+PASS select.value is "null"
+PASS select.selectedIndex is 1
+select.value = 'a'
+PASS select.value is "a"
+PASS select.selectedIndex is 0
+select.value = null
+PASS select.value is ""
+PASS select.selectedIndex is -1
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastdomHTMLSelectElementvaluenullhandlinghtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/HTMLSelectElement/value-null-handling.html (0 => 203456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/HTMLSelectElement/value-null-handling.html         (rev 0)
+++ trunk/LayoutTests/fast/dom/HTMLSelectElement/value-null-handling.html        2016-07-20 16:37:40 UTC (rev 203456)
</span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+<DOCTYPE html>
+<html>
+<body>
+<script src="../../../resources/js-test-pre.js"></script>
+<select id="testSelectWithNull">
+<option value="a"/>
+<option value="null"/>
+</select>
+<select id="testSelectWithoutNull">
+<option value="a"/>
+<option value="b"/>
+</select>
+<script>
+description("Tests null handling of HTMLSelectElement.value attribute");
+
+var select = document.getElementById("testSelectWithNull");
+evalAndLog("select.value = 'a'");
+shouldBeEqualToString("select.value", "a");
+shouldBe("select.selectedIndex", "0");
+
+evalAndLog("select.value = null");
+shouldBeEqualToString("select.value", "null");
+shouldBe("select.selectedIndex", "1");
+
+select = document.getElementById("testSelectWithoutNull");
+evalAndLog("select.value = 'a'");
+shouldBeEqualToString("select.value", "a");
+shouldBe("select.selectedIndex", "0");
+
+evalAndLog("select.value = null");
+shouldBeEqualToString("select.value", "");
+shouldBe("select.selectedIndex", "-1");
+
+</script>
+<script src="../../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (203455 => 203456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-07-20 15:50:45 UTC (rev 203455)
+++ trunk/Source/WebCore/ChangeLog        2016-07-20 16:37:40 UTC (rev 203456)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2016-07-20 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Fix null handling of HTMLSelectElement.value attribute
+ https://bugs.webkit.org/show_bug.cgi?id=159925
+
+ Reviewed by Benjamin Poulain.
+
+ Fix null handling of HTMLSelectElement.value attribute:
+ - https://html.spec.whatwg.org/multipage/forms.html#htmlselectelement
+
+ We were treating null as the null String which would end up setting
+ selectedIndex to -1. However, we should treat null as the String "null"
+ which would set the selectedIndex to the index of the <option> element
+ whose value is "null".
+
+ Firefox and Chrome match the specification.
+
+ Test: fast/dom/HTMLSelectElement/value-null-handling.html
+
+ * html/HTMLSelectElement.cpp:
+ (WebCore::HTMLSelectElement::setValue):
+ * html/HTMLSelectElement.idl:
+
+2016-07-20 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> PostResolutionCallbackDisabler can resume pending requests while a ResourceLoadSuspender is alive
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=159962
</span><span class="cx"> <rdar://problem/21439264>
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLSelectElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLSelectElement.cpp (203455 => 203456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLSelectElement.cpp        2016-07-20 15:50:45 UTC (rev 203455)
+++ trunk/Source/WebCore/html/HTMLSelectElement.cpp        2016-07-20 16:37:40 UTC (rev 203456)
</span><span class="lines">@@ -262,14 +262,8 @@
</span><span class="cx"> return emptyString();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLSelectElement::setValue(const String &value)
</del><ins>+void HTMLSelectElement::setValue(const String& value)
</ins><span class="cx"> {
</span><del>- // We clear the previously selected option(s) when needed, to guarantee calling setSelectedIndex() only once.
- if (value.isNull()) {
- setSelectedIndex(-1);
- return;
- }
-
</del><span class="cx"> // Find the option with value() matching the given parameter and make it the current selection.
</span><span class="cx"> unsigned optionIndex = 0;
</span><span class="cx"> for (auto* item : listItems()) {
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLSelectElementidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLSelectElement.idl (203455 => 203456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLSelectElement.idl        2016-07-20 15:50:45 UTC (rev 203455)
+++ trunk/Source/WebCore/html/HTMLSelectElement.idl        2016-07-20 16:37:40 UTC (rev 203456)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> readonly attribute HTMLCollection selectedOptions;
</span><span class="cx"> attribute long selectedIndex;
</span><span class="cx">
</span><del>- [TreatNullAs=LegacyNullString] attribute DOMString value; // FIXME: This should not use [TreatNullAs=LegacyNullString].
</del><ins>+ attribute DOMString value;
</ins><span class="cx">
</span><span class="cx"> readonly attribute boolean willValidate;
</span><span class="cx"> readonly attribute ValidityState validity;
</span></span></pre>
</div>
</div>
</body>
</html>