<!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>[202478] 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/202478">202478</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-06-26 18:29:34 -0700 (Sun, 26 Jun 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>Regression: HTMLOptionsCollection's named properties have precedence over indexed properties
https://bugs.webkit.org/show_bug.cgi?id=159058
&lt;rdar://problem/26988542&gt;

Reviewed by Ryosuke Niwa.

Source/WebCore:

HTMLOptionsCollection's named properties had precedence over indexed properties,
which is wrong as per:
http://heycam.github.io/webidl/#getownproperty-guts

The reason is that there was a named property getter defined on HTMLOptionsCollection
but no indexed property getter. As a result, HTMLOptionsCollection would fall back to
using HTMLCollection's indexed property getter but HTMLOptionsCollection's named getter
would take precedence. This patch defines an indexed property getter on
HTMLOptionsCollection to fix the problem.

Ideally, HTMLOptionsCollection would have no indexed / named property getters and would
entirely rely on the ones from HTMLCollection. However, our bindings generator currently
has trouble with this and requires HTMLOptionsCollection to have a named getter.

Test: fast/dom/HTMLSelectElement/options-indexed-getter-precedence.html

* html/HTMLOptionsCollection.idl:

LayoutTests:

Add layout test coverage.

* fast/dom/HTMLSelectElement/options-indexed-getter-precedence-expected.txt: Added.
* fast/dom/HTMLSelectElement/options-indexed-getter-precedence.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="#trunkSourceWebCorehtmlHTMLOptionsCollectionidl">trunk/Source/WebCore/html/HTMLOptionsCollection.idl</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastdomHTMLSelectElementoptionsindexedgetterprecedenceexpectedtxt">trunk/LayoutTests/fast/dom/HTMLSelectElement/options-indexed-getter-precedence-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomHTMLSelectElementoptionsindexedgetterprecedencehtml">trunk/LayoutTests/fast/dom/HTMLSelectElement/options-indexed-getter-precedence.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (202477 => 202478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2016-06-26 22:31:26 UTC (rev 202477)
+++ trunk/LayoutTests/ChangeLog        2016-06-27 01:29:34 UTC (rev 202478)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-06-26  Chris Dumez  &lt;cdumez@apple.com&gt;
+
+        Regression: HTMLOptionsCollection's named properties have precedence over indexed properties
+        https://bugs.webkit.org/show_bug.cgi?id=159058
+        &lt;rdar://problem/26988542&gt;
+
+        Reviewed by Ryosuke Niwa.
+
+        Add layout test coverage.
+
+        * fast/dom/HTMLSelectElement/options-indexed-getter-precedence-expected.txt: Added.
+        * fast/dom/HTMLSelectElement/options-indexed-getter-precedence.html: Added.
+
</ins><span class="cx"> 2016-06-26  Javier Fernandez  &lt;jfernandez@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [GTK] Unreviewed test gardening.
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomHTMLSelectElementoptionsindexedgetterprecedenceexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/HTMLSelectElement/options-indexed-getter-precedence-expected.txt (0 => 202478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/HTMLSelectElement/options-indexed-getter-precedence-expected.txt                                (rev 0)
+++ trunk/LayoutTests/fast/dom/HTMLSelectElement/options-indexed-getter-precedence-expected.txt        2016-06-27 01:29:34 UTC (rev 202478)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+Test that HTMLOptionsCollection's indexed properties take precedence over named properties
+
+On success, you will see a series of &quot;PASS&quot; messages, followed by &quot;TEST COMPLETE&quot;.
+
+
+PASS options.length is 2
+PASS options[0].value is &quot;option_1&quot;
+PASS options.item(0).value is &quot;option_1&quot;
+PASS options[1].value is &quot;option_2&quot;
+PASS options.item(1).value is &quot;option_2&quot;
+PASS options[2] is undefined.
+PASS options.item(2) is null
+PASS options.namedItem('0').value is &quot;option_2&quot;
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastdomHTMLSelectElementoptionsindexedgetterprecedencehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/HTMLSelectElement/options-indexed-getter-precedence.html (0 => 202478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/HTMLSelectElement/options-indexed-getter-precedence.html                                (rev 0)
+++ trunk/LayoutTests/fast/dom/HTMLSelectElement/options-indexed-getter-precedence.html        2016-06-27 01:29:34 UTC (rev 202478)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+&lt;body&gt;
+&lt;script src=&quot;../../../resources/js-test-pre.js&quot;&gt;&lt;/script&gt;
+&lt;select id=&quot;testSelect&quot;&gt;
+&lt;option value=&quot;option_1&quot;&gt;Option 1&lt;/option&gt;
+&lt;option name=&quot;0&quot; value=&quot;option_2&quot;&gt;Option 2&lt;/option&gt;
+&lt;script&gt;
+description(&quot;Test that HTMLOptionsCollection's indexed properties take precedence over named properties&quot;);
+
+var options = document.getElementById(&quot;testSelect&quot;).options;
+shouldBe(&quot;options.length&quot;, &quot;2&quot;);
+shouldBeEqualToString(&quot;options[0].value&quot;, &quot;option_1&quot;); // Would return option_2 if named properties took precedence over indexed properties.
+shouldBeEqualToString(&quot;options.item(0).value&quot;, &quot;option_1&quot;);
+shouldBeEqualToString(&quot;options[1].value&quot;, &quot;option_2&quot;);
+shouldBeEqualToString(&quot;options.item(1).value&quot;, &quot;option_2&quot;);
+shouldBeUndefined(&quot;options[2]&quot;);
+shouldBeNull(&quot;options.item(2)&quot;);
+shouldBeEqualToString(&quot;options.namedItem('0').value&quot;, &quot;option_2&quot;);
+&lt;/script&gt;
+&lt;script src=&quot;../../../resources/js-test-post.js&quot;&gt;&lt;/script&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202477 => 202478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-06-26 22:31:26 UTC (rev 202477)
+++ trunk/Source/WebCore/ChangeLog        2016-06-27 01:29:34 UTC (rev 202478)
</span><span class="lines">@@ -1,5 +1,31 @@
</span><span class="cx"> 2016-06-26  Chris Dumez  &lt;cdumez@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Regression: HTMLOptionsCollection's named properties have precedence over indexed properties
+        https://bugs.webkit.org/show_bug.cgi?id=159058
+        &lt;rdar://problem/26988542&gt;
+
+        Reviewed by Ryosuke Niwa.
+
+        HTMLOptionsCollection's named properties had precedence over indexed properties,
+        which is wrong as per:
+        http://heycam.github.io/webidl/#getownproperty-guts
+
+        The reason is that there was a named property getter defined on HTMLOptionsCollection
+        but no indexed property getter. As a result, HTMLOptionsCollection would fall back to
+        using HTMLCollection's indexed property getter but HTMLOptionsCollection's named getter
+        would take precedence. This patch defines an indexed property getter on
+        HTMLOptionsCollection to fix the problem.
+
+        Ideally, HTMLOptionsCollection would have no indexed / named property getters and would
+        entirely rely on the ones from HTMLCollection. However, our bindings generator currently
+        has trouble with this and requires HTMLOptionsCollection to have a named getter.
+
+        Test: fast/dom/HTMLSelectElement/options-indexed-getter-precedence.html
+
+        * html/HTMLOptionsCollection.idl:
+
+2016-06-26  Chris Dumez  &lt;cdumez@apple.com&gt;
+
</ins><span class="cx">         Regression(r202262): Infinite loop under searchForLinkRemovingExistingDDLinks()
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=159122
</span><span class="cx">         &lt;rdar://problem/27014649&gt;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLOptionsCollectionidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLOptionsCollection.idl (202477 => 202478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLOptionsCollection.idl        2016-06-26 22:31:26 UTC (rev 202477)
+++ trunk/Source/WebCore/html/HTMLOptionsCollection.idl        2016-06-27 01:29:34 UTC (rev 202478)
</span><span class="lines">@@ -29,6 +29,8 @@
</span><span class="cx"> #if defined(LANGUAGE_OBJECTIVE_C) &amp;&amp; LANGUAGE_OBJECTIVE_C || defined(LANGUAGE_GOBJECT) &amp;&amp; LANGUAGE_GOBJECT
</span><span class="cx">     getter Node namedItem(optional DOMString name);
</span><span class="cx"> #else
</span><ins>+    getter HTMLOptionElement? item(unsigned long index);
+
</ins><span class="cx">     // FIXME: Using &quot;undefined&quot; as default parameter value is wrong.
</span><span class="cx">     getter HTMLOptionElement namedItem(optional DOMString name = &quot;undefined&quot;);
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>

</body>
</html>