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/debugger | |
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/debugger')
-rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/debugger/DebuggerActivation.cpp | 4 | ||||
-rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/debugger/DebuggerActivation.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/debugger/DebuggerActivation.cpp b/src/3rdparty/webkit/JavaScriptCore/debugger/DebuggerActivation.cpp index f51b650..c1815c8 100644 --- a/src/3rdparty/webkit/JavaScriptCore/debugger/DebuggerActivation.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/debugger/DebuggerActivation.cpp @@ -70,9 +70,9 @@ bool DebuggerActivation::deleteProperty(ExecState* exec, const Identifier& prope return m_activation->deleteProperty(exec, propertyName, checkDontDelete); } -void DebuggerActivation::getPropertyNames(ExecState* exec, PropertyNameArray& propertyNames, bool includeNonEnumerable) +void DebuggerActivation::getPropertyNames(ExecState* exec, PropertyNameArray& propertyNames, unsigned listedAttributes) { - m_activation->getPropertyNames(exec, propertyNames, includeNonEnumerable); + m_activation->getPropertyNames(exec, propertyNames, listedAttributes); } bool DebuggerActivation::getPropertyAttributes(JSC::ExecState* exec, const Identifier& propertyName, unsigned& attributes) const diff --git a/src/3rdparty/webkit/JavaScriptCore/debugger/DebuggerActivation.h b/src/3rdparty/webkit/JavaScriptCore/debugger/DebuggerActivation.h index 4e5b60f..7c9f7d1 100644 --- a/src/3rdparty/webkit/JavaScriptCore/debugger/DebuggerActivation.h +++ b/src/3rdparty/webkit/JavaScriptCore/debugger/DebuggerActivation.h @@ -42,7 +42,7 @@ namespace JSC { virtual void put(ExecState*, const Identifier& propertyName, JSValue, PutPropertySlot&); virtual void putWithAttributes(ExecState*, const Identifier& propertyName, JSValue, unsigned attributes); virtual bool deleteProperty(ExecState*, const Identifier& propertyName, bool checkDontDelete = true); - virtual void getPropertyNames(ExecState*, PropertyNameArray&, bool includeNonEnumerable = false); + virtual void getPropertyNames(ExecState*, PropertyNameArray&, unsigned listedAttributes = Structure::Prototype); virtual bool getPropertyAttributes(ExecState*, const Identifier& propertyName, unsigned& attributes) const; virtual void defineGetter(ExecState*, const Identifier& propertyName, JSObject* getterFunction); virtual void defineSetter(ExecState*, const Identifier& propertyName, JSObject* setterFunction); |