summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/JavaScriptCore/runtime/JSONObject.h
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar@trolltech.com>2009-10-23 05:13:34 (GMT)
committerGunnar Sletta <gunnar@trolltech.com>2009-10-23 05:13:34 (GMT)
commitaab648826f0a11a93341f29e88c46902d5f31e4d (patch)
tree11d26e0f7353c66a92c7af23a67bf32782f19332 /src/3rdparty/webkit/JavaScriptCore/runtime/JSONObject.h
parent5de213210ef4f14e698c3fd970cf7e6c5b27c72d (diff)
parenteeb116b56f9555458438dfe235b16488db9b1494 (diff)
downloadQt-aab648826f0a11a93341f29e88c46902d5f31e4d.zip
Qt-aab648826f0a11a93341f29e88c46902d5f31e4d.tar.gz
Qt-aab648826f0a11a93341f29e88c46902d5f31e4d.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/runtime/JSONObject.h')
-rw-r--r--src/3rdparty/webkit/JavaScriptCore/runtime/JSONObject.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/JSONObject.h b/src/3rdparty/webkit/JavaScriptCore/runtime/JSONObject.h
index 65c9803..ec3fa40 100644
--- a/src/3rdparty/webkit/JavaScriptCore/runtime/JSONObject.h
+++ b/src/3rdparty/webkit/JavaScriptCore/runtime/JSONObject.h
@@ -41,11 +41,14 @@ namespace JSC {
static PassRefPtr<Structure> createStructure(JSValue prototype)
{
- return Structure::create(prototype, TypeInfo(ObjectType, HasDefaultMark | HasDefaultGetPropertyNames));
+ return Structure::create(prototype, TypeInfo(ObjectType, StructureFlags));
}
static void markStringifiers(MarkStack&, Stringifier*);
+ protected:
+ static const unsigned StructureFlags = OverridesGetOwnPropertySlot | JSObject::StructureFlags;
+
private:
virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&);
virtual bool getOwnPropertyDescriptor(ExecState*, const Identifier&, PropertyDescriptor&);