Changeset 36696 in webkit for trunk/JavaScriptCore/VM/JSPropertyNameIterator.h

Timestamp:

Sep 19, 2008, 8:19:17 PM (17 years ago)

Author:

[email protected]

Message:

2008-09-19 Sam Weinig <​[email protected]>

Roll out r36694.

• JavaScriptCore.exp:
• VM/JSPropertyNameIterator.cpp: (JSC::JSPropertyNameIterator::~JSPropertyNameIterator): (JSC::JSPropertyNameIterator::invalidate):
• VM/JSPropertyNameIterator.h: (JSC::JSPropertyNameIterator::JSPropertyNameIterator): (JSC::JSPropertyNameIterator::create):
• kjs/JSObject.cpp: (JSC::JSObject::getPropertyNames):
• kjs/PropertyMap.cpp: (JSC::PropertyMap::getEnumerablePropertyNames):
• kjs/PropertyMap.h:
• kjs/PropertyNameArray.cpp: (JSC::PropertyNameArray::add):
• kjs/PropertyNameArray.h: (JSC::PropertyNameArray::PropertyNameArray): (JSC::PropertyNameArray::addKnownUnique): (JSC::PropertyNameArray::begin): (JSC::PropertyNameArray::end): (JSC::PropertyNameArray::size): (JSC::PropertyNameArray::operator[]): (JSC::PropertyNameArray::releaseIdentifiers):
• kjs/StructureID.cpp: (JSC::StructureID::getEnumerablePropertyNames):
• kjs/StructureID.h: (JSC::StructureID::clearEnumerationCache):

File:

• trunk/JavaScriptCore/VM/JSPropertyNameIterator.h (modified) (2 diffs)

trunk/JavaScriptCore/VM/JSPropertyNameIterator.h

@@ -58 +58 @@
 
     private:
-        JSPropertyNameIterator();
-        JSPropertyNameIterator(JSObject*, PassRefPtr<PropertyNameArrayData> propertyNameArrayData);
+        JSPropertyNameIterator(JSObject*, Identifier* propertyNames, size_t numProperties);
 
         JSObject* m_object;
-        RefPtr<PropertyNameArrayData> m_data;
-        PropertyNameArrayData::const_iterator m_position;
-        PropertyNameArrayData::const_iterator m_end;
+        Identifier* m_propertyNames;
+        Identifier* m_position;
+        Identifier* m_end;
     };
 
-inline JSPropertyNameIterator::JSPropertyNameIterator()
-    : JSCell(0)
-    , m_object(0)
-    , m_position(0)
-    , m_end(0)
-{
-}
-
-inline JSPropertyNameIterator::JSPropertyNameIterator(JSObject* object, PassRefPtr<PropertyNameArrayData> propertyNameArrayData)
+inline JSPropertyNameIterator::JSPropertyNameIterator(JSObject* object, Identifier* propertyNames, size_t numProperties)
     : JSCell(0)
     , m_object(object)
-    , m_data(propertyNameArrayData)
-    , m_position(m_data->begin())
-    , m_end(m_data->end())
+    , m_propertyNames(propertyNames)
+    , m_position(propertyNames)
+    , m_end(propertyNames + numProperties)
 {
 }
@@ -87 +78 @@
 {
     if (v->isUndefinedOrNull())
-        return new (exec) JSPropertyNameIterator;
+        return new (exec) JSPropertyNameIterator(0, 0, 0);
 
     JSObject* o = v->toObject(exec);
     PropertyNameArray propertyNames(exec);
     o->getPropertyNames(exec, propertyNames);
-    return new (exec) JSPropertyNameIterator(o, propertyNames.releaseData());
+    size_t numProperties = propertyNames.size();
+    return new (exec) JSPropertyNameIterator(o, propertyNames.releaseIdentifiers(), numProperties);
 }