summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/JavaScriptCore/runtime/StringObject.h
diff options
context:
space:
mode:
authorPeter Hartmann <peter.hartmann@nokia.com>2009-10-26 12:10:13 (GMT)
committerPeter Hartmann <peter.hartmann@nokia.com>2009-10-26 12:10:13 (GMT)
commit2b46eff0e7f7d11cf957b9b180177cc4b368c9aa (patch)
tree03e166e8393e1928ec5ed3c79c96fa0accd11460 /src/3rdparty/webkit/JavaScriptCore/runtime/StringObject.h
parente1f691d84dad17c5ee47c97c31ae743093ad8bc9 (diff)
parente2ef97128c006ac2a5c99c67bb54eebaa3b45720 (diff)
downloadQt-2b46eff0e7f7d11cf957b9b180177cc4b368c9aa.zip
Qt-2b46eff0e7f7d11cf957b9b180177cc4b368c9aa.tar.gz
Qt-2b46eff0e7f7d11cf957b9b180177cc4b368c9aa.tar.bz2
Merge commit 'origin/4.6' into core-4.6
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/runtime/StringObject.h')
-rw-r--r--src/3rdparty/webkit/JavaScriptCore/runtime/StringObject.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/StringObject.h b/src/3rdparty/webkit/JavaScriptCore/runtime/StringObject.h
index 944f6ba..84e1ad2 100644
--- a/src/3rdparty/webkit/JavaScriptCore/runtime/StringObject.h
+++ b/src/3rdparty/webkit/JavaScriptCore/runtime/StringObject.h
@@ -48,10 +48,11 @@ namespace JSC {
static PassRefPtr<Structure> createStructure(JSValue prototype)
{
- return Structure::create(prototype, TypeInfo(ObjectType));
+ return Structure::create(prototype, TypeInfo(ObjectType, StructureFlags));
}
protected:
+ static const unsigned StructureFlags = OverridesGetOwnPropertySlot | OverridesMarkChildren | OverridesGetPropertyNames | JSWrapperObject::StructureFlags;
StringObject(NonNullPassRefPtr<Structure>, JSString*);
};