Updated WebKit to c1252be57a3f673277c732c0902568111b2f4964

QNX build fix.

Change-Id: I72b31faba88a569f62667f7803f6c7434ce6b15e
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>

8 files changed, 32 insertions, 7 deletions

diff --git a/src/3rdparty/webkit/.tag b/src/3rdparty/webkit/.tag
index 9c283fb353..2baf888b98 100644
--- a/src/3rdparty/webkit/.tag
+++ b/src/3rdparty/webkit/.tag
@@ -1 +1 @@
-7b7ded42f42a558bc5672c2523f9c5689bb975d0
+c1252be57a3f673277c732c0902568111b2f4964
diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/heap/MachineStackMarker.cpp b/src/3rdparty/webkit/Source/JavaScriptCore/heap/MachineStackMarker.cpp
index 73a3db6778..01d77d6a60 100644
--- a/src/3rdparty/webkit/Source/JavaScriptCore/heap/MachineStackMarker.cpp
+++ b/src/3rdparty/webkit/Source/JavaScriptCore/heap/MachineStackMarker.cpp
@@ -47,6 +47,10 @@
 #include <windows.h>
 #include <malloc.h>
 
+#elif OS(QNX)
+
+#include <sys/neutrino.h>
+
 #elif OS(HAIKU)
 
 #include <OS.h>
@@ -76,7 +80,7 @@
 #include <errno.h>
 #endif
 
-#if USE(PTHREADS) && !OS(WINDOWS) && !OS(DARWIN)
+#if USE(PTHREADS) && !OS(WINDOWS) && !OS(DARWIN) && !OS(QNX)
 #include <signal.h>
 #ifndef SA_RESTART
 #error MachineThreads requires SA_RESTART
@@ -105,6 +109,8 @@ UNUSED_PARAM(end);
 
 #if OS(DARWIN)
 typedef mach_port_t PlatformThread;
+#elif OS(QNX)
+typedef pthread_t PlatformThread;
 #elif OS(WINDOWS)
 typedef HANDLE PlatformThread;
 #elif USE(PTHREADS)
