Changeset 49726 in webkit for trunk/JavaScriptCore/runtime/PropertyNameArray.h

Timestamp:

Oct 16, 2009, 7:31:42 PM (16 years ago)

Author:

[email protected]

Message:

Roll out r49717 as it broke the build.

File:

• trunk/JavaScriptCore/runtime/PropertyNameArray.h (modified) (3 diffs)

trunk/JavaScriptCore/runtime/PropertyNameArray.h

@@ -25 +25 @@
 #include "Identifier.h"
 #include <wtf/HashSet.h>
-#include <wtf/OwnArrayPtr.h>
 #include <wtf/Vector.h>
 
@@ -33 +32 @@
     class StructureChain;
 
-    // FIXME: Rename to PropertyNameArray.
     class PropertyNameArrayData : public RefCounted<PropertyNameArrayData> {
     public:
         typedef Vector<Identifier, 20> PropertyNameVector;
+        typedef PropertyNameVector::const_iterator const_iterator;
 
         static PassRefPtr<PropertyNameArrayData> create() { return adoptRef(new PropertyNameArrayData); }
 
+        const_iterator begin() const { return m_propertyNameVector.begin(); }
+        const_iterator end() const { return m_propertyNameVector.end(); }
+
         PropertyNameVector& propertyNameVector() { return m_propertyNameVector; }
+
+        void setCachedStructure(Structure* structure) { m_cachedStructure = structure; }
+        Structure* cachedStructure() const { return m_cachedStructure; }
+
+        void setCachedPrototypeChain(NonNullPassRefPtr<StructureChain> cachedPrototypeChain) { m_cachedPrototypeChain = cachedPrototypeChain; }
+        StructureChain* cachedPrototypeChain() { return m_cachedPrototypeChain.get(); }
 
     private:
         PropertyNameArrayData()
+            : m_cachedStructure(0)
         {
         }
 
         PropertyNameVector m_propertyNameVector;
+        Structure* m_cachedStructure;
+        RefPtr<StructureChain> m_cachedPrototypeChain;
     };
 
-    // FIXME: Rename to PropertyNameArrayBuilder.
     class PropertyNameArray {
     public:
+        typedef PropertyNameArrayData::const_iterator const_iterator;
+
         PropertyNameArray(JSGlobalData* globalData)
             : m_data(PropertyNameArrayData::create())
@@ -73 +85 @@
         void addKnownUnique(UString::Rep* identifier) { m_data->propertyNameVector().append(Identifier(m_globalData, identifier)); }
 
+        size_t size() const { return m_data->propertyNameVector().size(); }
+
         Identifier& operator[](unsigned i) { return m_data->propertyNameVector()[i]; }
         const Identifier& operator[](unsigned i) const { return m_data->propertyNameVector()[i]; }
 
+        const_iterator begin() const { return m_data->begin(); }
+        const_iterator end() const { return m_data->end(); }
+
         void setData(PassRefPtr<PropertyNameArrayData> data) { m_data = data; }
         PropertyNameArrayData* data() { return m_data.get(); }
+
         PassRefPtr<PropertyNameArrayData> releaseData() { return m_data.release(); }
 
-        // FIXME: Remove these functions.
-        typedef PropertyNameArrayData::PropertyNameVector::const_iterator const_iterator;
-        size_t size() const { return m_data->propertyNameVector().size(); }
-        const_iterator begin() const { return m_data->propertyNameVector().begin(); }
-        const_iterator end() const { return m_data->propertyNameVector().end(); }
+        void setShouldCache(bool shouldCache) { m_shouldCache = shouldCache; }
+        bool shouldCache() const { return m_shouldCache; }
 
     private: