webkitgtk-2.4.9webkitgtk-2.4.9

1 files changed, 6 insertions, 18 deletions

diff --git a/Source/JavaScriptCore/runtime/JSMapIterator.cpp b/Source/JavaScriptCore/runtime/JSMapIterator.cpp
index 885362bd4..091d90b52 100644
--- a/Source/JavaScriptCore/runtime/JSMapIterator.cpp
+++ b/Source/JavaScriptCore/runtime/JSMapIterator.cpp
@@ -29,32 +29,27 @@
 #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, CREATE_METHOD_TABLE(JSMapIterator) };
+const ClassInfo JSMapIterator::s_info = { "Map Iterator", &Base::s_info, 0, 0, CREATE_METHOD_TABLE(JSMapIterator) };
 
 void JSMapIterator::finishCreation(VM& vm, JSMap* iteratedObject)
 {
     Base::finishCreation(vm);
-    m_map.set(vm, this, iteratedObject);
-}
-
-void JSMapIterator::destroy(JSCell* cell)
-{
-    JSMapIterator* thisObject = jsCast<JSMapIterator*>(cell);
-    thisObject->JSMapIterator::~JSMapIterator();
+    m_iteratedObjectData.set(vm, this, iteratedObject->mapData());
 }
 
 void JSMapIterator::visitChildren(JSCell* cell, SlotVisitor& visitor)
 {
     JSMapIterator* thisObject = jsCast<JSMapIterator*>(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_map);
+    visitor.append(&thisObject->m_iteratedObjectData);
 }
 
 JSValue JSMapIterator::createPair(CallFrame* callFrame, JSValue key, JSValue value)
@@ -66,11 +61,4 @@ 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;
-}
-
 }