<!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>[169162] 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/169162">169162</a></dd>
<dt>Author</dt> <dd>graouts@webkit.org</dd>
<dt>Date</dt> <dd>2014-05-21 09:14:55 -0700 (Wed, 21 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Array.prototype.find and findIndex should skip holes
https://bugs.webkit.org/show_bug.cgi?id=132658
Reviewed by Geoffrey Garen.
Source/JavaScriptCore:
Skip holes in the array when iterating such that callback isn't called.
* builtins/Array.prototype.js:
(find):
(findIndex):
LayoutTests:
* js/array-find-expected.txt:
* js/array-findIndex-expected.txt:
* js/script-tests/array-find.js:
* js/script-tests/array-findIndex.js:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsjsarrayfindexpectedtxt">trunk/LayoutTests/js/array-find-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsarrayfindIndexexpectedtxt">trunk/LayoutTests/js/array-findIndex-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsscripttestsarrayfindjs">trunk/LayoutTests/js/script-tests/array-find.js</a></li>
<li><a href="#trunkLayoutTestsjsscripttestsarrayfindIndexjs">trunk/LayoutTests/js/script-tests/array-findIndex.js</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebuiltinsArrayprototypejs">trunk/Source/JavaScriptCore/builtins/Array.prototype.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (169161 => 169162)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-05-21 16:06:55 UTC (rev 169161)
+++ trunk/LayoutTests/ChangeLog 2014-05-21 16:14:55 UTC (rev 169162)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-05-21 Antoine Quint <graouts@webkit.org>
+
+ Array.prototype.find and findIndex should skip holes
+ https://bugs.webkit.org/show_bug.cgi?id=132658
+
+ Reviewed by Geoffrey Garen.
+
+ * js/array-find-expected.txt:
+ * js/array-findIndex-expected.txt:
+ * js/script-tests/array-find.js:
+ * js/script-tests/array-findIndex.js:
+
</ins><span class="cx"> 2014-05-21 Radu Stavila <stavila@adobe.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r168046): Invalid layout in WebCore::RenderBox::containingBlockLogicalWidthForPositioned
</span></span></pre></div>
<a id="trunkLayoutTestsjsarrayfindexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/array-find-expected.txt (169161 => 169162)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/array-find-expected.txt 2014-05-21 16:06:55 UTC (rev 169161)
+++ trunk/LayoutTests/js/array-find-expected.txt 2014-05-21 16:14:55 UTC (rev 169162)
</span><span class="lines">@@ -40,6 +40,12 @@
</span><span class="cx"> PASS [].find({}) threw exception TypeError: Array.prototype.find callback must be a function.
</span><span class="cx"> PASS [].find(null) threw exception TypeError: Array.prototype.find callback must be a function.
</span><span class="cx"> PASS [].find(undefined) threw exception TypeError: Array.prototype.find callback must be a function.
</span><ins>+find callback called with index 10
+find callback called with index 20
+find callback called with index 30
+find callback called with index 40
+find callback called with index 50
+PASS numberOfCallbacksInFindInArrayWithHoles() is 5
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsjsarrayfindIndexexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/array-findIndex-expected.txt (169161 => 169162)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/array-findIndex-expected.txt 2014-05-21 16:06:55 UTC (rev 169161)
+++ trunk/LayoutTests/js/array-findIndex-expected.txt 2014-05-21 16:14:55 UTC (rev 169162)
</span><span class="lines">@@ -13,12 +13,13 @@
</span><span class="cx"> PASS [undefined, 0, null, ''].findIndex(passFalse) is -1
</span><span class="cx"> PASS [undefined, 0, null, false].findIndex(passEmptyString) is -1
</span><span class="cx"> PASS [undefined, null, false, ''].findIndex(passZero) is -1
</span><del>-PASS (new Array(20)).findIndex(passUndefined) is 0
-PASS arrayWithHoles.findIndex(passUndefined) is 0
</del><ins>+PASS (new Array(20)).findIndex(passUndefined) is -1
+PASS arrayWithHoles.findIndex(passUndefined) is -1
</ins><span class="cx"> PASS arrayWithHoles.findIndex(passZero) is 10
</span><span class="cx"> PASS arrayWithHoles.findIndex(passNull) is 20
</span><span class="cx"> PASS arrayWithHoles.findIndex(passFalse) is 30
</span><span class="cx"> PASS arrayWithHoles.findIndex(passEmptyString) is 40
</span><ins>+PASS arrayWithHoles.findIndex(passUndefined) is 50
</ins><span class="cx"> PASS toObject([undefined, 0, null, false, '']).findIndex(passUndefined) is 0
</span><span class="cx"> PASS toObject([undefined, 0, null, false, '']).findIndex(passZero) is 1
</span><span class="cx"> PASS toObject([undefined, 0, null, false, '']).findIndex(passNull) is 2
</span><span class="lines">@@ -29,7 +30,7 @@
</span><span class="cx"> PASS toObject([undefined, 0, null, '']).findIndex(passFalse) is -1
</span><span class="cx"> PASS toObject([undefined, 0, null, false]).findIndex(passEmptyString) is -1
</span><span class="cx"> PASS toObject([undefined, null, false, '']).findIndex(passZero) is -1
</span><del>-PASS toObject(new Array(20)).findIndex(passUndefined) is 0
</del><ins>+PASS toObject(new Array(20)).findIndex(passUndefined) is -1
</ins><span class="cx"> PASS [0,1,2,3,4,5,6,7,8,9].findIndex(findItemAddedDuringSearch) is -1
</span><span class="cx"> PASS [0,1,2,3,4,5,6,7,8,9].findIndex(findItemRemovedDuringSearch) is -1
</span><span class="cx"> PASS Array.prototype.findIndex.call(undefined, function() {}) threw exception TypeError: Array.prototype.findIndex requires that |this| not be undefined.
</span><span class="lines">@@ -40,6 +41,12 @@
</span><span class="cx"> PASS [].findIndex({}) threw exception TypeError: Array.prototype.findIndex callback must be a function.
</span><span class="cx"> PASS [].findIndex(null) threw exception TypeError: Array.prototype.findIndex callback must be a function.
</span><span class="cx"> PASS [].findIndex(undefined) threw exception TypeError: Array.prototype.findIndex callback must be a function.
</span><ins>+find callback called with index 10
+find callback called with index 20
+find callback called with index 30
+find callback called with index 40
+find callback called with index 50
+PASS numberOfCallbacksInFindIndexInArrayWithHoles() is 5
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsarrayfindjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/script-tests/array-find.js (169161 => 169162)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/array-find.js 2014-05-21 16:06:55 UTC (rev 169161)
+++ trunk/LayoutTests/js/script-tests/array-find.js 2014-05-21 16:14:55 UTC (rev 169162)
</span><span class="lines">@@ -44,6 +44,15 @@
</span><span class="cx"> arrayWithHoles[20] = null;
</span><span class="cx"> arrayWithHoles[30] = false;
</span><span class="cx"> arrayWithHoles[40] = "";
</span><ins>+arrayWithHoles[50] = undefined;
+function numberOfCallbacksInFindInArrayWithHoles() {
+ var count = 0;
+ arrayWithHoles.find(function(element, index, array) {
+ debug("find callback called with index " + index);
+ count++;
+ });
+ return count;
+}
</ins><span class="cx">
</span><span class="cx"> shouldBe("[undefined, 0, null, false, ''].find(passUndefined)", "undefined");
</span><span class="cx"> shouldBe("[undefined, 0, null, false, ''].find(passZero)", "0");
</span><span class="lines">@@ -90,3 +99,6 @@
</span><span class="cx"> shouldThrow("[].find({})", "'TypeError: Array.prototype.find callback must be a function'");
</span><span class="cx"> shouldThrow("[].find(null)", "'TypeError: Array.prototype.find callback must be a function'");
</span><span class="cx"> shouldThrow("[].find(undefined)", "'TypeError: Array.prototype.find callback must be a function'");
</span><ins>+
+// Callbacks in the expected order and skipping holes.
+shouldBe("numberOfCallbacksInFindInArrayWithHoles()", "5");
</ins></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsarrayfindIndexjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/script-tests/array-findIndex.js (169161 => 169162)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/array-findIndex.js 2014-05-21 16:06:55 UTC (rev 169161)
+++ trunk/LayoutTests/js/script-tests/array-findIndex.js 2014-05-21 16:14:55 UTC (rev 169162)
</span><span class="lines">@@ -44,6 +44,14 @@
</span><span class="cx"> arrayWithHoles[20] = null;
</span><span class="cx"> arrayWithHoles[30] = false;
</span><span class="cx"> arrayWithHoles[40] = "";
</span><ins>+function numberOfCallbacksInFindIndexInArrayWithHoles() {
+ var count = 0;
+ arrayWithHoles.find(function(element, index, array) {
+ debug("find callback called with index " + index);
+ count++;
+ });
+ return count;
+}
</ins><span class="cx">
</span><span class="cx"> shouldBe("[undefined, 0, null, false, ''].findIndex(passUndefined)", "0");
</span><span class="cx"> shouldBe("[undefined, 0, null, false, ''].findIndex(passZero)", "1");
</span><span class="lines">@@ -55,14 +63,16 @@
</span><span class="cx"> shouldBe("[undefined, 0, null, ''].findIndex(passFalse)", "-1");
</span><span class="cx"> shouldBe("[undefined, 0, null, false].findIndex(passEmptyString)", "-1");
</span><span class="cx"> shouldBe("[undefined, null, false, ''].findIndex(passZero)", "-1");
</span><del>-shouldBe("(new Array(20)).findIndex(passUndefined)", "0");
</del><ins>+shouldBe("(new Array(20)).findIndex(passUndefined)", "-1");
</ins><span class="cx">
</span><span class="cx"> // Array with holes.
</span><del>-shouldBe("arrayWithHoles.findIndex(passUndefined)", "0");
</del><ins>+shouldBe("arrayWithHoles.findIndex(passUndefined)", "-1");
</ins><span class="cx"> shouldBe("arrayWithHoles.findIndex(passZero)", "10");
</span><span class="cx"> shouldBe("arrayWithHoles.findIndex(passNull)", "20");
</span><span class="cx"> shouldBe("arrayWithHoles.findIndex(passFalse)", "30");
</span><span class="cx"> shouldBe("arrayWithHoles.findIndex(passEmptyString)", "40");
</span><ins>+arrayWithHoles[50] = undefined;
+shouldBe("arrayWithHoles.findIndex(passUndefined)", "50");
</ins><span class="cx">
</span><span class="cx"> // Generic Object
</span><span class="cx"> shouldBe("toObject([undefined, 0, null, false, '']).findIndex(passUndefined)", "0");
</span><span class="lines">@@ -75,7 +85,7 @@
</span><span class="cx"> shouldBe("toObject([undefined, 0, null, '']).findIndex(passFalse)", "-1");
</span><span class="cx"> shouldBe("toObject([undefined, 0, null, false]).findIndex(passEmptyString)", "-1");
</span><span class="cx"> shouldBe("toObject([undefined, null, false, '']).findIndex(passZero)", "-1");
</span><del>-shouldBe("toObject(new Array(20)).findIndex(passUndefined)", "0");
</del><ins>+shouldBe("toObject(new Array(20)).findIndex(passUndefined)", "-1");
</ins><span class="cx">
</span><span class="cx"> // Modification during search
</span><span class="cx"> shouldBe("[0,1,2,3,4,5,6,7,8,9].findIndex(findItemAddedDuringSearch)", "-1");
</span><span class="lines">@@ -90,3 +100,6 @@
</span><span class="cx"> shouldThrow("[].findIndex({})", "'TypeError: Array.prototype.findIndex callback must be a function'");
</span><span class="cx"> shouldThrow("[].findIndex(null)", "'TypeError: Array.prototype.findIndex callback must be a function'");
</span><span class="cx"> shouldThrow("[].findIndex(undefined)", "'TypeError: Array.prototype.findIndex callback must be a function'");
</span><ins>+
+// Callbacks in the expected order and skipping holes.
+shouldBe("numberOfCallbacksInFindIndexInArrayWithHoles()", "5");
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (169161 => 169162)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-05-21 16:06:55 UTC (rev 169161)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-05-21 16:14:55 UTC (rev 169162)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-05-21 Antoine Quint <graouts@webkit.org>
+
+ Array.prototype.find and findIndex should skip holes
+ https://bugs.webkit.org/show_bug.cgi?id=132658
+
+ Reviewed by Geoffrey Garen.
+
+ Skip holes in the array when iterating such that callback isn't called.
+
+ * builtins/Array.prototype.js:
+ (find):
+ (findIndex):
+
</ins><span class="cx"> 2014-05-21 Eva Balazsfalvi <evab.u-szeged@partner.samsung.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r169092 and r169102): Skip failing JSC tests on ARM64 properly
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebuiltinsArrayprototypejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/builtins/Array.prototype.js (169161 => 169162)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/builtins/Array.prototype.js 2014-05-21 16:06:55 UTC (rev 169161)
+++ trunk/Source/JavaScriptCore/builtins/Array.prototype.js 2014-05-21 16:14:55 UTC (rev 169162)
</span><span class="lines">@@ -205,6 +205,8 @@
</span><span class="cx">
</span><span class="cx"> var thisArg = arguments.length > 1 ? arguments[1] : undefined;
</span><span class="cx"> for (var i = 0; i < length; i++) {
</span><ins>+ if (!(i in array))
+ continue;
</ins><span class="cx"> if (callback.@call(thisArg, array[i], i, array))
</span><span class="cx"> return array[i];
</span><span class="cx"> }
</span><span class="lines">@@ -227,6 +229,8 @@
</span><span class="cx">
</span><span class="cx"> var thisArg = arguments.length > 1 ? arguments[1] : undefined;
</span><span class="cx"> for (var i = 0; i < length; i++) {
</span><ins>+ if (!(i in array))
+ continue;
</ins><span class="cx"> if (callback.@call(thisArg, array[i], i, array))
</span><span class="cx"> return i;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>