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

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.cpp (modified) (2 diffs)

trunk/JavaScriptCore/VM/JSPropertyNameIterator.cpp

@@ -36 +36 @@
 JSPropertyNameIterator::~JSPropertyNameIterator()
 {
+    invalidate();
 }
 
@@ -83 +84 @@
 void JSPropertyNameIterator::invalidate()
 {
+    if (m_propertyNames) {
+        for (Identifier* p = m_propertyNames; p != m_end; ++p)
+            p->~Identifier();
+        fastFree(m_propertyNames);
+    }
     m_object = 0;
-    m_data.clear();
+    m_propertyNames = 0;
 }