Title: [200411] trunk/Source/WebCore
Revision
200411
Author
[email protected]
Date
2016-05-04 01:22:18 -0700 (Wed, 04 May 2016)

Log Message

Rename JSKeyValueIterator as JSDOMIterator
https://bugs.webkit.org/show_bug.cgi?id=157308

Reviewed by Darin Adler.

No change of behavior.

* bindings/js/JSDOMIterator.h: Renamed from Source/WebCore/bindings/js/JSKeyValueIterator.h.
(WebCore::JSDOMIteratorPrototype::create):
(WebCore::JSDOMIteratorPrototype::createStructure):
(WebCore::JSDOMIteratorPrototype::JSDOMIteratorPrototype):
(WebCore::createKeyValueIterator):
(WebCore::keyValueIteratorForEach):
(WebCore::JSDOMIterator<JSWrapper>::destroy):
(WebCore::JSDOMIterator<JSWrapper>::next):
(WebCore::JSDOMIteratorPrototype<JSWrapper>::next):
(WebCore::JSDOMIteratorPrototype<JSWrapper>::finishCreation):
* bindings/js/JSFontFaceSetCustom.cpp:
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateImplementationIterableFunctions):
* bindings/scripts/test/JS/JSTestObj.cpp:

Modified Paths

Added Paths

Removed Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (200410 => 200411)


--- trunk/Source/WebCore/ChangeLog	2016-05-04 07:44:40 UTC (rev 200410)
+++ trunk/Source/WebCore/ChangeLog	2016-05-04 08:22:18 UTC (rev 200411)
@@ -1,3 +1,27 @@
+2016-05-04  Youenn Fablet  <[email protected]>
+
+        Rename JSKeyValueIterator as JSDOMIterator
+        https://bugs.webkit.org/show_bug.cgi?id=157308
+
+        Reviewed by Darin Adler.
+
+        No change of behavior.
+
+        * bindings/js/JSDOMIterator.h: Renamed from Source/WebCore/bindings/js/JSKeyValueIterator.h.
+        (WebCore::JSDOMIteratorPrototype::create):
+        (WebCore::JSDOMIteratorPrototype::createStructure):
+        (WebCore::JSDOMIteratorPrototype::JSDOMIteratorPrototype):
+        (WebCore::createKeyValueIterator):
+        (WebCore::keyValueIteratorForEach):
+        (WebCore::JSDOMIterator<JSWrapper>::destroy):
+        (WebCore::JSDOMIterator<JSWrapper>::next):
+        (WebCore::JSDOMIteratorPrototype<JSWrapper>::next):
+        (WebCore::JSDOMIteratorPrototype<JSWrapper>::finishCreation):
+        * bindings/js/JSFontFaceSetCustom.cpp:
+        * bindings/scripts/CodeGeneratorJS.pm:
+        (GenerateImplementationIterableFunctions):
+        * bindings/scripts/test/JS/JSTestObj.cpp:
+
 2016-05-04  Jiewen Tan  <[email protected]>
 
         CrashTracer: [USER] com.apple.WebKit.WebContent at …ple.WebCore: WebCore::EditCommandComposition::unapply + 105

Copied: trunk/Source/WebCore/bindings/js/JSDOMIterator.h (from rev 200410, trunk/Source/WebCore/bindings/js/JSKeyValueIterator.h) (0 => 200411)


