<!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>[202302] 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/202302">202302</a></dd>
<dt>Author</dt> <dd>jiewen_tan@apple.com</dd>
<dt>Date</dt> <dd>2016-06-21 16:21:14 -0700 (Tue, 21 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/200678">r200678</a>.
This incompleted feature broke http://m.yahoo.co.jp. Roll it
out together with <a href="http://trac.webkit.org/projects/webkit/changeset/200619">r200619</a>.
Reverted changeset:
"Ensure DOM iterators remain done"
https://bugs.webkit.org/show_bug.cgi?id=157453
http://trac.webkit.org/changeset/200678</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="#trunkLayoutTestsfasttextfontfacesetjavascriptexpectedtxt">trunk/LayoutTests/fast/text/font-face-set-javascript-expected.txt</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 (202301 => 202302)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-06-21 23:09:50 UTC (rev 202301)
+++ trunk/LayoutTests/ChangeLog 2016-06-21 23:21:14 UTC (rev 202302)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-06-21 Jiewen Tan <jiewen_tan@apple.com>
+
+ Unreviewed, rolling out r200678.
+
+ This incompleted feature broke http://m.yahoo.co.jp. Roll it
+ out together with r200619.
+
+ Reverted changeset:
+
+ "Ensure DOM iterators remain done"
+ https://bugs.webkit.org/show_bug.cgi?id=157453
+ http://trac.webkit.org/changeset/200678
+
</ins><span class="cx"> 2016-06-21 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Skip HeapSnapshot test on WebKit1. Shared VM skews the data.
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomnodeListIteratorexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/nodeListIterator-expected.txt (202301 => 202302)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/nodeListIterator-expected.txt 2016-06-21 23:09:50 UTC (rev 202301)
+++ trunk/LayoutTests/fast/dom/nodeListIterator-expected.txt 2016-06-21 23:21:14 UTC (rev 202302)
</span><span class="lines">@@ -9,10 +9,10 @@
</span><span class="cx"> PASS pair[0] is children[0]
</span><span class="cx"> PASS pair[1] is children[1]
</span><span class="cx"> PASS forEachContainer is nodeList
</span><del>-PASS forEachIndex is index
</del><ins>+FAIL forEachIndex should be 0 (of type number). Was [object HTMLDivElement] (of type object).
</ins><span class="cx"> PASS node is children[index++]
</span><span class="cx"> PASS forEachContainer is nodeList
</span><del>-PASS forEachIndex is index
</del><ins>+FAIL forEachIndex should be 1 (of type number). Was [object HTMLOListElement] (of type object).
</ins><span class="cx"> PASS node is children[index++]
</span><span class="cx"> PASS iterator.next().value is children[0]
</span><span class="cx"> PASS iterator.next().value is children[1]
</span><span class="lines">@@ -23,15 +23,15 @@
</span><span class="cx"> PASS end.done is true
</span><span class="cx"> PASS end.value is undefined
</span><span class="cx"> PASS pair.length is 2
</span><del>-PASS pair[0] is 0
</del><ins>+FAIL pair[0] should be 0 (of type number). Was [object HTMLDivElement] (of type object).
</ins><span class="cx"> PASS pair[1] is children[0]
</span><span class="cx"> PASS pair.length is 2
</span><del>-PASS pair[0] is 1
</del><ins>+FAIL pair[0] should be 1 (of type number). Was [object HTMLOListElement] (of type object).
</ins><span class="cx"> PASS pair[1] is children[1]
</span><span class="cx"> PASS end.done is true
</span><span class="cx"> PASS end.value is undefined
</span><del>-PASS end.done is true
-PASS end.value is undefined
</del><ins>+FAIL end.done should be true. Was false.
+FAIL end.value should be undefined (of type undefined). Was [object HTMLParagraphElement],[object HTMLParagraphElement] (of type object).
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextfontfacesetjavascriptexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/text/font-face-set-javascript-expected.txt (202301 => 202302)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/font-face-set-javascript-expected.txt 2016-06-21 23:09:50 UTC (rev 202301)
+++ trunk/LayoutTests/fast/text/font-face-set-javascript-expected.txt 2016-06-21 23:21:14 UTC (rev 202302)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PASS fontFaceSet.status is "loaded"
</span><span class="cx"> PASS item.done is false
</span><span class="cx"> PASS item.value.length is 2
</span><del>-PASS item.value[0] is 0
</del><ins>+FAIL item.value[0] should be 0 (of type number). Was [object FontFace] (of type object).
</ins><span class="cx"> PASS item.value[1] is fontFace1
</span><span class="cx"> PASS item.done is true
</span><span class="cx"> PASS item.value is undefined
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202301 => 202302)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-21 23:09:50 UTC (rev 202301)
+++ trunk/Source/WebCore/ChangeLog 2016-06-21 23:21:14 UTC (rev 202302)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-06-21 Jiewen Tan <jiewen_tan@apple.com>
+
+ Unreviewed, rolling out r200678.
+
+ This incompleted feature broke http://m.yahoo.co.jp. Roll it
+ out together with r200619.
+
+ Reverted changeset:
+
+ "Ensure DOM iterators remain done"
+ https://bugs.webkit.org/show_bug.cgi?id=157453
+ http://trac.webkit.org/changeset/200678
+
</ins><span class="cx"> 2016-06-21 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Begin moving the Apple Pay code to the open source repository
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMIteratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMIterator.h (202301 => 202302)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMIterator.h 2016-06-21 23:09:50 UTC (rev 202301)
+++ trunk/Source/WebCore/bindings/js/JSDOMIterator.h 2016-06-21 23:21:14 UTC (rev 202302)
</span><span class="lines">@@ -108,16 +108,10 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- template<typename IteratorValue> typename std::enable_if<IteratorInspector<IteratorValue>::isMap, JSC::JSValue>::type
- asJS(JSC::ExecState&, IteratorValue&);
- template<typename IteratorValue> typename std::enable_if<IteratorInspector<IteratorValue>::isSet, JSC::JSValue>::type
- asJS(JSC::ExecState&, IteratorValue&);
-
</del><span class="cx"> static void destroy(JSC::JSCell*);
</span><span class="cx">
</span><del>- Optional<typename DOMWrapped::Iterator> m_iterator;
</del><ins>+ typename DOMWrapped::Iterator m_iterator;
</ins><span class="cx"> IterationKind m_kind;
</span><del>- size_t m_index { 0 };
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<typename JSWrapper>
</span><span class="lines">@@ -135,31 +129,30 @@
</span><span class="cx"> return JSC::JSValue::encode(JSDOMIterator<JSWrapper>::create(globalObject.vm(), getDOMStructure<JSDOMIterator<JSWrapper>>(globalObject.vm(), globalObject), *wrapper, kind));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename JSWrapper>
-template<typename IteratorValue> inline typename std::enable_if<IteratorInspector<IteratorValue>::isMap, JSC::JSValue>::type
-JSDOMIterator<JSWrapper>::asJS(JSC::ExecState& state, IteratorValue& value)
</del><ins>+template<typename IteratorValue> typename std::enable_if<IteratorInspector<IteratorValue>::isMap, JSC::JSValue>::type
+toJS(JSC::ExecState& state, JSDOMGlobalObject* globalObject, IteratorValue& value, IterationKind kind)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(value);
</span><del>- if (m_kind != IterationKind::KeyValue)
- return toJS(&state, globalObject(), (m_kind == IterationKind::Key) ? value->key : value->value);
</del><ins>+ if (kind != IterationKind::KeyValue)
+ return toJS(&state, globalObject, (kind == IterationKind::Key) ? value->key : value->value);
</ins><span class="cx">
</span><del>- return jsPair(state, globalObject(), value->key, value->value);
</del><ins>+ return jsPair(state, globalObject, value->key, value->value);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename JSWrapper>
-template<typename IteratorValue> inline typename std::enable_if<IteratorInspector<IteratorValue>::isSet, JSC::JSValue>::type
-JSDOMIterator<JSWrapper>::asJS(JSC::ExecState& state, IteratorValue& value)
</del><ins>+template<typename IteratorValue> typename std::enable_if<IteratorInspector<IteratorValue>::isSet, JSC::JSValue>::type
+toJS(JSC::ExecState& state, JSDOMGlobalObject* globalObject, IteratorValue& value, IterationKind kind)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(value);
</span><del>- JSC::JSValue result = toJS(&state, globalObject(), *value);
- if (m_kind != IterationKind::KeyValue)
</del><ins>+ JSC::JSValue result = toJS(&state, globalObject, *value);
+ if (kind != IterationKind::KeyValue)
</ins><span class="cx"> return result;
</span><span class="cx">
</span><del>- return jsPair(state, globalObject(), JSC::jsNumber(m_index++), result);
</del><ins>+ // FIXME: first pair value should be the index of result.
+ return jsPair(state, globalObject, result, result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename IteratorValue> typename std::enable_if<IteratorInspector<IteratorValue>::isMap, void>::type
</span><del>-appendForEachArguments(JSC::ExecState& state, JSDOMGlobalObject* globalObject, JSC::MarkedArgumentBuffer& arguments, IteratorValue& value, size_t&)
</del><ins>+appendForEachArguments(JSC::ExecState& state, JSDOMGlobalObject* globalObject, JSC::MarkedArgumentBuffer& arguments, IteratorValue& value)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(value);
</span><span class="cx"> arguments.append(toJS(&state, globalObject, value->value));
</span><span class="lines">@@ -167,12 +160,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename IteratorValue> typename std::enable_if<IteratorInspector<IteratorValue>::isSet, void>::type
</span><del>-appendForEachArguments(JSC::ExecState& state, JSDOMGlobalObject* globalObject, JSC::MarkedArgumentBuffer& arguments, IteratorValue& value, size_t& index)
</del><ins>+appendForEachArguments(JSC::ExecState& state, JSDOMGlobalObject* globalObject, JSC::MarkedArgumentBuffer& arguments, IteratorValue& value)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(value);
</span><span class="cx"> JSC::JSValue argument = toJS(&state, globalObject, *value);
</span><span class="cx"> arguments.append(argument);
</span><del>- arguments.append(JSC::jsNumber(index++));
</del><ins>+ arguments.append(argument);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename JSWrapper>
</span><span class="lines">@@ -187,11 +180,10 @@
</span><span class="cx"> if (callType == JSC::CallType::None)
</span><span class="cx"> return throwVMTypeError(&state);
</span><span class="cx">
</span><del>- size_t index = 0;
</del><span class="cx"> auto iterator = wrapper->wrapped().createIterator();
</span><span class="cx"> while (auto value = iterator.next()) {
</span><span class="cx"> JSC::MarkedArgumentBuffer arguments;
</span><del>- appendForEachArguments(state, wrapper->globalObject(), arguments, value, index);
</del><ins>+ appendForEachArguments(state, wrapper->globalObject(), arguments, value);
</ins><span class="cx"> arguments.append(wrapper);
</span><span class="cx"> JSC::call(&state, state.argument(0), callType, callData, wrapper, arguments);
</span><span class="cx"> if (state.hadException())
</span><span class="lines">@@ -210,13 +202,10 @@
</span><span class="cx"> template<typename JSWrapper>
</span><span class="cx"> JSC::JSValue JSDOMIterator<JSWrapper>::next(JSC::ExecState& state)
</span><span class="cx"> {
</span><del>- if (m_iterator) {
- auto iteratorValue = m_iterator->next();
- if (iteratorValue)
- return createIteratorResultObject(&state, asJS(state, iteratorValue), false);
- m_iterator = Nullopt;
- }
- return createIteratorResultObject(&state, JSC::jsUndefined(), true);
</del><ins>+ auto iteratorValue = m_iterator.next();
+ if (!iteratorValue)
+ return createIteratorResultObject(&state, JSC::jsUndefined(), true);
+ return createIteratorResultObject(&state, toJS(state, globalObject(), iteratorValue, m_kind), false);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename JSWrapper>
</span></span></pre>
</div>
</div>
</body>
</html>