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/API/JSCallbackObject.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/API/JSCallbackObject.h')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/API/JSCallbackObject.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/API/JSCallbackObject.h b/src/3rdparty/webkit/JavaScriptCore/API/JSCallbackObject.h index 9d22ad9..4360baa 100644 --- a/src/3rdparty/webkit/JavaScriptCore/API/JSCallbackObject.h +++ b/src/3rdparty/webkit/JavaScriptCore/API/JSCallbackObject.h @@ -61,12 +61,12 @@ private: virtual void put(ExecState*, const Identifier&, JSValue, PutPropertySlot&); - virtual bool deleteProperty(ExecState*, const Identifier&); - virtual bool deleteProperty(ExecState*, unsigned); + virtual bool deleteProperty(ExecState*, const Identifier&, bool checkDontDelete = true); + virtual bool deleteProperty(ExecState*, unsigned, bool checkDontDelete = true); virtual bool hasInstance(ExecState* exec, JSValue value, JSValue proto); - virtual void getPropertyNames(ExecState*, PropertyNameArray&); + virtual void getPropertyNames(ExecState*, PropertyNameArray&, unsigned listedAttributes = Structure::Prototype); virtual double toNumber(ExecState*) const; virtual UString toString(ExecState*) const; |