--- trunk/Source/WebCore/bindings/js/JSDOMIterator.h	                        (rev 0)
+++ trunk/Source/WebCore/bindings/js/JSDOMIterator.h	2016-05-04 08:22:18 UTC (rev 200411)
@@ -0,0 +1,188 @@
+/*
+ * Copyright (C) 2016 Canon, Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY CANON INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL CANON INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef JSDOMIterator_h
+#define JSDOMIterator_h
+
+#include "JSDOMBinding.h"
+#include <runtime/JSDestructibleObject.h>
+#include <type_traits>
+
+namespace WebCore {
+
+template<typename JSWrapper>
+class JSDOMIteratorPrototype : public JSC::JSNonFinalObject {
+public:
+    using Base = JSC::JSNonFinalObject;
+    using DOMWrapped = typename JSWrapper::DOMWrapped;
+
+    static JSDOMIteratorPrototype* create(JSC::VM& vm, JSC::JSGlobalObject* globalObject, JSC::Structure* structure)
+    {
+        JSDOMIteratorPrototype* prototype = new (NotNull, JSC::allocateCell<JSDOMIteratorPrototype>(vm.heap)) JSDOMIteratorPrototype(vm, structure);
+        prototype->finishCreation(vm, globalObject);
+        return prototype;
+    }
+
+    DECLARE_INFO;
+
+    static JSC::Structure* createStructure(JSC::VM& vm, JSC::JSGlobalObject* globalObject, JSC::JSValue prototype)
+    {
+        return JSC::Structure::create(vm, globalObject, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), info());
+    }
+
+    static JSC::EncodedJSValue JSC_HOST_CALL next(JSC::ExecState*);
+
+private:
+    JSDOMIteratorPrototype(JSC::VM& vm, JSC::Structure* structure) : Base(vm, structure) { }
+
+    void finishCreation(JSC::VM&, JSC::JSGlobalObject*);
+};
+
+enum class IterationKind { Key, Value, KeyValue };
+
+template<typename JSWrapper>
+class JSDOMIterator: public JSDOMObject {
+public:
+    using DOMWrapped = typename std::remove_reference<decltype(std::declval<JSWrapper>().wrapped())>::type;
+    using Base = JSDOMObject;
+
+    DECLARE_INFO;
+
+    static JSC::Structure* createStructure(JSC::VM& vm, JSC::JSGlobalObject* globalObject, JSC::JSValue prototype)
+    {
+        return JSC::Structure::create(vm, globalObject, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), info());
+    }
+
+    static JSDOMIterator* create(JSC::VM& vm, JSC::Structure* structure, JSWrapper& iteratedObject, IterationKind kind)
+    {
+        JSDOMIterator* instance = new (NotNull, JSC::allocateCell<JSDOMIterator>(vm.heap)) JSDOMIterator(structure, iteratedObject, kind);
+        instance->finishCreation(vm);
+        return instance;
+    }
+
+    static JSDOMIteratorPrototype<JSWrapper>* createPrototype(JSC::VM& vm, JSC::JSGlobalObject* globalObject)
+    {
+        return JSDOMIteratorPrototype<JSWrapper>::create(vm, globalObject,
+            JSDOMIteratorPrototype<JSWrapper>::createStructure(vm, globalObject, globalObject->objectPrototype()));
+    }
+
+    JSC::JSValue next(JSC::ExecState&);
+
+private:
+    JSDOMIterator(JSC::Structure* structure, JSWrapper& iteratedObject, IterationKind kind)
+        : Base(structure, *iteratedObject.globalObject())
+        , m_iterator(iteratedObject.wrapped().createIterator())
+        , m_kind(kind)
+    {
+    }
+
+    static void destroy(JSC::JSCell*);
+
+    typename DOMWrapped::Iterator m_iterator;
+    IterationKind m_kind;
+};
+
+template<typename JSWrapper>
+JSC::EncodedJSValue createKeyValueIterator(JSC::ExecState& state, IterationKind kind, const char* propertyName)
+{
+    auto wrapper = JSC::jsDynamicCast<JSWrapper*>(state.thisValue());
+    if (UNLIKELY(!wrapper))
+        return throwThisTypeError(state, JSWrapper::info()->className, propertyName);
+    JSDOMGlobalObject& globalObject = *wrapper->globalObject();
+    return JSC::JSValue::encode(JSDOMIterator<JSWrapper>::create(globalObject.vm(), getDOMStructure<JSDOMIterator<JSWrapper>>(globalObject.vm(), globalObject), *wrapper, kind));
+}
+
+template<typename JSWrapper>
+JSC::EncodedJSValue keyValueIteratorForEach(JSC::ExecState& state, const char* propertyName)
+{
+    auto wrapper = JSC::jsDynamicCast<JSWrapper*>(state.thisValue());
+    if (UNLIKELY(!wrapper))
+        return throwThisTypeError(state, JSWrapper::info()->className, propertyName);
+
+    JSC::CallData callData;
+    JSC::CallType callType = JSC::getCallData(state.argument(0), callData);
+    if (callType == JSC::CallType::None)
+        return throwVMTypeError(&state);
+
+    auto iterator = wrapper->wrapped().createIterator();
+    while (auto value = iterator.next(state)) {
+        JSC::MarkedArgumentBuffer arguments;
+        arguments.append(toJS(&state, wrapper->globalObject(), value.value().value));
+        arguments.append(toJS(&state, wrapper->globalObject(), value.value().key));
+        arguments.append(wrapper);
+        JSC::call(&state, state.argument(0), callType, callData, wrapper, arguments);
+        if (state.hadException())
+            break;
+    } 
+    return JSC::JSValue::encode(JSC::jsUndefined());
+}
+
+template<typename JSWrapper>
+void JSDOMIterator<JSWrapper>::destroy(JSCell* cell)
+{
+    JSDOMIterator<JSWrapper>* thisObject = JSC::jsCast<JSDOMIterator<JSWrapper>*>(cell);
+    thisObject->JSDOMIterator<JSWrapper>::~JSDOMIterator();
+}
+
+template<typename JSWrapper>
+JSC::JSValue JSDOMIterator<JSWrapper>::next(JSC::ExecState& state)
+{
+    auto iteratorValue = m_iterator.next(state);
+    if (!iteratorValue)
+        return createIteratorResultObject(&state, JSC::jsUndefined(), true);
+
+    JSC::JSValue value;
+    if (m_kind == IterationKind::Value)
+        value = toJS(&state, globalObject(), iteratorValue.value().value);
+    else if (m_kind == IterationKind::Key)
+        value = toJS(&state, globalObject(), iteratorValue.value().key);
+    else
+        value = jsPair(state, globalObject(), iteratorValue.value().key, iteratorValue.value().value);
+
+    return createIteratorResultObject(&state, value, false);
+}
+
+template<typename JSWrapper>
+JSC::EncodedJSValue JSC_HOST_CALL JSDOMIteratorPrototype<JSWrapper>::next(JSC::ExecState* state)
+{
+    auto iterator = JSC::jsDynamicCast<JSDOMIterator<JSWrapper>*>(state->thisValue());
+    if (!iterator)
+        return JSC::JSValue::encode(throwTypeError(state, ASCIILiteral("Cannot call next() on a non-Iterator object")));
+
+    return JSC::JSValue::encode(iterator->next(*state));
+}
+
+template<typename JSWrapper>
+void JSDOMIteratorPrototype<JSWrapper>::finishCreation(JSC::VM& vm, JSC::JSGlobalObject* globalObject)
+{
+    Base::finishCreation(vm);
+    ASSERT(inherits(info()));
+
+    JSC_NATIVE_INTRINSIC_FUNCTION_WITHOUT_TRANSITION(vm.propertyNames->next, next, JSC::DontEnum, 0, JSC::NoIntrinsic);
+}
+
+}
+
+#endif // !defined(JSDOMIterator_h)

Modified: trunk/Source/WebCore/bindings/js/JSFontFaceSetCustom.cpp (200410 => 200411)


--- trunk/Source/WebCore/bindings/js/JSFontFaceSetCustom.cpp	2016-05-04 07:44:40 UTC (rev 200410)
+++ trunk/Source/WebCore/bindings/js/JSFontFaceSetCustom.cpp	2016-05-04 08:22:18 UTC (rev 200411)
@@ -28,7 +28,6 @@
 
 #include "FontFace.h"
 #include "JSFontFace.h"
-#include "JSKeyValueIterator.h"
 
 namespace WebCore {
 

Deleted: trunk/Source/WebCore/bindings/js/JSKeyValueIterator.h (200410 => 200411)


--- trunk/Source/WebCore/bindings/js/JSKeyValueIterator.h	2016-05-04 07:44:40 UTC (rev 200410)
+++ trunk/Source/WebCore/bindings/js/JSKeyValueIterator.h	2016-05-04 08:22:18 UTC (rev 200411)
@@ -1,188 +0,0 @@
-/*
- * Copyright (C) 2016 Canon, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY CANON INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL CANON INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef JSKeyValueIterator_h
-#define JSKeyValueIterator_h
-
-#include "JSDOMBinding.h"
-#include <runtime/JSDestructibleObject.h>
-#include <type_traits>
-
-namespace WebCore {
-
-template<typename JSWrapper>
-class JSKeyValueIteratorPrototype : public JSC::JSNonFinalObject {
-public:
-    using Base = JSC::JSNonFinalObject;
-    using DOMWrapped = typename JSWrapper::DOMWrapped;
-
-    static JSKeyValueIteratorPrototype* create(JSC::VM& vm, JSC::JSGlobalObject* globalObject, JSC::Structure* structure)
-    {
-        JSKeyValueIteratorPrototype* prototype = new (NotNull, JSC::allocateCell<JSKeyValueIteratorPrototype>(vm.heap)) JSKeyValueIteratorPrototype(vm, structure);
-        prototype->finishCreation(vm, globalObject);
-        return prototype;
-    }
-
-    DECLARE_INFO;
-
-    static JSC::Structure* createStructure(JSC::VM& vm, JSC::JSGlobalObject* globalObject, JSC::JSValue prototype)
-    {
-        return JSC::Structure::create(vm, globalObject, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), info());
-    }
-
-    static JSC::EncodedJSValue JSC_HOST_CALL next(JSC::ExecState*);
-
-private:
-    JSKeyValueIteratorPrototype(JSC::VM& vm, JSC::Structure* structure) : Base(vm, structure) { }
-
-    void finishCreation(JSC::VM&, JSC::JSGlobalObject*);
-};
-
-enum class IterationKind { Key, Value, KeyValue };
-
-template<typename JSWrapper>
-class JSKeyValueIterator: public JSDOMObject {
-public:
-    using DOMWrapped = typename std::remove_reference<decltype(std::declval<JSWrapper>().wrapped())>::type;
-    using Base = JSDOMObject;
-
-    DECLARE_INFO;
-
-    static JSC::Structure* createStructure(JSC::VM& vm, JSC::JSGlobalObject* globalObject, JSC::JSValue prototype)
-    {
-        return JSC::Structure::create(vm, globalObject, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), info());
-    }
-
-    static JSKeyValueIterator* create(JSC::VM& vm, JSC::Structure* structure, JSWrapper& iteratedObject, IterationKind kind)
-    {
-        JSKeyValueIterator* instance = new (NotNull, JSC::allocateCell<JSKeyValueIterator>(vm.heap)) JSKeyValueIterator(structure, iteratedObject, kind);
-        instance->finishCreation(vm);
-        return instance;
-    }
-
-    static JSKeyValueIteratorPrototype<JSWrapper>* createPrototype(JSC::VM& vm, JSC::JSGlobalObject* globalObject)
-    {
-        return JSKeyValueIteratorPrototype<JSWrapper>::create(vm, globalObject,
-            JSKeyValueIteratorPrototype<JSWrapper>::createStructure(vm, globalObject, globalObject->objectPrototype()));
-    }
-
-    JSC::JSValue next(JSC::ExecState&);
-
-private:
-    JSKeyValueIterator(JSC::Structure* structure, JSWrapper& iteratedObject, IterationKind kind)
-        : Base(structure, *iteratedObject.globalObject())
-        , m_iterator(iteratedObject.wrapped().createIterator())
-        , m_kind(kind)
-    {
-    }
-
-    static void destroy(JSC::JSCell*);
-
-    typename DOMWrapped::Iterator m_iterator;
-    IterationKind m_kind;
-};
-
-template<typename JSWrapper>
-JSC::EncodedJSValue createKeyValueIterator(JSC::ExecState& state, IterationKind kind, const char* propertyName)
-{
-    auto wrapper = JSC::jsDynamicCast<JSWrapper*>(state.thisValue());
-    if (UNLIKELY(!wrapper))
-        return throwThisTypeError(state, JSWrapper::info()->className, propertyName);
-    JSDOMGlobalObject& globalObject = *wrapper->globalObject();
-    return JSC::JSValue::encode(JSKeyValueIterator<JSWrapper>::create(globalObject.vm(), getDOMStructure<JSKeyValueIterator<JSWrapper>>(globalObject.vm(), globalObject), *wrapper, kind));
-}
-
-template<typename JSWrapper>
-JSC::EncodedJSValue keyValueIteratorForEach(JSC::ExecState& state, const char* propertyName)
-{
-    auto wrapper = JSC::jsDynamicCast<JSWrapper*>(state.thisValue());
-    if (UNLIKELY(!wrapper))
-        return throwThisTypeError(state, JSWrapper::info()->className, propertyName);
-
-    JSC::CallData callData;
-    JSC::CallType callType = JSC::getCallData(state.argument(0), callData);
-    if (callType == JSC::CallType::None)
-        return throwVMTypeError(&state);
-
-    auto iterator = wrapper->wrapped().createIterator();
-    while (auto value = iterator.next(state)) {
-        JSC::MarkedArgumentBuffer arguments;
-        arguments.append(toJS(&state, wrapper->globalObject(), value.value().value));
-        arguments.append(toJS(&state, wrapper->globalObject(), value.value().key));
-        arguments.append(wrapper);
-        JSC::call(&state, state.argument(0), callType, callData, wrapper, arguments);
-        if (state.hadException())
-            break;
-    } 
-    return JSC::JSValue::encode(JSC::jsUndefined());
-}
-
-template<typename JSWrapper>
-void JSKeyValueIterator<JSWrapper>::destroy(JSCell* cell)
-{
-    JSKeyValueIterator<JSWrapper>* thisObject = JSC::jsCast<JSKeyValueIterator<JSWrapper>*>(cell);
-    thisObject->JSKeyValueIterator<JSWrapper>::~JSKeyValueIterator();
-}
-
-template<typename JSWrapper>
-JSC::JSValue JSKeyValueIterator<JSWrapper>::next(JSC::ExecState& state)
-{
-    auto iteratorValue = m_iterator.next(state);
-    if (!iteratorValue)
-        return createIteratorResultObject(&state, JSC::jsUndefined(), true);
-
-    JSC::JSValue value;
-    if (m_kind == IterationKind::Value)
-        value = toJS(&state, globalObject(), iteratorValue.value().value);
-    else if (m_kind == IterationKind::Key)
-        value = toJS(&state, globalObject(), iteratorValue.value().key);
-    else
-        value = jsPair(state, globalObject(), iteratorValue.value().key, iteratorValue.value().value);
-
-    return createIteratorResultObject(&state, value, false);
-}
-
-template<typename JSWrapper>
-JSC::EncodedJSValue JSC_HOST_CALL JSKeyValueIteratorPrototype<JSWrapper>::next(JSC::ExecState* state)
-{
-    auto iterator = JSC::jsDynamicCast<JSKeyValueIterator<JSWrapper>*>(state->thisValue());
-    if (!iterator)
-        return JSC::JSValue::encode(throwTypeError(state, ASCIILiteral("Cannot call next() on a non-Iterator object")));
-
-    return JSC::JSValue::encode(iterator->next(*state));
-}
-
-template<typename JSWrapper>
-void JSKeyValueIteratorPrototype<JSWrapper>::finishCreation(JSC::VM& vm, JSC::JSGlobalObject* globalObject)
-{
-    Base::finishCreation(vm);
-    ASSERT(inherits(info()));
-
-    JSC_NATIVE_INTRINSIC_FUNCTION_WITHOUT_TRANSITION(vm.propertyNames->next, next, JSC::DontEnum, 0, JSC::NoIntrinsic);
-}
-
-}
-
-#endif // !defined(JSKeyValueIterator_h)

Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (200410 => 200411)


--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm	2016-05-04 07:44:40 UTC (rev 200410)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm	2016-05-04 08:22:18 UTC (rev 200411)
@@ -4157,11 +4157,11 @@
     my $className = "JS$interfaceName";
     my $visibleInterfaceName = $codeGenerator->GetVisibleInterfaceName($interface);
 
-    AddToImplIncludes("JSKeyValueIterator.h");
+    AddToImplIncludes("JSDOMIterator.h");
 
     push(@implContent,  <<END);
-using ${interfaceName}Iterator = JSKeyValueIterator<${className}>;
-using ${interfaceName}IteratorPrototype = JSKeyValueIteratorPrototype<${className}>;
+using ${interfaceName}Iterator = JSDOMIterator<${className}>;
+using ${interfaceName}IteratorPrototype = JSDOMIteratorPrototype<${className}>;
 
 template<>
 const JSC::ClassInfo ${interfaceName}Iterator::s_info = { "${visibleInterfaceName} Iterator", &Base::s_info, 0, CREATE_METHOD_TABLE(${interfaceName}Iterator) };

Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (200410 => 200411)


--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp	2016-05-04 07:44:40 UTC (rev 200410)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp	2016-05-04 08:22:18 UTC (rev 200411)
@@ -30,12 +30,12 @@
 #include "HTMLNames.h"
 #include "JSDOMBinding.h"
 #include "JSDOMConstructor.h"
+#include "JSDOMIterator.h"
 #include "JSDOMPromise.h"
 #include "JSDOMStringList.h"
 #include "JSDocument.h"
 #include "JSEventListener.h"
 #include "JSFetchRequest.h"
-#include "JSKeyValueIterator.h"
 #include "JSNode.h"
 #include "JSSVGDocument.h"
 #include "JSSVGPoint.h"
@@ -5890,8 +5890,8 @@
     return JSValue::encode(jsUndefined());
 }
 
-using TestObjIterator = JSKeyValueIterator<JSTestObj>;
-using TestObjIteratorPrototype = JSKeyValueIteratorPrototype<JSTestObj>;
+using TestObjIterator = JSDOMIterator<JSTestObj>;
+using TestObjIteratorPrototype = JSDOMIteratorPrototype<JSTestObj>;
 
 template<>
 const JSC::ClassInfo TestObjIterator::s_info = { "TestObject Iterator", &Base::s_info, 0, CREATE_METHOD_TABLE(TestObjIterator) };
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to