diff options
| author | Iain <qt-info@nokia.com> | 2009-08-21 13:23:16 (GMT) |
|---|---|---|
| committer | Iain <qt-info@nokia.com> | 2009-08-21 13:23:16 (GMT) |
| commit | d2cfe342ff109e7135fe2fcb00f60d918a7bfaa5 (patch) | |
| tree | 26a2edc99e561721fad57d27f84a2a6c0be73a3c /src/3rdparty/webkit/JavaScriptCore/runtime/JSObject.h | |
| parent | 6df41a9378e39f4d46cee1a085463d55fe2af5aa (diff) | |
| parent | ab1df6dea670a60bfef5efd81d6687f9534cfc5d (diff) | |
| download | Qt-d2cfe342ff109e7135fe2fcb00f60d918a7bfaa5.zip Qt-d2cfe342ff109e7135fe2fcb00f60d918a7bfaa5.tar.gz Qt-d2cfe342ff109e7135fe2fcb00f60d918a7bfaa5.tar.bz2 | |
Merge commit 'origin/master' into symbolVisibility
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/runtime/JSObject.h')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/runtime/JSObject.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/JSObject.h b/src/3rdparty/webkit/JavaScriptCore/runtime/JSObject.h index db47ac7..15b7957 100644 --- a/src/3rdparty/webkit/JavaScriptCore/runtime/JSObject.h +++ b/src/3rdparty/webkit/JavaScriptCore/runtime/JSObject.h @@ -110,14 +110,13 @@ namespace JSC { bool hasProperty(ExecState*, unsigned propertyName) const; bool hasOwnProperty(ExecState*, const Identifier& propertyName) const; - virtual bool deleteProperty(ExecState*, const Identifier& propertyName); - virtual bool deleteProperty(ExecState*, unsigned propertyName); + virtual bool deleteProperty(ExecState*, const Identifier& propertyName, bool checkDontDelete = true); + virtual bool deleteProperty(ExecState*, unsigned propertyName, bool checkDontDelete = true); virtual JSValue defaultValue(ExecState*, PreferredPrimitiveType) const; virtual bool hasInstance(ExecState*, JSValue, JSValue prototypeProperty); - - virtual void getPropertyNames(ExecState*, PropertyNameArray&); + virtual void getPropertyNames(ExecState*, PropertyNameArray&, unsigned listedAttributes = Structure::Prototype); virtual JSValue toPrimitive(ExecState*, PreferredPrimitiveType = NoPreference) const; virtual bool getPrimitiveNumber(ExecState*, double& number, JSValue& value); |