From 2f1eac5f35466ee257eb5d4a61aa3a837d53b82a Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 3 Dec 2012 21:45:04 +0100 Subject: remove symbian vestiges Change-Id: Id4cf97c6ca3b9d4335daf4f32842fb07f51c557e Reviewed-by: Joerg Bornemann --- .../javascriptcore/JavaScriptCore/JavaScriptCore.pri | 6 ------ src/3rdparty/javascriptcore/WebKit.pri | 14 +++----------- 2 files changed, 3 insertions(+), 17 deletions(-) (limited to 'src/3rdparty/javascriptcore') diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri index 7a3dcd2..0671e87 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri +++ b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri @@ -13,12 +13,6 @@ CONFIG(debug, debug|release) { OBJECTS_DIR = obj/release } -symbian: { - # Need to guarantee this comes before system includes of /epoc32/include - MMP_RULES += "USERINCLUDE ../JavaScriptCore/profiler" - LIBS += -lhal -} - INCLUDEPATH = \ $$PWD \ $$PWD/.. \ diff --git a/src/3rdparty/javascriptcore/WebKit.pri b/src/3rdparty/javascriptcore/WebKit.pri index 9aaaa99..7eb83a8 100644 --- a/src/3rdparty/javascriptcore/WebKit.pri +++ b/src/3rdparty/javascriptcore/WebKit.pri @@ -40,10 +40,6 @@ building-libs { else: LIBS += $${QTWEBKITLIBNAME}.lib } else { LIBS += -lQtWebKit - symbian { - TARGET.EPOCSTACKSIZE = 0x14000 // 80 kB - TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 // Min 128kB, Max 32MB - } } } } @@ -51,7 +47,7 @@ building-libs { } greaterThan(QT_MINOR_VERSION, 5):DEFINES += WTF_USE_ACCELERATED_COMPOSITING -!mac:!unix|symbian { +!mac:!unix { DEFINES += USE_SYSTEM_MALLOC } @@ -66,7 +62,7 @@ CONFIG -= warn_on *-g++*:QMAKE_CXXFLAGS += -Wall -Wreturn-type -fno-strict-aliasing -Wcast-align -Wchar-subscripts -Wformat-security -Wreturn-type -Wno-unused-parameter -Wno-sign-compare -Wno-switch -Wno-switch-enum -Wundef -Wmissing-noreturn -Winit-self # Enable GNU compiler extensions to the ARM compiler for all Qt ports using RVCT -symbian|*-armcc { +*-armcc { RVCT_COMMON_CFLAGS = --gnu --diag_suppress 68,111,177,368,830,1293 RVCT_COMMON_CXXFLAGS = $$RVCT_COMMON_CFLAGS --no_parse_templates } @@ -76,11 +72,7 @@ symbian|*-armcc { QMAKE_CXXFLAGS += $$RVCT_COMMON_CXXFLAGS } -symbian { - QMAKE_CXXFLAGS.ARMCC += $$RVCT_COMMON_CXXFLAGS -} - -symbian|maemo5: DEFINES *= QT_NO_UITOOLS +maemo5: DEFINES *= QT_NO_UITOOLS contains(DEFINES, QT_NO_UITOOLS): CONFIG -= uitools -- cgit v1.2.1 From fbbefd2882f062330ffb0dd926b83204116a0d71 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Tue, 4 Dec 2012 21:07:56 +0100 Subject: Change copyrights from Nokia to Digia Change-Id: I70a3156710a37b02417c7d6c7c6c1ee222da0281 Reviewed-by: Lars Knoll --- .../javascriptcore/JavaScriptCore/jit/ExecutableAllocatorSymbian.cpp | 2 +- src/3rdparty/javascriptcore/JavaScriptCore/runtime/MarkStackSymbian.cpp | 2 +- src/3rdparty/javascriptcore/JavaScriptCore/wtf/qt/MainThreadQt.cpp | 2 +- .../javascriptcore/JavaScriptCore/wtf/symbian/BlockAllocatorSymbian.cpp | 2 +- .../javascriptcore/JavaScriptCore/wtf/symbian/BlockAllocatorSymbian.h | 2 +- .../JavaScriptCore/wtf/symbian/RegisterFileAllocatorSymbian.cpp | 2 +- .../JavaScriptCore/wtf/symbian/RegisterFileAllocatorSymbian.h | 2 +- src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/SymbianDefines.h | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/3rdparty/javascriptcore') diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorSymbian.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorSymbian.cpp index 9028f50..0ad6a49 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorSymbian.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorSymbian.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies) + * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/MarkStackSymbian.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/MarkStackSymbian.cpp index bda14ac..54b4a91 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/MarkStackSymbian.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/MarkStackSymbian.cpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies) + Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/qt/MainThreadQt.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/qt/MainThreadQt.cpp index 0ac2717..ea48fc4 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/qt/MainThreadQt.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/qt/MainThreadQt.cpp @@ -1,6 +1,6 @@ /* * Copyright (C) 2007 Staikos Computing Services Inc. - * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) + * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies) * Copyright (C) 2008 Apple Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/BlockAllocatorSymbian.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/BlockAllocatorSymbian.cpp index 6a28e9e..da16892 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/BlockAllocatorSymbian.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/BlockAllocatorSymbian.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) + * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies) * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/BlockAllocatorSymbian.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/BlockAllocatorSymbian.h index 21422f6..c25a4df 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/BlockAllocatorSymbian.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/BlockAllocatorSymbian.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) + * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies) * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/RegisterFileAllocatorSymbian.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/RegisterFileAllocatorSymbian.cpp index ca13399..afe6fb5 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/RegisterFileAllocatorSymbian.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/RegisterFileAllocatorSymbian.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies) + * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies) * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/RegisterFileAllocatorSymbian.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/RegisterFileAllocatorSymbian.h index 69d78c1..5143075 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/RegisterFileAllocatorSymbian.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/RegisterFileAllocatorSymbian.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies) + * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies) * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/SymbianDefines.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/SymbianDefines.h index 99db5d7..afa65e4 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/SymbianDefines.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/SymbianDefines.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies) + * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies) * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions -- cgit v1.2.1 From 6eff4c3b26d92b51ed15e1341c3e57a5fbe47c04 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 3 Dec 2012 21:46:55 +0100 Subject: purge ce-compat references adapted from WebKit changes 125004 & 125018. Change-Id: Id051375924ece634acf2c0564a39c2d4b1cebe3c Reviewed-by: Joerg Bornemann Reviewed-by: Simon Hausmann --- src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog | 14 ++++++++++++++ .../javascriptcore/JavaScriptCore/JavaScriptCore.pri | 2 -- .../JavaScriptCore/runtime/DateConversion.cpp | 14 ++++++++++++++ 3 files changed, 28 insertions(+), 2 deletions(-) (limited to 'src/3rdparty/javascriptcore') diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog b/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog index 5ab23e6..00d3499 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog +++ b/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog @@ -1,3 +1,17 @@ +2012-08-08 Patrick Gansterer + + [WIN] Use GetTimeZoneInformation() for getting the timezone name + https://bugs.webkit.org/show_bug.cgi?id=91936 + + Reviewed by Ryosuke Niwa. + + The MS CRT implementation of strftime calls the same functions in the background. + Using them directly avoids the overhead of parsing the format string and removes + the dependency on strftime() for WinCE where this function does not exist. + + * runtime/DateConversion.cpp: + (JSC::formatTime): + 2010-07-08 Gavin Barraclough Reviewed by Sam Weinig. diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri index 0671e87..29dea36 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri +++ b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri @@ -63,8 +63,6 @@ contains(JAVASCRIPTCORE_JIT,no) { } wince* { - INCLUDEPATH += $$QT.core.sources/../3rdparty/ce-compat - SOURCES += $$QT.core.sources/../3rdparty/ce-compat/ce_time.c DEFINES += WINCEBASIC } diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/DateConversion.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/DateConversion.cpp index f129407..2ca70ff 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/DateConversion.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/DateConversion.cpp @@ -48,6 +48,10 @@ #include #include +#if OS(WINDOWS) +#include +#endif + using namespace WTF; namespace JSC { @@ -79,12 +83,22 @@ void formatDateUTCVariant(const GregorianDateTime &t, DateConversionBuffer& buff void formatTime(const GregorianDateTime &t, DateConversionBuffer& buffer) { int offset = abs(gmtoffset(t)); +#if OS(WINDOWS) + TIME_ZONE_INFORMATION timeZoneInformation; + GetTimeZoneInformation(&timeZoneInformation); + const WCHAR* timeZoneName = t.isDST ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName; +#else char timeZoneName[70]; struct tm gtm = t; strftime(timeZoneName, sizeof(timeZoneName), "%Z", >m); +#endif if (timeZoneName[0]) { +#if OS(WINDOWS) + snprintf(buffer, DateConversionBufferSize, "%02d:%02d:%02d GMT%c%02d%02d (%S)", +#else snprintf(buffer, DateConversionBufferSize, "%02d:%02d:%02d GMT%c%02d%02d (%s)", +#endif t.hour, t.minute, t.second, gmtoffset(t) < 0 ? '-' : '+', offset / (60*60), (offset / 60) % 60, timeZoneName); } else { -- cgit v1.2.1 From 8ad12818bbf19c84abbb27afb95be3452cc328c1 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 14 Dec 2012 19:38:53 +0100 Subject: remove unnecessary CONFIG addition depend_includepath is already added by default_pre.prf. Change-Id: I92aa1f2d1408e4d7cdbfa8c3b24aaaba6c8b4810 Reviewed-by: Joerg Bornemann --- src/3rdparty/javascriptcore/WebKit.pri | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/3rdparty/javascriptcore') diff --git a/src/3rdparty/javascriptcore/WebKit.pri b/src/3rdparty/javascriptcore/WebKit.pri index 7eb83a8..c8d2249 100644 --- a/src/3rdparty/javascriptcore/WebKit.pri +++ b/src/3rdparty/javascriptcore/WebKit.pri @@ -10,8 +10,6 @@ CONFIG(standalone_package) { OUTPUT_DIR=$$PWD } -CONFIG += depend_includepath - isEmpty(OUTPUT_DIR) { CONFIG(debug, debug|release) { OUTPUT_DIR=$$PWD/WebKitBuild/Debug -- cgit v1.2.1 From e038d23304cb583a56baa3fde05dba519735d2ae Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 14 Dec 2012 20:03:27 +0100 Subject: remove obsolete DEPENDPATH assignments qmake now add CONFIG+=depend_includepath by default, making manual DEPENDPATH setup unnecessary. Change-Id: I0804385b636d6f5b3b0136cc472a1f9ecb7b7871 Reviewed-by: Joerg Bornemann --- src/3rdparty/javascriptcore/JavaScriptCore/pcre/pcre.pri | 1 - src/3rdparty/javascriptcore/WebKit.pri | 1 - 2 files changed, 2 deletions(-) (limited to 'src/3rdparty/javascriptcore') diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/pcre/pcre.pri b/src/3rdparty/javascriptcore/JavaScriptCore/pcre/pcre.pri index 4f59e17..ca5e58f 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/pcre/pcre.pri +++ b/src/3rdparty/javascriptcore/JavaScriptCore/pcre/pcre.pri @@ -1,7 +1,6 @@ # Perl Compatible Regular Expressions - Qt4 build info VPATH += $$PWD INCLUDEPATH += $$PWD $$OUTPUT_DIR/JavaScriptCore/tmp -DEPENDPATH += $$PWD SOURCES += \ pcre_compile.cpp \ diff --git a/src/3rdparty/javascriptcore/WebKit.pri b/src/3rdparty/javascriptcore/WebKit.pri index c8d2249..d3f22fd 100644 --- a/src/3rdparty/javascriptcore/WebKit.pri +++ b/src/3rdparty/javascriptcore/WebKit.pri @@ -41,7 +41,6 @@ building-libs { } } } - DEPENDPATH += $$PWD/WebKit/qt/Api } greaterThan(QT_MINOR_VERSION, 5):DEFINES += WTF_USE_ACCELERATED_COMPOSITING -- cgit v1.2.1 From 2b77c30e246a7452a68999b47b9eaf10f6cafd2f Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Wed, 9 Jan 2013 19:28:56 +1100 Subject: Fix Math.pow implementation with MinGW-w64 Adapted from WebKit changes 137895, 138705, 138894 and 138903. Change-Id: I166f8837e898d17d71ce4e4cab8ab45ea49de39c Reviewed-by: Simon Hausmann --- .../javascriptcore/JavaScriptCore/wtf/MathExtras.h | 30 +++++++++++++++++----- 1 file changed, 23 insertions(+), 7 deletions(-) (limited to 'src/3rdparty/javascriptcore') diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h index a18949e..fc5676a 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h @@ -27,6 +27,7 @@ #define WTF_MathExtras_h #include +#include #include #include @@ -39,13 +40,6 @@ #include #endif -#if COMPILER(MSVC) -#if OS(WINCE) -#include -#endif -#include -#endif - #ifndef M_PI const double piDouble = 3.14159265358979323846; const float piFloat = 3.14159265358979323846f; @@ -186,4 +180,26 @@ inline float deg2turn(float d) { return d / 360.0f; } inline float rad2grad(float r) { return r * 200.0f / piFloat; } inline float grad2rad(float g) { return g * piFloat / 200.0f; } +#if COMPILER(MINGW64) && (!defined(__MINGW64_VERSION_RC) || __MINGW64_VERSION_RC < 1) +inline double wtf_pow(double x, double y) +{ + // MinGW-w64 has a custom implementation for pow. + // This handles certain special cases that are different. + if ((x == 0.0 || isinf(x)) && isfinite(y)) { + double f; + if (modf(y, &f) != 0.0) + return ((x == 0.0) ^ (y > 0.0)) ? std::numeric_limits::infinity() : 0.0; + } + + if (x == 2.0) { + int yInt = static_cast(y); + if (y == yInt) + return ldexp(1.0, yInt); + } + + return pow(x, y); +} +#define pow(x, y) wtf_pow(x, y) +#endif // COMPILER(MINGW64) && (!defined(__MINGW64_VERSION_RC) || __MINGW64_VERSION_RC < 1) + #endif // #ifndef WTF_MathExtras_h -- cgit v1.2.1 From 3f960df4c25b7e4e7d6aeaeecc62a083f8491b48 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Wed, 2 Jan 2013 12:57:45 +0100 Subject: Update copyright year in Digia's license headers Change-Id: Ic4a2739c8caf2eac95e4a72d8d38cfb912d5fe2b Reviewed-by: Akseli Salovaara Reviewed-by: Sergio Ahumada --- .../javascriptcore/JavaScriptCore/jit/ExecutableAllocatorSymbian.cpp | 2 +- src/3rdparty/javascriptcore/JavaScriptCore/runtime/MarkStackSymbian.cpp | 2 +- src/3rdparty/javascriptcore/JavaScriptCore/wtf/qt/MainThreadQt.cpp | 2 +- .../javascriptcore/JavaScriptCore/wtf/symbian/BlockAllocatorSymbian.cpp | 2 +- .../javascriptcore/JavaScriptCore/wtf/symbian/BlockAllocatorSymbian.h | 2 +- .../JavaScriptCore/wtf/symbian/RegisterFileAllocatorSymbian.cpp | 2 +- .../JavaScriptCore/wtf/symbian/RegisterFileAllocatorSymbian.h | 2 +- src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/SymbianDefines.h | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/3rdparty/javascriptcore') diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorSymbian.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorSymbian.cpp index 0ad6a49..3124d35 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorSymbian.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorSymbian.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies) + * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/MarkStackSymbian.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/MarkStackSymbian.cpp index 54b4a91..1a69733 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/MarkStackSymbian.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/MarkStackSymbian.cpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies) + Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/qt/MainThreadQt.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/qt/MainThreadQt.cpp index ea48fc4..ae3f2ba 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/qt/MainThreadQt.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/qt/MainThreadQt.cpp @@ -1,6 +1,6 @@ /* * Copyright (C) 2007 Staikos Computing Services Inc. - * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies) + * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) * Copyright (C) 2008 Apple Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/BlockAllocatorSymbian.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/BlockAllocatorSymbian.cpp index da16892..3489ba0 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/BlockAllocatorSymbian.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/BlockAllocatorSymbian.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies) + * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/BlockAllocatorSymbian.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/BlockAllocatorSymbian.h index c25a4df..5f5555a 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/BlockAllocatorSymbian.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/BlockAllocatorSymbian.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies) + * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/RegisterFileAllocatorSymbian.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/RegisterFileAllocatorSymbian.cpp index afe6fb5..1e21fc3 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/RegisterFileAllocatorSymbian.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/RegisterFileAllocatorSymbian.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies) + * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/RegisterFileAllocatorSymbian.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/RegisterFileAllocatorSymbian.h index 5143075..bd6b75b 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/RegisterFileAllocatorSymbian.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/RegisterFileAllocatorSymbian.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies) + * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/SymbianDefines.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/SymbianDefines.h index afa65e4..fbf4dcf 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/SymbianDefines.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/SymbianDefines.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies) + * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions -- cgit v1.2.1 From f32c98f4876fd6f4d28d710d6ee1d59707b2ac62 Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Fri, 11 Jan 2013 09:06:26 +0100 Subject: Add a means to specify that the VM_POOL_SIZE can be 1gb and not 2gb MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Due to a reported problem where the reserving of 2gb was too big under certain circumstances then in order to provide a means for people who hit this problem a define is added so that the VM_POOL_SIZE is set to be 1gb instead. This is an optional define and the default is for the size to be 2gb which keeps it to current behavior. Change-Id: I73200e1bcfcf7b37c6ba62f8b7bcf217f239dfcb Reviewed-by: Jędrzej Nowacki --- .../JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/3rdparty/javascriptcore') diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp index e1237e4..5233923 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp @@ -39,7 +39,11 @@ #if CPU(X86_64) // These limits suitable on 64-bit platforms (particularly x86-64, where we require all jumps to have a 2Gb max range). +#ifdef QT_USE_ONEGB_VMALLOCATOR + #define VM_POOL_SIZE (1024u * 1024u * 1024u) // 1Gb +#else #define VM_POOL_SIZE (2u * 1024u * 1024u * 1024u) // 2Gb +#endif #define COALESCE_LIMIT (16u * 1024u * 1024u) // 16Mb #else // These limits are hopefully sensible on embedded platforms. -- cgit v1.2.1 From 19550797aa16ee60fc19fdaf90832b4895612226 Mon Sep 17 00:00:00 2001 From: Sze Howe Koh Date: Fri, 25 Jan 2013 20:40:36 +0800 Subject: Doc: Fix module name format Follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation QtScript -> Qt Script QtScriptTools -> Qt Script Tools Change-Id: Icf6b2ea3829247475f8902334b615f9a9206cc51 Reviewed-by: Jerome Pasion --- .../javascriptcore/JavaScriptCore/interpreter/Interpreter.cpp | 4 ++-- src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp | 2 +- src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSImmediate.h | 2 +- src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSObject.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/3rdparty/javascriptcore') diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/interpreter/Interpreter.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/interpreter/Interpreter.cpp index 9269fdd..4300a57 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/interpreter/Interpreter.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/interpreter/Interpreter.cpp @@ -852,7 +852,7 @@ JSValue Interpreter::execute(EvalExecutable* eval, CallFrame* callFrame, JSObjec } Register* oldEnd = m_registerFile.end(); -#ifdef QT_BUILD_SCRIPT_LIB //with QtScript, we do not necesserly start from scratch +#ifdef QT_BUILD_SCRIPT_LIB //with Qt Script, we do not necesserly start from scratch Register* newEnd = oldEnd + globalRegisterOffset + codeBlock->m_numCalleeRegisters; #else Register* newEnd = m_registerFile.start() + globalRegisterOffset + codeBlock->m_numCalleeRegisters; @@ -862,7 +862,7 @@ JSValue Interpreter::execute(EvalExecutable* eval, CallFrame* callFrame, JSObjec return jsNull(); } -#ifdef QT_BUILD_SCRIPT_LIB //with QtScript, we do not necesserly start from scratch +#ifdef QT_BUILD_SCRIPT_LIB //with Qt Script, we do not necesserly start from scratch CallFrame* newCallFrame = CallFrame::create(oldEnd + globalRegisterOffset); #else CallFrame* newCallFrame = CallFrame::create(m_registerFile.start() + globalRegisterOffset); diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp index d8027ff..1abdf8b 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp @@ -1170,7 +1170,7 @@ DEFINE_STUB_FUNCTION(int, timeout_check) } #ifdef QT_BUILD_SCRIPT_LIB else { - // It's possible that the call to QtScript's implementation of + // It's possible that the call to Qt Script's implementation of // TimeoutChecker::didTimeOut() caused an error to be thrown. // In that case, didTimeOut() should still return false, since // we don't want the interrupted-exception to override the diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSImmediate.h b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSImmediate.h index 053b4c0..06548ce 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSImmediate.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSImmediate.h @@ -135,7 +135,7 @@ namespace JSC { class JSImmediate { #ifdef QT_BUILD_SCRIPT_LIB - public: // QtScript needs isImmediate() and from() functions + public: // Qt Script needs isImmediate() and from() functions #else private: #endif diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSObject.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSObject.cpp index 8706b8d..869267b 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSObject.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSObject.cpp @@ -533,7 +533,7 @@ NEVER_INLINE void JSObject::fillGetterPropertySlot(PropertySlot& slot, JSValue* Structure* JSObject::createInheritorID() { #ifdef QT_BUILD_SCRIPT_LIB - // ### QtScript needs the hasOwnProperty() calls etc. for QScriptObject + // ### Qt Script needs the hasOwnProperty() calls etc. for QScriptObject m_inheritorID = Structure::create(this, TypeInfo(ObjectType, ImplementsHasInstance | JSC::OverridesHasInstance | JSC::OverridesGetOwnPropertySlot | JSC::OverridesMarkChildren | JSC::OverridesGetPropertyNames)); #else m_inheritorID = JSObject::createStructure(this); -- cgit v1.2.1 From fbe7ad18c35aa662693836a65af1e5b67522e1bf Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 5 Feb 2013 15:28:30 +0100 Subject: Fix compile error caused by min/max defines. qtbase d0804ff2dd3d289a0f0c58aa30c4334e66ea9be0 introduces a check for min/max which causes a compile error. Change-Id: I6a79e75423baa3f577eb26697e2766e58040b7d9 Reviewed-by: Jocelyn Turcotte --- src/3rdparty/javascriptcore/JavaScriptCore/config.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/3rdparty/javascriptcore') diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/config.h b/src/3rdparty/javascriptcore/JavaScriptCore/config.h index 2af2e71..6be10fc 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/config.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/config.h @@ -39,10 +39,10 @@ #if OS(WINDOWS) -// If we don't define these, they get defined in windef.h. -// We want to use std::min and std::max -#define max max -#define min min +// windef.h defines min and max unless NOMINMAX is defined. +#ifndef NOMINMAX +# define NOMINMAX +#endif #if !COMPILER(MSVC7) && !OS(WINCE) // We need to define this before the first #include of stdlib.h or it won't contain rand_s. -- cgit v1.2.1