Changeset 36696 in webkit for trunk/JavaScriptCore/kjs/JSObject.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/JSObject.cpp (modified) (1 diff)

trunk/JavaScriptCore/kjs/JSObject.cpp

@@ -433 +433 @@
 void JSObject::getPropertyNames(ExecState* exec, PropertyNameArray& propertyNames)
 {
-    m_structureID->getEnumerablePropertyNames(exec, propertyNames, this);
+    m_structureID->getEnumerablePropertyNames(propertyNames);
+
+    // Add properties from the static hashtables of properties
+    for (const ClassInfo* info = classInfo(); info; info = info->parentClass) {
+        const HashTable* table = info->propHashTable(exec);
+        if (!table)
+            continue;
+        table->initializeIfNeeded(exec);
+        ASSERT(table->table);
+        int hashSizeMask = table->hashSizeMask;
+        const HashEntry* entry = table->table;
+        for (int i = 0; i <= hashSizeMask; ++i, ++entry) {
+            if (entry->key && !(entry->attributes & DontEnum))
+                propertyNames.add(entry->key);
+        }
+    }
+
+    if (prototype()->isObject())
+        static_cast<JSObject*>(prototype())->getPropertyNames(exec, propertyNames);
 }