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

trunk/JavaScriptCore/kjs/PropertyMap.cpp

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