Changeset 37989 in webkit for trunk/JavaScriptCore/runtime/JSObject.cpp

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/JSObject.cpp (modified) (6 diffs)

trunk/JavaScriptCore/runtime/JSObject.cpp

@@ -70 +70 @@
     m_structureID->mark();
 
-    unsigned storageSize = m_structureID->propertyMap().storageSize();
-    for (unsigned i = 0; i < storageSize; ++i) {
+    size_t storageSize = m_structureID->propertyStorageSize();
+    for (size_t i = 0; i < storageSize; ++i) {
         JSValue* v = m_propertyStorage[i];
         if (!v->marked())
@@ -134 +134 @@
     
     unsigned attributes;
-    if ((m_structureID->propertyMap().get(propertyName, attributes) != WTF::notFound) && attributes & ReadOnly)
+    if ((m_structureID->get(propertyName, attributes) != WTF::notFound) && attributes & ReadOnly)
         return;
 
@@ -200 +200 @@
 {
     unsigned attributes;
-    if (m_structureID->propertyMap().get(propertyName, attributes) != WTF::notFound) {
+    if (m_structureID->get(propertyName, attributes) != WTF::notFound) {
         if ((attributes & DontDelete))
             return false;
@@ -410 +410 @@
 bool JSObject::getPropertyAttributes(ExecState* exec, const Identifier& propertyName, unsigned& attributes) const
 {
-    if (m_structureID->propertyMap().get(propertyName, attributes) != WTF::notFound)
+    if (m_structureID->get(propertyName, attributes) != WTF::notFound)
         return true;
     
@@ -468 +468 @@
     size_t offset;
     if (m_structureID->isDictionary()) {
-        offset = m_structureID->propertyMap().remove(propertyName);
+        offset = m_structureID->remove(propertyName);
         if (offset != WTF::notFound) {
             m_propertyStorage[offset] = jsUndefined();
@@ -477 +477 @@
 
     RefPtr<StructureID> structureID = StructureID::toDictionaryTransition(m_structureID);
-    offset = structureID->propertyMap().remove(propertyName);
+    offset = structureID->remove(propertyName);
     if (offset != WTF::notFound)
         m_propertyStorage[offset] = jsUndefined();