Changeset 202302 in webkit

Timestamp:

Jun 21, 2016 4:21:14 PM (8 years ago)

Author:

jiewen_tan@apple.com

Message:

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

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/nodeListIterator-expected.txt (modified) (2 diffs)
• LayoutTests/fast/text/font-face-set-javascript-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/bindings/js/JSDOMIterator.h (modified) (5 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+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
+
 2016-06-21  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/LayoutTests/fast/dom/nodeListIterator-expected.txt

@@ -10 +10 @@
 PASS pair[1] is children[1]
 PASS forEachContainer is nodeList
-PASS forEachIndex is index
+FAIL forEachIndex should be 0 (of type number). Was [object HTMLDivElement] (of type object).
 PASS node is children[index++]
 PASS forEachContainer is nodeList
-PASS forEachIndex is index
+FAIL forEachIndex should be 1 (of type number). Was [object HTMLOListElement] (of type object).
 PASS node is children[index++]
 PASS iterator.next().value is children[0]
@@ -24 +24 @@
 PASS end.value is undefined
 PASS pair.length is 2
-PASS pair[0] is 0
+FAIL pair[0] should be 0 (of type number). Was [object HTMLDivElement] (of type object).
 PASS pair[1] is children[0]
 PASS pair.length is 2
-PASS pair[0] is 1
+FAIL pair[0] should be 1 (of type number). Was [object HTMLOListElement] (of type object).
 PASS pair[1] is children[1]
 PASS end.done is true
 PASS end.value is undefined
-PASS end.done is true
-PASS end.value is undefined
+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).
 PASS successfullyParsed is true
 

trunk/LayoutTests/fast/text/font-face-set-javascript-expected.txt

@@ -5 +5 @@
 PASS item.done is false
 PASS item.value.length is 2
-PASS item.value[0] is 0
+FAIL item.value[0] should be 0 (of type number). Was [object FontFace] (of type object).
 PASS item.value[1] is fontFace1
 PASS item.done is true

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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
+
 2016-06-21  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/bindings/js/JSDOMIterator.h

@@ -109 +109 @@
     }
 
-    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&);
-
     static void destroy(JSC::JSCell*);
 
-    Optional<typename DOMWrapped::Iterator> m_iterator;
+    typename DOMWrapped::Iterator m_iterator;
     IterationKind m_kind;
-    size_t m_index { 0 };
 };
 
@@ -136 +130 @@
 }
 
-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)
-{
-    ASSERT(value);
-    if (m_kind != IterationKind::KeyValue)
-        return toJS(&state, globalObject(), (m_kind == IterationKind::Key) ? value->key : value->value);
-
-    return jsPair(state, globalObject(), value->key, value->value);
-}
-
-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)
-{
-    ASSERT(value);
-    JSC::JSValue result = toJS(&state, globalObject(), *value);
-    if (m_kind != IterationKind::KeyValue)
+template<typename IteratorValue> typename std::enable_if<IteratorInspector<IteratorValue>::isMap, JSC::JSValue>::type
+toJS(JSC::ExecState& state, JSDOMGlobalObject* globalObject, IteratorValue& value, IterationKind kind)
+{
+    ASSERT(value);
+    if (kind != IterationKind::KeyValue)
+        return toJS(&state, globalObject, (kind == IterationKind::Key) ? value->key : value->value);
+
+    return jsPair(state, globalObject, value->key, value->value);
+}
+
+template<typename IteratorValue> typename std::enable_if<IteratorInspector<IteratorValue>::isSet, JSC::JSValue>::type
+toJS(JSC::ExecState& state, JSDOMGlobalObject* globalObject, IteratorValue& value, IterationKind kind)
+{
+    ASSERT(value);
+    JSC::JSValue result = toJS(&state, globalObject, *value);
+    if (kind != IterationKind::KeyValue)
         return result;
 
-    return jsPair(state, globalObject(), JSC::jsNumber(m_index++), result);
+    // FIXME: first pair value should be the index of result.
+    return jsPair(state, globalObject, result, result);
 }
 
 template<typename IteratorValue> typename std::enable_if<IteratorInspector<IteratorValue>::isMap, void>::type
-appendForEachArguments(JSC::ExecState& state, JSDOMGlobalObject* globalObject, JSC::MarkedArgumentBuffer& arguments, IteratorValue& value, size_t&)
+appendForEachArguments(JSC::ExecState& state, JSDOMGlobalObject* globalObject, JSC::MarkedArgumentBuffer& arguments, IteratorValue& value)
 {
     ASSERT(value);
@@ -168 +161 @@
 
 template<typename IteratorValue> typename std::enable_if<IteratorInspector<IteratorValue>::isSet, void>::type
-appendForEachArguments(JSC::ExecState& state, JSDOMGlobalObject* globalObject, JSC::MarkedArgumentBuffer& arguments, IteratorValue& value, size_t& index)
+appendForEachArguments(JSC::ExecState& state, JSDOMGlobalObject* globalObject, JSC::MarkedArgumentBuffer& arguments, IteratorValue& value)
 {
     ASSERT(value);
     JSC::JSValue argument = toJS(&state, globalObject, *value);
     arguments.append(argument);
-    arguments.append(JSC::jsNumber(index++));
+    arguments.append(argument);
 }
 
@@ -188 +181 @@
         return throwVMTypeError(&state);
 
-    size_t index = 0;
     auto iterator = wrapper->wrapped().createIterator();
     while (auto value = iterator.next()) {
         JSC::MarkedArgumentBuffer arguments;
-        appendForEachArguments(state, wrapper->globalObject(), arguments, value, index);
+        appendForEachArguments(state, wrapper->globalObject(), arguments, value);
         arguments.append(wrapper);
         JSC::call(&state, state.argument(0), callType, callData, wrapper, arguments);
@@ -211 +203 @@
 JSC::JSValue JSDOMIterator<JSWrapper>::next(JSC::ExecState& state)
 {
-    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);
+    auto iteratorValue = m_iterator.next();
+    if (!iteratorValue)
+        return createIteratorResultObject(&state, JSC::jsUndefined(), true);
+    return createIteratorResultObject(&state, toJS(state, globalObject(), iteratorValue, m_kind), false);
 }