Changeset 37381 in webkit for trunk/JavaScriptCore/kjs/PropertyMap.h

Timestamp:

Oct 7, 2008, 11:17:37 AM (17 years ago)

Author:

[email protected]

Message:

2008-10-07 Cameron Zwarich <​[email protected]>

Rubber-stamped by Mark Rowe.

Roll out r37370.

File:

• trunk/JavaScriptCore/kjs/PropertyMap.h (modified) (7 diffs)

trunk/JavaScriptCore/kjs/PropertyMap.h

@@ -43 +43 @@
     struct PropertyMapEntry {
         UString::Rep* key;
-        unsigned offset;
         unsigned attributes;
         unsigned index;
@@ -49 +48 @@
         PropertyMapEntry(UString::Rep* k, int a)
             : key(k)
-            , offset(0)
             , attributes(a)
             , index(0)
@@ -97 +95 @@
         bool isEmpty() { return !m_table; }
 
-        size_t get(const Identifier& propertyName);
-        size_t get(const Identifier& propertyName, unsigned& attributes);
-        size_t put(const Identifier& propertyName, unsigned attributes);
-        size_t remove(const Identifier& propertyName);
+        size_t put(const Identifier& propertyName, JSValue*, unsigned attributes, bool checkReadOnly, JSObject* slotBase, PutPropertySlot&, PropertyStorage&);
+        void remove(const Identifier& propertyName, PropertyStorage&);
+
+        size_t getOffset(const Identifier& propertyName);
+        size_t getOffset(const Identifier& propertyName, unsigned& attributes);
 
         void getEnumerablePropertyNames(PropertyNameArray&) const;
@@ -116 +115 @@
         typedef PropertyMapHashTable Table;
 
-        void expand();
-        void rehash();
-        void rehash(unsigned newTableSize);
-        void createTable();
+        void expand(PropertyStorage&);
+        void rehash(PropertyStorage&);
+        void rehash(unsigned newTableSize, PropertyStorage&);
+        void createTable(PropertyStorage&);
 
-        void insert(const Entry&);
+        void insert(const Entry&, JSValue*, PropertyStorage&);
 
-        void checkConsistency();
+        void checkConsistency(PropertyStorage&);
 
         Table* m_table;
-        Vector<unsigned> m_deletedOffsets;
         bool m_getterSetterFlag : 1;
     };
@@ -136 +134 @@
     }
 
-    inline size_t PropertyMap::get(const Identifier& propertyName)
+    inline size_t PropertyMap::getOffset(const Identifier& propertyName)
     {
         ASSERT(!propertyName.isNull());
@@ -156 +154 @@
 
         if (rep == m_table->entries()[entryIndex - 1].key)
-            return m_table->entries()[entryIndex - 1].offset;
+            return entryIndex - 2;
 
 #if DUMP_PROPERTYMAP_STATS
@@ -176 +174 @@
 
             if (rep == m_table->entries()[entryIndex - 1].key)
-                return m_table->entries()[entryIndex - 1].offset;
+                return entryIndex - 2;
         }
     }