summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/JavaScriptCore/API/JSCallbackObject.h
diff options
context:
space:
mode:
authorShane Kearns <shane.kearns@sosco.com>2009-08-24 07:36:20 (GMT)
committerShane Kearns <shane.kearns@sosco.com>2009-08-24 07:36:20 (GMT)
commit898cba2245b6fafa3820b44203442fedd9f7ed73 (patch)
treec7545af2a15396c7c5d79612d7073de9b4274d43 /src/3rdparty/webkit/JavaScriptCore/API/JSCallbackObject.h
parent6dade01b24f3fd314cb6ec9c2979348e78740a52 (diff)
parent028655065de7f989a35b63bcab583767aba9c048 (diff)
downloadQt-898cba2245b6fafa3820b44203442fedd9f7ed73.zip
Qt-898cba2245b6fafa3820b44203442fedd9f7ed73.tar.gz
Qt-898cba2245b6fafa3820b44203442fedd9f7ed73.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/API/JSCallbackObject.h')
-rw-r--r--src/3rdparty/webkit/JavaScriptCore/API/JSCallbackObject.h6
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;