Changeset 31225 in webkit for trunk/JavaScriptCore/kjs/JSVariableObject.cpp

Timestamp:

Mar 21, 2008, 7:36:34 PM (17 years ago)

Author:

[email protected]

Message:

Global properties that use LocalStorage are not correctly listed as enumerable.

Reviewed by Geoff Garen

The problem was caused by JSObject::getPropertyAttributes not being aware
of the JSVariableObject SymbolTable. The fix is to make getPropertyAttributes
virtual and override in JSVariableObject. This does not produce any performance
regression.

File:

• trunk/JavaScriptCore/kjs/JSVariableObject.cpp (modified) (1 diff)

trunk/JavaScriptCore/kjs/JSVariableObject.cpp

@@ -85 +85 @@
 void JSVariableObject::getPropertyNames(ExecState* exec, PropertyNameArray& propertyNames)
 {
-    SymbolTable::const_iterator::Keys end = symbolTable().end().keys();
-    for (SymbolTable::const_iterator::Keys it = symbolTable().begin().keys(); it != end; ++it)
-        propertyNames.add(Identifier(it->get()));
+    SymbolTable::const_iterator end = symbolTable().end();
+    for (SymbolTable::const_iterator it = symbolTable().begin(); it != end; ++it)
+        if ((localStorage()[it->second].attributes & DontEnum) == 0)
+            propertyNames.add(Identifier(it->first.get()));
+    
+    JSObject::getPropertyNames(exec, propertyNames);
+}
 
-    JSObject::getPropertyNames(exec, propertyNames);
+bool JSVariableObject::getPropertyAttributes(const Identifier& propertyName, unsigned& attributes) const
+{
+    size_t index = symbolTable().get(propertyName.ustring().rep());
+    if (index != missingSymbolMarker()) {
+        attributes = localStorage()[index].attributes;
+        return true;
+    }
+    return JSObject::getPropertyAttributes(propertyName, attributes);
 }