diff options
author | Benjamin Poulain <benjamin.poulain@nokia.com> | 2009-08-05 18:56:44 (GMT) |
---|---|---|
committer | Benjamin Poulain <benjamin.poulain@nokia.com> | 2009-08-05 19:10:00 (GMT) |
commit | 520378cfedd63544a9689687256d2c89352ee561 (patch) | |
tree | 79a2c0e667dc95ffed3b8300edff098d15664f41 /src/3rdparty/webkit/JavaScriptCore/API/JSCallbackObjectFunctions.h | |
parent | a0fecb437176786e9c809a45e64351516b05a201 (diff) | |
download | Qt-520378cfedd63544a9689687256d2c89352ee561.zip Qt-520378cfedd63544a9689687256d2c89352ee561.tar.gz Qt-520378cfedd63544a9689687256d2c89352ee561.tar.bz2 |
Updates getPropertyNames() on all javascript object to use the flag
getPropertyNames() now uses a flag to specify which property should be
filtered. This flag should be used by all javascript objects.
This patch fixes the changes introduced by
e520df1f8678bd59adb341fb586f008a7de17fe8
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/API/JSCallbackObjectFunctions.h')
-rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/API/JSCallbackObjectFunctions.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/API/JSCallbackObjectFunctions.h b/src/3rdparty/webkit/JavaScriptCore/API/JSCallbackObjectFunctions.h index cc59a71..669b3cd 100644 --- a/src/3rdparty/webkit/JavaScriptCore/API/JSCallbackObjectFunctions.h +++ b/src/3rdparty/webkit/JavaScriptCore/API/JSCallbackObjectFunctions.h @@ -372,7 +372,7 @@ JSValue JSCallbackObject<Base>::call(ExecState* exec, JSObject* functionObject, } template <class Base> -void JSCallbackObject<Base>::getPropertyNames(ExecState* exec, PropertyNameArray& propertyNames, bool includeNonEnumerable) +void JSCallbackObject<Base>::getPropertyNames(ExecState* exec, PropertyNameArray& propertyNames, unsigned listedAttributes) { JSContextRef execRef = toRef(exec); JSObjectRef thisRef = toRef(this); @@ -380,7 +380,7 @@ void JSCallbackObject<Base>::getPropertyNames(ExecState* exec, PropertyNameArray for (JSClassRef jsClass = classRef(); jsClass; jsClass = jsClass->parentClass) { if (JSObjectGetPropertyNamesCallback getPropertyNames = jsClass->getPropertyNames) { JSLock::DropAllLocks dropAllLocks(exec); - getPropertyNames(execRef, thisRef, toRef(&propertyNames), includeNonEnumerable); + getPropertyNames(execRef, thisRef, toRef(&propertyNames), listedAttributes); } if (OpaqueJSClassStaticValuesTable* staticValues = jsClass->staticValues(exec)) { @@ -406,7 +406,7 @@ void JSCallbackObject<Base>::getPropertyNames(ExecState* exec, PropertyNameArray } } - Base::getPropertyNames(exec, propertyNames, includeNonEnumerable); + Base::getPropertyNames(exec, propertyNames, listedAttributes); } template <class Base> |