From a4e969f4965059196ca948db781e52f7cfebf19e Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Tue, 24 May 2016 08:28:08 +0000 Subject: webkitgtk-2.12.3 --- Source/JavaScriptCore/runtime/JSMapIterator.cpp | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'Source/JavaScriptCore/runtime/JSMapIterator.cpp') diff --git a/Source/JavaScriptCore/runtime/JSMapIterator.cpp b/Source/JavaScriptCore/runtime/JSMapIterator.cpp index 091d90b52..f13ea5f7f 100644 --- a/Source/JavaScriptCore/runtime/JSMapIterator.cpp +++ b/Source/JavaScriptCore/runtime/JSMapIterator.cpp @@ -29,27 +29,26 @@ #include "JSCJSValueInlines.h" #include "JSCellInlines.h" #include "JSMap.h" +#include "MapDataInlines.h" #include "SlotVisitorInlines.h" +#include "StructureInlines.h" namespace JSC { -const ClassInfo JSMapIterator::s_info = { "Map Iterator", &Base::s_info, 0, 0, CREATE_METHOD_TABLE(JSMapIterator) }; +const ClassInfo JSMapIterator::s_info = { "Map Iterator", &Base::s_info, 0, CREATE_METHOD_TABLE(JSMapIterator) }; void JSMapIterator::finishCreation(VM& vm, JSMap* iteratedObject) { Base::finishCreation(vm); - m_iteratedObjectData.set(vm, this, iteratedObject->mapData()); + m_map.set(vm, this, iteratedObject); } void JSMapIterator::visitChildren(JSCell* cell, SlotVisitor& visitor) { JSMapIterator* thisObject = jsCast(cell); ASSERT_GC_OBJECT_INHERITS(thisObject, info()); - COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag); - ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren()); - Base::visitChildren(thisObject, visitor); - visitor.append(&thisObject->m_iteratedObjectData); + visitor.append(&thisObject->m_map); } JSValue JSMapIterator::createPair(CallFrame* callFrame, JSValue key, JSValue value) @@ -61,4 +60,11 @@ JSValue JSMapIterator::createPair(CallFrame* callFrame, JSValue key, JSValue val return constructArray(callFrame, 0, globalObject, args); } +JSMapIterator* JSMapIterator::clone(ExecState* exec) +{ + auto clone = JSMapIterator::create(exec->vm(), exec->callee()->globalObject()->mapIteratorStructure(), m_map.get(), m_kind); + clone->m_iterator = m_iterator; + return clone; +} + } -- cgit v1.2.1