<!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>[183374] 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/183374">183374</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-04-26 17:33:48 -0700 (Sun, 26 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Map#forEach does not pass "map" argument to callback.
https://bugs.webkit.org/show_bug.cgi?id=144187
Patch by Jordan Harband <ljharb@gmail.com> on 2015-04-26
Reviewed by Darin Adler.
Per https://people.mozilla.org/~jorendorff/es6-draft.html#sec-map.prototype.foreach
step 7.a.i., the callback should be called with three arguments.
* runtime/MapPrototype.cpp:
(JSC::mapProtoFuncForEach):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeMapPrototypecpp">trunk/Source/JavaScriptCore/runtime/MapPrototype.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsjsmapforeachcallsbackwithrightargsexpectedtxt">trunk/LayoutTests/js/map-foreach-calls-back-with-right-args-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsmapforeachcallsbackwithrightargshtml">trunk/LayoutTests/js/map-foreach-calls-back-with-right-args.html</a></li>
<li><a href="#trunkLayoutTestsjsscripttestsmapforeachcallsbackwithrightargsjs">trunk/LayoutTests/js/script-tests/map-foreach-calls-back-with-right-args.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsjsmapforeachcallsbackwithrightargsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/map-foreach-calls-back-with-right-args-expected.txt (0 => 183374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/map-foreach-calls-back-with-right-args-expected.txt (rev 0)
+++ trunk/LayoutTests/js/map-foreach-calls-back-with-right-args-expected.txt 2015-04-27 00:33:48 UTC (rev 183374)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+Tests to make sure we call forEach callback with right arguments
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS called is true
+PASS actual.value is 'value'
+PASS actual.key is 'key'
+PASS actual.map is m
+PASS actual.receiver is receiver
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsjsmapforeachcallsbackwithrightargshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/map-foreach-calls-back-with-right-args.html (0 => 183374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/map-foreach-calls-back-with-right-args.html (rev 0)
+++ trunk/LayoutTests/js/map-foreach-calls-back-with-right-args.html 2015-04-27 00:33:48 UTC (rev 183374)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script src="script-tests/map-foreach-calls-back-with-right-args.js"></script>
+<script src="../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsmapforeachcallsbackwithrightargsjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/script-tests/map-foreach-calls-back-with-right-args.js (0 => 183374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/map-foreach-calls-back-with-right-args.js (rev 0)
+++ trunk/LayoutTests/js/script-tests/map-foreach-calls-back-with-right-args.js 2015-04-27 00:33:48 UTC (rev 183374)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+description("Tests to make sure we call forEach callback with right arguments");
+var m = new Map();
+m.set('key', 'value');
+var called = false;
+var actual = {};
+var receiver = { receiver: true };
+m.forEach(function (value, key, map) {
+ called = true;
+ actual.value = value;
+ actual.key = key;
+ actual.map = map;
+ actual.receiver = this;
+}, receiver);
+shouldBeTrue("called");
+shouldBe("actual.value", "'value'");
+shouldBe("actual.key", "'key'");
+shouldBe("actual.map", "m");
+shouldBe("actual.receiver", "receiver");
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (183373 => 183374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-04-27 00:27:28 UTC (rev 183373)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-04-27 00:33:48 UTC (rev 183374)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-04-26 Jordan Harband <ljharb@gmail.com>
+
+ Map#forEach does not pass "map" argument to callback.
+ https://bugs.webkit.org/show_bug.cgi?id=144187
+
+ Reviewed by Darin Adler.
+
+ Per https://people.mozilla.org/~jorendorff/es6-draft.html#sec-map.prototype.foreach
+ step 7.a.i., the callback should be called with three arguments.
+
+ * runtime/MapPrototype.cpp:
+ (JSC::mapProtoFuncForEach):
+
</ins><span class="cx"> 2015-04-26 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [ES6] Implement ES6 template literals
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeMapPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/MapPrototype.cpp (183373 => 183374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/MapPrototype.cpp 2015-04-27 00:27:28 UTC (rev 183373)
+++ trunk/Source/JavaScriptCore/runtime/MapPrototype.cpp 2015-04-27 00:33:48 UTC (rev 183374)
</span><span class="lines">@@ -125,11 +125,12 @@
</span><span class="cx"> JSValue key, value;
</span><span class="cx"> if (callType == CallTypeJS) {
</span><span class="cx"> JSFunction* function = jsCast<JSFunction*>(callBack);
</span><del>- CachedCall cachedCall(callFrame, function, 2);
</del><ins>+ CachedCall cachedCall(callFrame, function, 3);
</ins><span class="cx"> while (iterator->nextKeyValue(key, value) && !vm->exception()) {
</span><span class="cx"> cachedCall.setThis(thisValue);
</span><span class="cx"> cachedCall.setArgument(0, value);
</span><span class="cx"> cachedCall.setArgument(1, key);
</span><ins>+ cachedCall.setArgument(2, map);
</ins><span class="cx"> cachedCall.call();
</span><span class="cx"> }
</span><span class="cx"> iterator->finish();
</span><span class="lines">@@ -138,6 +139,7 @@
</span><span class="cx"> MarkedArgumentBuffer args;
</span><span class="cx"> args.append(value);
</span><span class="cx"> args.append(key);
</span><ins>+ args.append(map);
</ins><span class="cx"> JSC::call(callFrame, callBack, callType, callData, thisValue, args);
</span><span class="cx"> }
</span><span class="cx"> iterator->finish();
</span></span></pre>
</div>
</div>
</body>
</html>