@@ -127,7 +133,7 @@ public:
         , platformThread(platThread)
         , stackBase(base)
     {
-#if USE(PTHREADS) && !OS(WINDOWS) && !OS(DARWIN)
+#if USE(PTHREADS) && !OS(WINDOWS) && !OS(DARWIN) && !OS(QNX)
         struct sigaction action;
         action.sa_handler = pthreadSignalHandlerSuspendResume;
         sigemptyset(&action.sa_mask);
@@ -283,6 +289,8 @@ static inline void suspendThread(const PlatformThread& platformThread)
 {
 #if OS(DARWIN)
     thread_suspend(platformThread);
+#elif OS(QNX)
+    ThreadCtl(_NTO_TCTL_ONE_THREAD_HOLD, static_cast<void*>(platformThread));
 #elif OS(WINDOWS)
     SuspendThread(platformThread);
 #elif USE(PTHREADS)
@@ -296,6 +304,8 @@ static inline void resumeThread(const PlatformThread& platformThread)
 {
 #if OS(DARWIN)
     thread_resume(platformThread);
+#elif OS(QNX)
+    ThreadCtl(_NTO_TCTL_ONE_THREAD_CONT, static_cast<void*>(platformThread));
 #elif OS(WINDOWS)
     ResumeThread(platformThread);
 #elif USE(PTHREADS)
diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Atomics.h b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Atomics.h
index 1ebd4876ff..bce5fbaaad 100644
--- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Atomics.h
+++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Atomics.h
@@ -67,6 +67,8 @@
 #include <libkern/OSAtomic.h>
 #elif OS(ANDROID)
 #include <cutils/atomic.h>
+#elif OS(QNX)
+#include <atomic.h>
 #elif COMPILER(GCC) && !OS(SYMBIAN)
 #if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2))
 #include <ext/atomicity.h>
@@ -99,6 +101,11 @@ inline int atomicDecrement(int volatile* addend) { return OSAtomicDecrement32Bar
 inline int atomicIncrement(int volatile* addend) { return android_atomic_inc(addend); }
 inline int atomicDecrement(int volatile* addend) { return android_atomic_dec(addend); }
 
+#elif OS(QNX)
+
+inline int atomicIncrement(int volatile* addend) { return (int) atomic_add_value((unsigned int volatile*)addend, 1); }
+inline int atomicDecrement(int volatile* addend) { return (int) atomic_sub_value((unsigned int volatile*)addend, 1); }
+
 #elif COMPILER(GCC) && !CPU(SPARC64) && !OS(SYMBIAN) // sizeof(_Atomic_word) != sizeof(int) on sparc64 gcc
 #define WTF_USE_LOCKFREE_THREADSAFEREFCOUNTED 1
 
diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/MathExtras.h b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/MathExtras.h
index f1b13a5f16..b66c6f594a 100644
--- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/MathExtras.h
+++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/MathExtras.h
@@ -32,6 +32,10 @@
 #include <limits>
 #include <stdlib.h>
 
+#if OS(QNX)
+#include <math.h>
+#endif
+
 #if OS(SOLARIS)
 #include <ieeefp.h>
 #endif
diff --git a/src/3rdparty/webkit/Source/WebCore/WebCore.pri b/src/3rdparty/webkit/Source/WebCore/WebCore.pri
index 00357a1d47..d83eec7a7c 100644
--- a/src/3rdparty/webkit/Source/WebCore/WebCore.pri
+++ b/src/3rdparty/webkit/Source/WebCore/WebCore.pri
@@ -304,8 +304,8 @@ win32-* {
 
 # Remove whole program optimizations due to miscompilations
 win32-msvc2005|win32-msvc2008|win32-msvc2010|wince*:{
-    QMAKE_CFLAGS_RELEASE -= -GL
-    QMAKE_CXXFLAGS_RELEASE -= -GL
+    QMAKE_CFLAGS_LTCG -= -GL
+    QMAKE_CXXFLAGS_LTCG -= -GL
 
     # Disable incremental linking for windows 32bit OS debug build as WebKit is so big
     # that linker failes to link incrementally in debug mode.
diff --git a/src/3rdparty/webkit/Source/WebCore/generated/tokenizer.cpp b/src/3rdparty/webkit/Source/WebCore/generated/tokenizer.cpp
index bfdb60c0be..b24da9982d 100644
--- a/src/3rdparty/webkit/Source/WebCore/generated/tokenizer.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/generated/tokenizer.cpp
@@ -2070,7 +2070,7 @@ YY_RULE_SETUP
 #line 125 "<stdin>"
 ECHO;
 	YY_BREAK
-#line 2611 "<stdout>"
+#line 2625 "<stdout>"
 case YY_END_OF_BUFFER:
 	yy_c_buf_p = yy_cp - 1;
 	yy_cp = yy_c_buf_p;
diff --git a/src/3rdparty/webkit/Source/WebCore/platform/network/MIMESniffing.cpp b/src/3rdparty/webkit/Source/WebCore/platform/network/MIMESniffing.cpp
index f9868c1dfc..7c6e792e6d 100644
--- a/src/3rdparty/webkit/Source/WebCore/platform/network/MIMESniffing.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/platform/network/MIMESniffing.cpp
@@ -20,7 +20,11 @@
 #include "config.h"
 #include "MIMESniffing.h"
 
+#if OS(QNX)
+#include <string.h>
+#else
 #include <cstring>
+#endif
 #include <stdint.h>
 
 // MIME type sniffing implementation based on http://tools.ietf.org/html/draft-abarth-mime-sniff-06
diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION
index 28a89dc135..863eb3eb5e 100644
--- a/src/3rdparty/webkit/VERSION
+++ b/src/3rdparty/webkit/VERSION
@@ -4,4 +4,4 @@ This is a snapshot of the Qt port of WebKit from
 
 and has the sha1 checksum
 
-        7b7ded42f42a558bc5672c2523f9c5689bb975d0
+        c1252be57a3f673277c732c0902568111b2f4964