summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/JavaScriptCore/API
diff options
context:
space:
mode:
authorKent Hansen <khansen@trolltech.com>2009-08-04 14:22:41 (GMT)
committerKent Hansen <khansen@trolltech.com>2009-08-04 14:48:14 (GMT)
commit394f62d779e6e120ce2fc19bd61ec64bd29a87a9 (patch)
treefa6da1375e83311881da4c95755d7a7276a3c58e /src/3rdparty/webkit/JavaScriptCore/API
parentcd23e93e30be026a6bd4a9d5e3d3cbec3cf97621 (diff)
downloadQt-394f62d779e6e120ce2fc19bd61ec64bd29a87a9.zip
Qt-394f62d779e6e120ce2fc19bd61ec64bd29a87a9.tar.gz
Qt-394f62d779e6e120ce2fc19bd61ec64bd29a87a9.tar.bz2
Make it possible to delete properties even though they have the DontDelete attribute
This makes it possible to delete properties in C++, even though they can't be deleted in JS.
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/API')
-rw-r--r--src/3rdparty/webkit/JavaScriptCore/API/JSCallbackObject.h4
-rw-r--r--src/3rdparty/webkit/JavaScriptCore/API/JSCallbackObjectFunctions.h8
2 files changed, 6 insertions, 6 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/API/JSCallbackObject.h b/src/3rdparty/webkit/JavaScriptCore/API/JSCallbackObject.h
index 4f1d51c..853ce6d 100644
--- a/src/3rdparty/webkit/JavaScriptCore/API/JSCallbackObject.h
+++ b/src/3rdparty/webkit/JavaScriptCore/API/JSCallbackObject.h
@@ -61,8 +61,8 @@ 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);
diff --git a/src/3rdparty/webkit/JavaScriptCore/API/JSCallbackObjectFunctions.h b/src/3rdparty/webkit/JavaScriptCore/API/JSCallbackObjectFunctions.h
index 8bcf8ad..cc59a71 100644
--- a/src/3rdparty/webkit/JavaScriptCore/API/JSCallbackObjectFunctions.h
+++ b/src/3rdparty/webkit/JavaScriptCore/API/JSCallbackObjectFunctions.h
@@ -224,7 +224,7 @@ void JSCallbackObject<Base>::put(ExecState* exec, const Identifier& propertyName
}
template <class Base>
-bool JSCallbackObject<Base>::deleteProperty(ExecState* exec, const Identifier& propertyName)
+bool JSCallbackObject<Base>::deleteProperty(ExecState* exec, const Identifier& propertyName, bool checkDontDelete)
{
JSContextRef ctx = toRef(exec);
JSObjectRef thisRef = toRef(this);
@@ -262,13 +262,13 @@ bool JSCallbackObject<Base>::deleteProperty(ExecState* exec, const Identifier& p
}
}
- return Base::deleteProperty(exec, propertyName);
+ return Base::deleteProperty(exec, propertyName, checkDontDelete);
}
template <class Base>
-bool JSCallbackObject<Base>::deleteProperty(ExecState* exec, unsigned propertyName)
+bool JSCallbackObject<Base>::deleteProperty(ExecState* exec, unsigned propertyName, bool checkDontDelete)
{
- return deleteProperty(exec, Identifier::from(exec, propertyName));
+ return deleteProperty(exec, Identifier::from(exec, propertyName), checkDontDelete);
}
template <class Base>