<!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>[200358] 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/200358">200358</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-05-02 19:52:19 -0700 (Mon, 02 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Indexing CSSStyleDeclaration object with out-of-range index should return undefined
https://bugs.webkit.org/show_bug.cgi?id=157283
Reviewed by Darin Adler.
Source/WebCore:
Indexing CSSStyleDeclaration object with out-of-range index should return undefined,
as per:
- http://heycam.github.io/webidl/#idl-indexed-properties
- http://heycam.github.io/webidl/#getownproperty-guts
WebKit was incorrectly returning the empty string in this case. We however, still
return the empty string if calling the indexed property getter via item(), as is
expected.
The new behavior matches Firefox and the Web IDL specification. Chrome returns the
empty string in this case though.
Test: fast/dom/indexed-getters-returning-string.html
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::CSSComputedStyleDeclaration::item):
* css/PropertySetCSSStyleDeclaration.cpp:
(WebCore::PropertySetCSSStyleDeclaration::item):
LayoutTests:
Rebaseline a couple of existing tests due to the slight behavior change.
Also add a new layout test for more extensive testing.
* fast/dom/CSSStyleDeclaration/css-computed-style-item-expected.txt:
* fast/dom/CSSStyleDeclaration/css-style-item-expected.txt:
* fast/dom/CSSStyleDeclaration/script-tests/css-computed-style-item.js:
* fast/dom/CSSStyleDeclaration/script-tests/css-style-item.js:
* fast/dom/indexed-getters-returning-string-expected.txt: Added.
* fast/dom/indexed-getters-returning-string.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastdomCSSStyleDeclarationcsscomputedstyleitemexpectedtxt">trunk/LayoutTests/fast/dom/CSSStyleDeclaration/css-computed-style-item-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomCSSStyleDeclarationcssstyleitemexpectedtxt">trunk/LayoutTests/fast/dom/CSSStyleDeclaration/css-style-item-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomCSSStyleDeclarationscripttestscsscomputedstyleitemjs">trunk/LayoutTests/fast/dom/CSSStyleDeclaration/script-tests/css-computed-style-item.js</a></li>
<li><a href="#trunkLayoutTestsfastdomCSSStyleDeclarationscripttestscssstyleitemjs">trunk/LayoutTests/fast/dom/CSSStyleDeclaration/script-tests/css-style-item.js</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSComputedStyleDeclarationcpp">trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp</a></li>
<li><a href="#trunkSourceWebCorecssPropertySetCSSStyleDeclarationcpp">trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastdomindexedgettersreturningstringexpectedtxt">trunk/LayoutTests/fast/dom/indexed-getters-returning-string-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomindexedgettersreturningstringhtml">trunk/LayoutTests/fast/dom/indexed-getters-returning-string.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (200357 => 200358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-05-03 02:25:31 UTC (rev 200357)
+++ trunk/LayoutTests/ChangeLog 2016-05-03 02:52:19 UTC (rev 200358)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-05-02 Chris Dumez <cdumez@apple.com>
+
+ Indexing CSSStyleDeclaration object with out-of-range index should return undefined
+ https://bugs.webkit.org/show_bug.cgi?id=157283
+
+ Reviewed by Darin Adler.
+
+ Rebaseline a couple of existing tests due to the slight behavior change.
+ Also add a new layout test for more extensive testing.
+
+ * fast/dom/CSSStyleDeclaration/css-computed-style-item-expected.txt:
+ * fast/dom/CSSStyleDeclaration/css-style-item-expected.txt:
+ * fast/dom/CSSStyleDeclaration/script-tests/css-computed-style-item.js:
+ * fast/dom/CSSStyleDeclaration/script-tests/css-style-item.js:
+ * fast/dom/indexed-getters-returning-string-expected.txt: Added.
+ * fast/dom/indexed-getters-returning-string.html: Added.
+
</ins><span class="cx"> 2016-05-02 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> Specifying a longhand property should not serialize to a shorthand property
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomCSSStyleDeclarationcsscomputedstyleitemexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/CSSStyleDeclaration/css-computed-style-item-expected.txt (200357 => 200358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/CSSStyleDeclaration/css-computed-style-item-expected.txt 2016-05-03 02:25:31 UTC (rev 200357)
+++ trunk/LayoutTests/fast/dom/CSSStyleDeclaration/css-computed-style-item-expected.txt 2016-05-03 02:52:19 UTC (rev 200358)
</span><span class="lines">@@ -4,7 +4,8 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> PASS typeof computedStyle.length is "number"
</span><del>-PASS computedStyle[computedStyle.length] is ""
</del><ins>+PASS computedStyle.item(computedStyle.length) is ""
+PASS computedStyle[computedStyle.length] is undefined.
</ins><span class="cx"> PASS computedStyle[-1] is undefined.
</span><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomCSSStyleDeclarationcssstyleitemexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/CSSStyleDeclaration/css-style-item-expected.txt (200357 => 200358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/CSSStyleDeclaration/css-style-item-expected.txt 2016-05-03 02:25:31 UTC (rev 200357)
+++ trunk/LayoutTests/fast/dom/CSSStyleDeclaration/css-style-item-expected.txt 2016-05-03 02:52:19 UTC (rev 200358)
</span><span class="lines">@@ -5,7 +5,8 @@
</span><span class="cx">
</span><span class="cx"> PASS style.length is 1
</span><span class="cx"> PASS style[0] is "color"
</span><del>-PASS style[1] is ""
</del><ins>+PASS style.item(1) is ""
+PASS style[1] is undefined.
</ins><span class="cx"> PASS style[-1] is undefined.
</span><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomCSSStyleDeclarationscripttestscsscomputedstyleitemjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/CSSStyleDeclaration/script-tests/css-computed-style-item.js (200357 => 200358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/CSSStyleDeclaration/script-tests/css-computed-style-item.js 2016-05-03 02:25:31 UTC (rev 200357)
+++ trunk/LayoutTests/fast/dom/CSSStyleDeclaration/script-tests/css-computed-style-item.js 2016-05-03 02:52:19 UTC (rev 200358)
</span><span class="lines">@@ -6,7 +6,8 @@
</span><span class="cx"> var computedStyle = window.getComputedStyle(element, null);
</span><span class="cx">
</span><span class="cx"> shouldBeEqualToString('typeof computedStyle.length', 'number');
</span><del>-shouldBeEqualToString('computedStyle[computedStyle.length]', '');
</del><ins>+shouldBeEqualToString('computedStyle.item(computedStyle.length)', '');
+shouldBeUndefined('computedStyle[computedStyle.length]');
</ins><span class="cx"> shouldBeUndefined('computedStyle[-1]')
</span><span class="cx">
</span><span class="cx"> document.documentElement.removeChild(element);
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomCSSStyleDeclarationscripttestscssstyleitemjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/CSSStyleDeclaration/script-tests/css-style-item.js (200357 => 200358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/CSSStyleDeclaration/script-tests/css-style-item.js 2016-05-03 02:25:31 UTC (rev 200357)
+++ trunk/LayoutTests/fast/dom/CSSStyleDeclaration/script-tests/css-style-item.js 2016-05-03 02:52:19 UTC (rev 200358)
</span><span class="lines">@@ -7,7 +7,8 @@
</span><span class="cx">
</span><span class="cx"> shouldEvaluateTo('style.length', 1);
</span><span class="cx"> shouldBeEqualToString('style[0]', 'color');
</span><del>-shouldBeEqualToString('style[1]', '');
</del><ins>+shouldBeEqualToString('style.item(1)', '');
+shouldBeUndefined('style[1]');
</ins><span class="cx"> shouldBeUndefined('style[-1]')
</span><span class="cx">
</span><span class="cx"> document.documentElement.removeChild(element);
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomindexedgettersreturningstringexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/indexed-getters-returning-string-expected.txt (0 => 200358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/indexed-getters-returning-string-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/dom/indexed-getters-returning-string-expected.txt 2016-05-03 02:52:19 UTC (rev 200358)
</span><span class="lines">@@ -0,0 +1,27 @@
</span><ins>+Tests the behavior of indexed property getters returning a DOMString with regards to out-of-bounds access
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+* Indexed property getters returning a non-nullable DOMString
+DOMTokenList.item()
+PASS document.body.classList.item(666) is null
+PASS document.body.classList[666] is undefined.
+DOMStringList.item()
+PASS location.ancestorOrigins.item(666) is null
+PASS location.ancestorOrigins[666] is undefined.
+Storage.getItem()
+PASS localStorage.getItem(666) is null
+PASS localStorage[666] is undefined.
+MediaList.item()
+PASS stylesheet.media.item(666) is null
+PASS stylesheet.media[666] is undefined.
+
+* Indexed property getters returning a non-nullable DOMString
+CSSStyleDeclaration.item()
+PASS document.body.style.item(666) is ""
+PASS document.body.style[666] is undefined.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastdomindexedgettersreturningstringhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/indexed-getters-returning-string.html (0 => 200358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/indexed-getters-returning-string.html (rev 0)
+++ trunk/LayoutTests/fast/dom/indexed-getters-returning-string.html 2016-05-03 02:52:19 UTC (rev 200358)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+<!DOCTYPE html>
+<head>
+<style id="style" media="screen"></style>
+</head>
+<body>
+<script src="../../resources/js-test-pre.js"></script>
+<script>
+description("Tests the behavior of indexed property getters returning a DOMString with regards to out-of-bounds access");
+
+debug("* Indexed property getters returning a non-nullable DOMString");
+debug("DOMTokenList.item()");
+shouldBeNull("document.body.classList.item(666)");
+shouldBeUndefined("document.body.classList[666]");
+debug("DOMStringList.item()");
+shouldBeNull("location.ancestorOrigins.item(666)");
+shouldBeUndefined("location.ancestorOrigins[666]");
+debug("Storage.getItem()");
+shouldBeNull("localStorage.getItem(666)");
+shouldBeUndefined("localStorage[666]");
+debug("MediaList.item()");
+var stylesheet = document.getElementById("style").sheet;
+shouldBeNull("stylesheet.media.item(666)");
+shouldBeUndefined("stylesheet.media[666]");
+
+debug("");
+debug("* Indexed property getters returning a non-nullable DOMString");
+debug("CSSStyleDeclaration.item()");
+shouldBeEmptyString("document.body.style.item(666)");
+shouldBeUndefined("document.body.style[666]");
+
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200357 => 200358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-03 02:25:31 UTC (rev 200357)
+++ trunk/Source/WebCore/ChangeLog 2016-05-03 02:52:19 UTC (rev 200358)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2016-05-02 Chris Dumez <cdumez@apple.com>
+
+ Indexing CSSStyleDeclaration object with out-of-range index should return undefined
+ https://bugs.webkit.org/show_bug.cgi?id=157283
+
+ Reviewed by Darin Adler.
+
+ Indexing CSSStyleDeclaration object with out-of-range index should return undefined,
+ as per:
+ - http://heycam.github.io/webidl/#idl-indexed-properties
+ - http://heycam.github.io/webidl/#getownproperty-guts
+
+ WebKit was incorrectly returning the empty string in this case. We however, still
+ return the empty string if calling the indexed property getter via item(), as is
+ expected.
+
+ The new behavior matches Firefox and the Web IDL specification. Chrome returns the
+ empty string in this case though.
+
+ Test: fast/dom/indexed-getters-returning-string.html
+
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::CSSComputedStyleDeclaration::item):
+ * css/PropertySetCSSStyleDeclaration.cpp:
+ (WebCore::PropertySetCSSStyleDeclaration::item):
+
</ins><span class="cx"> 2016-05-02 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> Specifying a longhand property should not serialize to a shorthand property
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (200357 => 200358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2016-05-03 02:25:31 UTC (rev 200357)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2016-05-03 02:52:19 UTC (rev 200358)
</span><span class="lines">@@ -3873,24 +3873,24 @@
</span><span class="cx"> String CSSComputedStyleDeclaration::item(unsigned i) const
</span><span class="cx"> {
</span><span class="cx"> if (i >= length())
</span><del>- return emptyString();
</del><ins>+ return String();
</ins><span class="cx">
</span><span class="cx"> if (i < numComputedProperties)
</span><span class="cx"> return getPropertyNameString(computedProperties[i]);
</span><span class="cx">
</span><span class="cx"> Node* node = m_node.get();
</span><span class="cx"> if (!node)
</span><del>- return emptyString();
</del><ins>+ return String();
</ins><span class="cx">
</span><span class="cx"> auto* style = node->computedStyle(m_pseudoElementSpecifier);
</span><span class="cx"> if (!style)
</span><del>- return emptyString();
</del><ins>+ return String();
</ins><span class="cx">
</span><span class="cx"> unsigned index = i - numComputedProperties;
</span><span class="cx">
</span><span class="cx"> const auto& customProperties = style->customProperties();
</span><span class="cx"> if (index >= customProperties.size())
</span><del>- return emptyString();
</del><ins>+ return String();
</ins><span class="cx">
</span><span class="cx"> Vector<String, 4> results;
</span><span class="cx"> copyKeysToVector(customProperties, results);
</span></span></pre></div>
<a id="trunkSourceWebCorecssPropertySetCSSStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp (200357 => 200358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp 2016-05-03 02:25:31 UTC (rev 200357)
+++ trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp 2016-05-03 02:52:19 UTC (rev 200358)
</span><span class="lines">@@ -137,7 +137,7 @@
</span><span class="cx"> String PropertySetCSSStyleDeclaration::item(unsigned i) const
</span><span class="cx"> {
</span><span class="cx"> if (i >= m_propertySet->propertyCount())
</span><del>- return "";
</del><ins>+ return String();
</ins><span class="cx"> return m_propertySet->propertyAt(i).cssName();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>