<!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>[202334] 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/202334">202334</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-06-22 10:50:15 -0700 (Wed, 22 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>JSDOMIterator forEach should support second optional parameter
https://bugs.webkit.org/show_bug.cgi?id=159020
Patch by Youenn Fablet <youennf@gmail.com> on 2016-06-22
Reviewed by Chris Dumez.
Source/WebCore:
Covered by beefed up test.
* bindings/js/JSDOMIterator.h:
(WebCore::iteratorForEach): Setting callback thisValue to the second argument passed to forEach.
LayoutTests:
* fast/dom/nodeListIterator-expected.txt:
* fast/dom/nodeListIterator.html: Adding 'thisValue' various checks.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastdomnodeListIteratorexpectedtxt">trunk/LayoutTests/fast/dom/nodeListIterator-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomnodeListIteratorhtml">trunk/LayoutTests/fast/dom/nodeListIterator.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMIteratorh">trunk/Source/WebCore/bindings/js/JSDOMIterator.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (202333 => 202334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-06-22 17:16:27 UTC (rev 202333)
+++ trunk/LayoutTests/ChangeLog 2016-06-22 17:50:15 UTC (rev 202334)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-06-22 Youenn Fablet <youennf@gmail.com>
+
+ JSDOMIterator forEach should support second optional parameter
+ https://bugs.webkit.org/show_bug.cgi?id=159020
+
+ Reviewed by Chris Dumez.
+
+ * fast/dom/nodeListIterator-expected.txt:
+ * fast/dom/nodeListIterator.html: Adding 'thisValue' various checks.
+
</ins><span class="cx"> 2016-06-22 Per Arne Vollan <pvollan@apple.com>
</span><span class="cx">
</span><span class="cx"> window.showModalDialog doesn't work in DumpRenderTree on Windows
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomnodeListIteratorexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/nodeListIterator-expected.txt (202333 => 202334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/nodeListIterator-expected.txt 2016-06-22 17:16:27 UTC (rev 202333)
+++ trunk/LayoutTests/fast/dom/nodeListIterator-expected.txt 2016-06-22 17:50:15 UTC (rev 202334)
</span><span class="lines">@@ -11,9 +11,15 @@
</span><span class="cx"> PASS forEachContainer is nodeList
</span><span class="cx"> PASS forEachIndex is index
</span><span class="cx"> PASS node is children[index++]
</span><ins>+PASS thisValue is window
</ins><span class="cx"> PASS forEachContainer is nodeList
</span><span class="cx"> PASS forEachIndex is index
</span><span class="cx"> PASS node is children[index++]
</span><ins>+PASS thisValue is window
+PASS thisValue is window
+PASS thisValue is window
+PASS thisValue is givenThisValue
+PASS thisValue is givenThisValue
</ins><span class="cx"> PASS iterator.next().value is children[0]
</span><span class="cx"> PASS iterator.next().value is children[1]
</span><span class="cx"> PASS end.done is true
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomnodeListIteratorhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/nodeListIterator.html (202333 => 202334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/nodeListIterator.html 2016-06-22 17:16:27 UTC (rev 202333)
+++ trunk/LayoutTests/fast/dom/nodeListIterator.html 2016-06-22 17:50:15 UTC (rev 202334)
</span><span class="lines">@@ -39,15 +39,29 @@
</span><span class="cx"> var node;
</span><span class="cx"> var forEachIndex;
</span><span class="cx"> var forEachContainer;
</span><ins>+ var thisValue;
</ins><span class="cx"> nodeList.forEach(function(n, i, c) {
</span><span class="cx"> node = n;
</span><span class="cx"> forEachIndex = i;
</span><span class="cx"> forEachContainer = c;
</span><ins>+ thisValue = this;
</ins><span class="cx"> shouldBe('forEachContainer', 'nodeList');
</span><span class="cx"> shouldBe('forEachIndex', 'index');
</span><span class="cx"> shouldBe('node', 'children[index++]');
</span><ins>+ shouldBe('thisValue', 'window');
</ins><span class="cx"> });
</span><del>-
</del><ins>+
+ nodeList.forEach(function() {
+ thisValue = this;
+ shouldBe('thisValue', 'window');
+ }, undefined);
+
+ var givenThisValue = nodeList;
+ nodeList.forEach(function() {
+ thisValue = this;
+ shouldBe('thisValue', 'givenThisValue');
+ }, givenThisValue);
+
</ins><span class="cx"> var iterator = nodeList.keys();
</span><span class="cx"> shouldBe('iterator.next().value', 'children[0]');
</span><span class="cx"> shouldBe('iterator.next().value', 'children[1]');
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202333 => 202334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-22 17:16:27 UTC (rev 202333)
+++ trunk/Source/WebCore/ChangeLog 2016-06-22 17:50:15 UTC (rev 202334)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-06-22 Youenn Fablet <youennf@gmail.com>
+
+ JSDOMIterator forEach should support second optional parameter
+ https://bugs.webkit.org/show_bug.cgi?id=159020
+
+ Reviewed by Chris Dumez.
+
+ Covered by beefed up test.
+
+ * bindings/js/JSDOMIterator.h:
+ (WebCore::iteratorForEach): Setting callback thisValue to the second argument passed to forEach.
+
</ins><span class="cx"> 2016-06-22 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> Media controls stop working after exiting PiP
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMIteratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMIterator.h (202333 => 202334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMIterator.h 2016-06-22 17:16:27 UTC (rev 202333)
+++ trunk/Source/WebCore/bindings/js/JSDOMIterator.h 2016-06-22 17:50:15 UTC (rev 202334)
</span><span class="lines">@@ -182,8 +182,11 @@
</span><span class="cx"> if (UNLIKELY(!wrapper))
</span><span class="cx"> return throwThisTypeError(state, JSWrapper::info()->className, propertyName);
</span><span class="cx">
</span><ins>+ JSC::JSValue callback = state.argument(0);
+ JSC::JSValue thisValue = state.argument(1);
+
</ins><span class="cx"> JSC::CallData callData;
</span><del>- JSC::CallType callType = JSC::getCallData(state.argument(0), callData);
</del><ins>+ JSC::CallType callType = JSC::getCallData(callback, callData);
</ins><span class="cx"> if (callType == JSC::CallType::None)
</span><span class="cx"> return throwVMTypeError(&state);
</span><span class="cx">
</span><span class="lines">@@ -193,10 +196,10 @@
</span><span class="cx"> JSC::MarkedArgumentBuffer arguments;
</span><span class="cx"> appendForEachArguments(state, wrapper->globalObject(), arguments, value, index);
</span><span class="cx"> arguments.append(wrapper);
</span><del>- JSC::call(&state, state.argument(0), callType, callData, wrapper, arguments);
</del><ins>+ JSC::call(&state, callback, callType, callData, thisValue, arguments);
</ins><span class="cx"> if (state.hadException())
</span><span class="cx"> break;
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> return JSC::JSValue::encode(JSC::jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>