Changeset 36701 in webkit for trunk/JavaScriptCore/kjs/PropertyMap.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/PropertyMap.cpp (modified) (4 diffs)

trunk/JavaScriptCore/kjs/PropertyMap.cpp

@@ -23 +23 @@
 
 #include "JSObject.h"
+#include "PropertyNameArray.h"
 #include "protect.h"
 #include <algorithm>
@@ -473 +474 @@
 }
 
-void PropertyMap::getEnumerablePropertyNames(Vector<UString::Rep*>& propertyNames) const
+void PropertyMap::getEnumerablePropertyNames(PropertyNameArray& propertyNames) const
 {
     if (!m_table)
@@ -492 +493 @@
             }
         }
-        propertyNames.reserveCapacity(i);
-        for (int k = 0; k < i; ++k)
-            propertyNames.append(a[k]->key);
+        if (!propertyNames.size()) {
+            for (int k = 0; k < i; ++k)
+                propertyNames.addKnownUnique(a[k]->key);
+        } else {
+            for (int k = 0; k < i; ++k)
+                propertyNames.add(a[k]->key);
+        }
+
         return;
     }
@@ -515 +521 @@
 
     // Put the keys of the sorted entries into the list.
-    propertyNames.reserveCapacity(sortedEnumerables.size());
-    for (size_t i = 0; i < sortedEnumerables.size(); ++i)
-        propertyNames.append(sortedEnumerables[i]->key);
+    if (!propertyNames.size()) {
+        for (size_t i = 0; i < sortedEnumerables.size(); ++i)
+            propertyNames.addKnownUnique(sortedEnumerables[i]->key);
+    } else {
+        for (size_t i = 0; i < sortedEnumerables.size(); ++i)
+            propertyNames.add(sortedEnumerables[i]->key);
+    }
 }