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

Timestamp:

Dec 10, 2009, 4:06:15 PM (15 years ago)

Author:

[email protected]

Message:

2009-12-10 Kent Hansen <​[email protected]>

Reviewed by Geoffrey Garen.

Remove JSObject::getPropertyAttributes() and all usage of it.
​https://bugs.webkit.org/show_bug.cgi?id=31933

getOwnPropertyDescriptor() should be used instead.

• JavaScriptCore.exp:
• JavaScriptCore.order:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
• debugger/DebuggerActivation.cpp: (JSC::DebuggerActivation::getOwnPropertyDescriptor):
• debugger/DebuggerActivation.h:
• runtime/JSObject.cpp: (JSC::JSObject::propertyIsEnumerable):
• runtime/JSObject.h:
• runtime/JSVariableObject.cpp:
• runtime/JSVariableObject.h:

2009-12-10 Kent Hansen <​[email protected]>

Reviewed by Geoffrey Garen.

Remove getPropertyAttributes() from JavaScript bindings.
​https://bugs.webkit.org/show_bug.cgi?id=31933

The functionality is provided by getOwnPropertyDescriptor().

• WebCore.order:
• bindings/js/JSDOMWindowCustom.cpp:
• bindings/js/JSDOMWindowShell.cpp:
• bindings/js/JSDOMWindowShell.h:
• bindings/scripts/CodeGeneratorJS.pm:
• page/DOMWindow.idl:

File:

• trunk/JavaScriptCore/runtime/JSObject.cpp (modified) (1 diff)

trunk/JavaScriptCore/runtime/JSObject.cpp

@@ -407 +407 @@
 bool JSObject::propertyIsEnumerable(ExecState* exec, const Identifier& propertyName) const
 {
-    unsigned attributes;
-    if (!getPropertyAttributes(exec, propertyName, attributes))
+    PropertyDescriptor descriptor;
+    if (!const_cast<JSObject*>(this)->getOwnPropertyDescriptor(exec, propertyName, descriptor))
         return false;
-    return !(attributes & DontEnum);
-}
-
-bool JSObject::getPropertyAttributes(ExecState* exec, const Identifier& propertyName, unsigned& attributes) const
-{
-    JSCell* specificValue;
-    if (m_structure->get(propertyName, attributes, specificValue) != WTF::notFound)
-        return true;
-    
-    // Look in the static hashtable of properties
-    const HashEntry* entry = findPropertyHashEntry(exec, propertyName);
-    if (entry) {
-        attributes = entry->attributes();
-        return true;
-    }
-    
-    return false;
+    return descriptor.enumerable();
 }