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

Timestamp:

Oct 7, 2008, 11:17:37 AM (17 years ago)

Author:

[email protected]

Message:

2008-10-07 Cameron Zwarich <​[email protected]>

Rubber-stamped by Mark Rowe.

Roll out r37370.

File:

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

trunk/JavaScriptCore/kjs/JSObject.cpp

@@ -135 +135 @@
     
     unsigned attributes;
-    if ((m_structureID->propertyMap().get(propertyName, attributes) != WTF::notFound) && attributes & ReadOnly)
+    if ((m_structureID->propertyMap().getOffset(propertyName, attributes) != WTF::notFound) && attributes & ReadOnly)
         return;
 
@@ -201 +201 @@
 {
     unsigned attributes;
-    if (m_structureID->propertyMap().get(propertyName, attributes) != WTF::notFound) {
+    if (m_structureID->propertyMap().getOffset(propertyName, attributes) != WTF::notFound) {
         if ((attributes & DontDelete))
             return false;
@@ -413 +413 @@
 bool JSObject::getPropertyAttributes(ExecState* exec, const Identifier& propertyName, unsigned& attributes) const
 {
-    if (m_structureID->propertyMap().get(propertyName, attributes) != WTF::notFound)
+    if (m_structureID->propertyMap().getOffset(propertyName, attributes) != WTF::notFound)
         return true;
     
@@ -469 +469 @@
 void JSObject::removeDirect(const Identifier& propertyName)
 {
-    size_t offset;
     if (m_structureID->isDictionary()) {
-        offset = m_structureID->propertyMap().remove(propertyName);
-        if (offset != WTF::notFound) {
-            m_propertyStorage[offset] = jsUndefined();
-            m_structureID->clearEnumerationCache();
-        }
+        m_structureID->propertyMap().remove(propertyName, m_propertyStorage);
+        m_structureID->clearEnumerationCache();
         return;
     }
 
     RefPtr<StructureID> structureID = StructureID::toDictionaryTransition(m_structureID);
-    offset = structureID->propertyMap().remove(propertyName);
-    if (offset != WTF::notFound)
-        m_propertyStorage[offset] = jsUndefined();
+    structureID->propertyMap().remove(propertyName, m_propertyStorage);
     setStructureID(structureID.release());
 }
@@ -507 +501 @@
 void JSObject::allocatePropertyStorage(size_t oldSize, size_t newSize)
 {
-    ASSERT(newSize > oldSize);
-
     JSValue** oldPropertStorage = m_propertyStorage;
     m_propertyStorage = new JSValue*[newSize];