Changeset 37989 in webkit for trunk/JavaScriptCore/runtime/StructureID.h

Timestamp:

Oct 29, 2008, 7:44:46 PM (17 years ago)

Author:

[email protected]

Message:

2008-10-29 Sam Weinig <​[email protected]>

Reviewed by Oliver Hunt.

Remove direct use of PropertyMap.

• JavaScriptCore.exp:
• runtime/JSObject.cpp: (JSC::JSObject::mark): (JSC::JSObject::put): (JSC::JSObject::deleteProperty): (JSC::JSObject::getPropertyAttributes): (JSC::JSObject::removeDirect):
• runtime/JSObject.h: (JSC::JSObject::getDirect): (JSC::JSObject::getDirectLocation): (JSC::JSObject::hasCustomProperties): (JSC::JSObject::JSObject): (JSC::JSObject::putDirect):
• runtime/PropertyMap.cpp: (JSC::PropertyMap::get):
• runtime/PropertyMap.h: (JSC::PropertyMap::isEmpty): (JSC::PropertyMap::get):
• runtime/StructureID.cpp: (JSC::StructureID::dumpStatistics):
• runtime/StructureID.h: (JSC::StructureID::propertyStorageSize): (JSC::StructureID::get): (JSC::StructureID::put): (JSC::StructureID::remove): (JSC::StructureID::isEmpty):

File:

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

trunk/JavaScriptCore/runtime/StructureID.h

@@ -97 +97 @@
         StructureIDChain* cachedPrototypeChain() const { return m_cachedPrototypeChain.get(); }
 
-        const PropertyMap& propertyMap() const { return m_propertyMap; }
-        PropertyMap& propertyMap() { return m_propertyMap; }
-
         void setCachedTransistionOffset(size_t offset) { m_cachedTransistionOffset = offset; }
         size_t cachedTransistionOffset() const { return m_cachedTransistionOffset; }
@@ -105 +102 @@
         void growPropertyStorageCapacity();
         size_t propertyStorageCapacity() const { return m_propertyStorageCapacity; }
+        size_t propertyStorageSize() const { return m_propertyMap.storageSize(); }
+
+        size_t get(const Identifier& propertyName) const { return m_propertyMap.get(propertyName); }
+        size_t get(const Identifier& propertyName, unsigned& attributes) const { return m_propertyMap.get(propertyName, attributes); }
+        size_t put(const Identifier& propertyName, unsigned attributes) { return m_propertyMap.put(propertyName, attributes); }
+        size_t remove(const Identifier& propertyName) { return m_propertyMap.remove(propertyName); }
 
         void getEnumerablePropertyNames(ExecState*, PropertyNameArray&, JSObject*);
@@ -112 +115 @@
         void setHasGetterSetterProperties(bool hasGetterSetterProperties) { m_hasGetterSetterProperties = hasGetterSetterProperties; }
 
+        bool isEmpty() const { return m_propertyMap.isEmpty(); }
+
     private:
         StructureID(JSValue* prototype, const TypeInfo&);
-        
+
         static const size_t s_maxTransitionLength = 64;