diff options
| author | axis <qt-info@nokia.com> | 2009-11-04 14:07:39 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-11-04 14:07:39 (GMT) |
| commit | 9cda9fb4bb496a7c589767bdcead131dbcdeeb79 (patch) | |
| tree | 2302096f06d4629ea62a85317429daa74ce6f02d /src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalData.h | |
| parent | be6357bfa96cdaffa5797fef99e95cac7121e5b3 (diff) | |
| parent | 7905101fb5ef18c776be515b9287356b1efc5ceb (diff) | |
| download | Qt-9cda9fb4bb496a7c589767bdcead131dbcdeeb79.zip Qt-9cda9fb4bb496a7c589767bdcead131dbcdeeb79.tar.gz Qt-9cda9fb4bb496a7c589767bdcead131dbcdeeb79.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalData.h')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalData.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalData.h b/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalData.h index 3ad90ad..d2aa2da 100644 --- a/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalData.h +++ b/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalData.h @@ -30,6 +30,7 @@ #define JSGlobalData_h #include "Collector.h" +#include "DateInstanceCache.h" #include "ExecutableAllocator.h" #include "JITStubs.h" #include "JSValue.h" @@ -116,7 +117,8 @@ namespace JSC { const MarkedArgumentBuffer* emptyList; // Lists are supposed to be allocated on the stack to have their elements properly marked, which is not the case here - but this list has nothing to mark. SmallStrings smallStrings; NumericStrings numericStrings; - + DateInstanceCache dateInstanceCache; + #if ENABLE(ASSEMBLER) ExecutableAllocator executableAllocator; #endif |