Changeset 49328 in webkit for trunk/JavaScriptCore/runtime/Structure.h

Timestamp:

Oct 8, 2009, 3:25:14 PM (16 years ago)

Author:

[email protected]

Message:

Rolled out r49322 and friends because they killed the build

File:

• trunk/JavaScriptCore/runtime/Structure.h (modified) (6 diffs)

trunk/JavaScriptCore/runtime/Structure.h

@@ -31 +31 @@
 #include "JSValue.h"
 #include "PropertyMapHashTable.h"
-#include "PropertyNameArray.h"
 #include "StructureChain.h"
 #include "StructureTransitionTable.h"
@@ -78 +77 @@
         ~Structure();
 
+        void markAggregate(MarkStack&);
+
         // These should be used with caution.  
         size_t addPropertyWithoutTransition(const Identifier& propertyName, unsigned attributes, JSCell* specificValue);
@@ -116 +117 @@
         }
 
+        void getEnumerablePropertyNames(ExecState*, PropertyNameArray&, JSObject*);
+        void getOwnEnumerablePropertyNames(ExecState*, PropertyNameArray&, JSObject*);
+
         bool hasGetterSetterProperties() const { return m_hasGetterSetterProperties; }
         void setHasGetterSetterProperties(bool hasGetterSetterProperties) { m_hasGetterSetterProperties = hasGetterSetterProperties; }
@@ -123 +127 @@
         JSCell* specificValue() { return m_specificValueInPrevious; }
         void despecifyDictionaryFunction(const Identifier& propertyName);
-
-        void setEnumerationCache(PassRefPtr<PropertyNameArrayData> data) { m_cachedPropertyNameArrayData = data; }
-        PropertyNameArrayData* enumerationCache() { return m_cachedPropertyNameArrayData.get(); }
-        void clearEnumerationCache();
-        void getEnumerablePropertyNames(PropertyNameArray&);
 
     private:
@@ -142 +141 @@
         size_t remove(const Identifier& propertyName);
         void addAnonymousSlots(unsigned slotCount);
+        void getEnumerableNamesFromPropertyTable(PropertyNameArray&);
+        void getEnumerableNamesFromClassInfoTable(ExecState*, const ClassInfo*, PropertyNameArray&);
 
         void expandPropertyMapHashTable();
@@ -161 +162 @@
             materializePropertyMap();
         }
+
+        void clearEnumerationCache();
 
         signed char transitionCount() const