Changeset 36701 in webkit for trunk/JavaScriptCore/kjs/PropertyNameArray.cpp

Timestamp:

Sep 19, 2008, 9:35:33 PM (17 years ago)

Author:

[email protected]

Message:

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

Roll r36694 back in. It did not cause the crash.

• 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::PropertyNameArrayData::create): (JSC::PropertyNameArrayData::propertyNameVector): (JSC::PropertyNameArrayData::setCachedPrototypeChain): (JSC::PropertyNameArrayData::cachedPrototypeChain): (JSC::PropertyNameArrayData::begin): (JSC::PropertyNameArrayData::end): (JSC::PropertyNameArrayData::PropertyNameArrayData): (JSC::PropertyNameArray::PropertyNameArray): (JSC::PropertyNameArray::addKnownUnique): (JSC::PropertyNameArray::size): (JSC::PropertyNameArray::operator[]): (JSC::PropertyNameArray::begin): (JSC::PropertyNameArray::end): (JSC::PropertyNameArray::setData): (JSC::PropertyNameArray::data): (JSC::PropertyNameArray::releaseData):
• kjs/StructureID.cpp: (JSC::structureIDChainsAreEqual): (JSC::StructureID::getEnumerablePropertyNames): (JSC::StructureID::clearEnumerationCache): (JSC::StructureID::createCachedPrototypeChain):
• kjs/StructureID.h:

File:

• trunk/JavaScriptCore/kjs/PropertyNameArray.cpp (modified) (3 diffs)

trunk/JavaScriptCore/kjs/PropertyNameArray.cpp

@@ -30 +30 @@
     ASSERT(identifier == &UString::Rep::null || identifier == &UString::Rep::empty || identifier->identifierTable());
 
-    size_t size = m_vector.size();
+    size_t size = m_data->propertyNameVector().size();
     if (size < setThreshold) {
         for (size_t i = 0; i < size; ++i) {
-            if (identifier == m_vector[i].ustring().rep())
+            if (identifier == m_data->propertyNameVector()[i].ustring().rep())
                 return;
         }
@@ -39 +39 @@
         if (m_set.isEmpty()) {
             for (size_t i = 0; i < size; ++i)
-                m_set.add(m_vector[i].ustring().rep());
+                m_set.add(m_data->propertyNameVector()[i].ustring().rep());
         }
         if (!m_set.add(identifier).second)
@@ -45 +45 @@
     }
 
-    m_vector.append(Identifier(m_globalData, identifier));
+    m_data->propertyNameVector().append(Identifier(m_globalData, identifier));
 }