Changeset 202305 in webkit

Timestamp:

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

Author:

Chris Dumez

Message:

Unreviewed, attempt to fix the build after r202303.

• bindings/js/JSDOMIterator.h:

(WebCore::toJS):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/JSDOMIterator.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-06-21  Chris Dumez  <cdumez@apple.com>
+
+        Unreviewed, attempt to fix the build after r202303.
+
+        * bindings/js/JSDOMIterator.h:
+        (WebCore::toJS):
+
 2016-06-21  Jiewen Tan  <jiewen_tan@apple.com>
 

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

@@ -115 +115 @@
 }
 
+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;
+
+    // FIXME: first pair value should be the index of result.
+    return jsPair(state, globalObject, result, result);
+}
+
 template<typename JSWrapper>
 JSC::EncodedJSValue keyValueIteratorForEach(JSC::ExecState& state, const char* propertyName)