diff options
| author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2009-10-26 10:41:56 (GMT) |
|---|---|---|
| committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2009-10-26 10:41:56 (GMT) |
| commit | 968f7c0e65a293a7d7b9a87601e853894d9794ed (patch) | |
| tree | 3a86b71dd69cf4b759bb20b62c18cfeb02a28ef0 /src/3rdparty/webkit/JavaScriptCore/runtime/JSONObject.h | |
| parent | 3481db791c3b48e28f1a9531b247adf6562edb71 (diff) | |
| parent | e2ef97128c006ac2a5c99c67bb54eebaa3b45720 (diff) | |
| download | Qt-968f7c0e65a293a7d7b9a87601e853894d9794ed.zip Qt-968f7c0e65a293a7d7b9a87601e853894d9794ed.tar.gz Qt-968f7c0e65a293a7d7b9a87601e853894d9794ed.tar.bz2 | |
Merge branch '4.6' into 4.6-platform
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/runtime/JSONObject.h')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/runtime/JSONObject.h | 5 |
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&); |