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

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.h (modified) (3 diffs)

trunk/JavaScriptCore/kjs/JSObject.h

@@ -153 +153 @@
         void removeDirect(const Identifier& propertyName);
         bool hasCustomProperties() { return !m_structureID->propertyMap().isEmpty(); }
-        bool hasGetterSetterProperties() { return m_structureID->propertyMap().hasGetterSetterProperties(); }
+        bool hasGetterSetterProperties() { return m_structureID->hasGetterSetterProperties(); }
 
         void putDirect(const Identifier& propertyName, JSValue* value, unsigned attr = 0);
@@ -314 +314 @@
     unsigned attributes;
     if (JSValue** location = getDirectLocation(propertyName, attributes)) {
-        if (m_structureID->propertyMap().hasGetterSetterProperties() && location[0]->isGetterSetter()) {
+        if (m_structureID->hasGetterSetterProperties() && location[0]->isGetterSetter()) {
             slotIsWriteable = false;
             fillGetterPropertySlot(slot, location);
@@ -340 +340 @@
 {
     if (JSValue** location = getDirectLocation(propertyName)) {
-        if (m_structureID->propertyMap().hasGetterSetterProperties() && location[0]->isGetterSetter())
+        if (m_structureID->hasGetterSetterProperties() && location[0]->isGetterSetter())
             fillGetterPropertySlot(slot, location);
         else