Changeset 37400 in webkit for trunk/JavaScriptCore/kjs/JSObject.cpp

Timestamp:

Oct 7, 2008, 4:49:59 PM (17 years ago)

Author:

[email protected]

Message:

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

Reviewed by Cameron Zwarich.

Move hasGetterSetterProperties flag from PropertyMap to StructureID.

• kjs/JSObject.cpp: (JSC::JSObject::put): (JSC::JSObject::defineGetter): (JSC::JSObject::defineSetter):
• kjs/JSObject.h: (JSC::JSObject::hasGetterSetterProperties): (JSC::JSObject::getOwnPropertySlotForWrite): (JSC::JSObject::getOwnPropertySlot):
• kjs/PropertyMap.h:
• kjs/StructureID.cpp: (JSC::StructureID::StructureID): (JSC::StructureID::addPropertyTransition): (JSC::StructureID::toDictionaryTransition): (JSC::StructureID::changePrototypeTransition): (JSC::StructureID::getterSetterTransition):
• kjs/StructureID.h: (JSC::StructureID::hasGetterSetterProperties): (JSC::StructureID::setHasGetterSetterProperties):

File:

• trunk/JavaScriptCore/kjs/JSObject.cpp (modified) (5 diffs)

trunk/JavaScriptCore/kjs/JSObject.cpp

@@ -126 +126 @@
     // Check if there are any setters or getters in the prototype chain
     JSValue* prototype;
-    for (JSObject* obj = this; !obj->structureID()->propertyMap().hasGetterSetterProperties(); obj = static_cast<JSObject*>(prototype)) {
+    for (JSObject* obj = this; !obj->structureID()->hasGetterSetterProperties(); obj = static_cast<JSObject*>(prototype)) {
         prototype = obj->prototype();
         if (prototype->isNull()) {
@@ -293 +293 @@
     JSValue* object = getDirect(propertyName);
     if (object && object->isGetterSetter()) {
-        ASSERT(m_structureID->propertyMap().hasGetterSetterProperties());
+        ASSERT(m_structureID->hasGetterSetterProperties());
         GetterSetter* getterSetter = static_cast<GetterSetter*>(object);
         getterSetter->setGetter(getterFunction);
@@ -313 +313 @@
     }
 
-    m_structureID->propertyMap().setHasGetterSetterProperties(true);
+    m_structureID->setHasGetterSetterProperties(true);
     getterSetter->setGetter(getterFunction);
 }
@@ -321 +321 @@
     JSValue* object = getDirect(propertyName);
     if (object && object->isGetterSetter()) {
-        ASSERT(m_structureID->propertyMap().hasGetterSetterProperties());
+        ASSERT(m_structureID->hasGetterSetterProperties());
         GetterSetter* getterSetter = static_cast<GetterSetter*>(object);
         getterSetter->setSetter(setterFunction);
@@ -341 +341 @@
     }
 
-    m_structureID->propertyMap().setHasGetterSetterProperties(true);
+    m_structureID->setHasGetterSetterProperties(true);
     getterSetter->setSetter(setterFunction);
 }