From 929b4443d53fcf3a7ad1cb9f3af5569e41ef56f1 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 11 Jun 2012 10:55:53 +0200 Subject: Updated WebKit to 2dea2a19feedc165596b933fe9509ddd0caf4d15 Includes version bump and backport of build fix with newer glib versions Change-Id: I42a7c6c835b3d7ae6e79f30f308b350b67dd1e7b Reviewed-by: Zeno Albisser --- src/3rdparty/webkit/.tag | 2 +- src/3rdparty/webkit/ChangeLog | 9 + .../webkit/Source/JavaScriptCore/ChangeLog | 14 ++ .../Source/JavaScriptCore/GNUmakefile.list.am | 1 - .../JavaScriptCore/wtf/ThreadingPrimitives.h | 6 - .../Source/JavaScriptCore/wtf/gobject/GOwnPtr.cpp | 12 - .../Source/JavaScriptCore/wtf/gobject/GOwnPtr.h | 2 - .../Source/JavaScriptCore/wtf/gobject/GTypedefs.h | 2 - .../Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp | 248 --------------------- .../webkit/Source/WebKit/qt/Api/qwebkitglobal.h | 4 +- .../webkit/Source/WebKit/qt/qt_webkit_version.pri | 4 +- src/3rdparty/webkit/VERSION | 2 +- 12 files changed, 29 insertions(+), 277 deletions(-) delete mode 100644 src/3rdparty/webkit/Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp (limited to 'src/3rdparty/webkit') diff --git a/src/3rdparty/webkit/.tag b/src/3rdparty/webkit/.tag index d290c0b68b..093f8d9b01 100644 --- a/src/3rdparty/webkit/.tag +++ b/src/3rdparty/webkit/.tag @@ -1 +1 @@ -a096458b01a9387719308c99e5917a7b42196078 +2dea2a19feedc165596b933fe9509ddd0caf4d15 diff --git a/src/3rdparty/webkit/ChangeLog b/src/3rdparty/webkit/ChangeLog index 82dc1fb457..b19fcfedd3 100644 --- a/src/3rdparty/webkit/ChangeLog +++ b/src/3rdparty/webkit/ChangeLog @@ -1,3 +1,12 @@ +2011-10-12 Gustavo Noronha Silva + + Fix build with GLib 2.31 + https://bugs.webkit.org/show_bug.cgi?id=69840 + + Reviewed by Martin Robinson. + + * configure.ac: add check for pthread rwlock support. + 2011-12-08 Zeno Albisser Disable -Werror for standalone packages. diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/ChangeLog b/src/3rdparty/webkit/Source/JavaScriptCore/ChangeLog index 438d1f5b7f..d7cb100c18 100644 --- a/src/3rdparty/webkit/Source/JavaScriptCore/ChangeLog +++ b/src/3rdparty/webkit/Source/JavaScriptCore/ChangeLog @@ -1,3 +1,17 @@ +2011-10-12 Gustavo Noronha Silva + + Fix build with GLib 2.31 + https://bugs.webkit.org/show_bug.cgi?id=69840 + + Reviewed by Martin Robinson. + + * GNUmakefile.list.am: removed ThreadingGtk.cpp. + * wtf/ThreadingPrimitives.h: remove GTK+-specific definitions. + * wtf/gobject/GOwnPtr.cpp: remove GCond and GMutex specializations. + * wtf/gobject/GOwnPtr.h: ditto. + * wtf/gobject/GTypedefs.h: remove GCond and GMutex forward declarations. + * wtf/gtk/ThreadingGtk.cpp: Removed. + 2012-02-23 Aron Rosenberg Fix the PRI macros used in WTF::String formatters to be compatible with Qt and Visual Studio 2005 and newer. diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/GNUmakefile.list.am b/src/3rdparty/webkit/Source/JavaScriptCore/GNUmakefile.list.am index 16bbf56fae..655986ca00 100644 --- a/src/3rdparty/webkit/Source/JavaScriptCore/GNUmakefile.list.am +++ b/src/3rdparty/webkit/Source/JavaScriptCore/GNUmakefile.list.am @@ -438,7 +438,6 @@ javascriptcore_sources += \ Source/JavaScriptCore/wtf/gobject/GRefPtr.h \ Source/JavaScriptCore/wtf/gobject/GTypedefs.h \ Source/JavaScriptCore/wtf/gtk/MainThreadGtk.cpp \ - Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp \ Source/JavaScriptCore/wtf/HashCountedSet.h \ Source/JavaScriptCore/wtf/HashFunctions.h \ Source/JavaScriptCore/wtf/HashIterators.h \ diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/ThreadingPrimitives.h b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/ThreadingPrimitives.h index 831a99e26f..9f263ae5c9 100644 --- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/ThreadingPrimitives.h +++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/ThreadingPrimitives.h @@ -44,8 +44,6 @@ #if USE(PTHREADS) #include -#elif PLATFORM(GTK) -#include "GOwnPtr.h" #endif #if PLATFORM(QT) @@ -66,10 +64,6 @@ typedef pthread_rwlock_t PlatformReadWriteLock; typedef void* PlatformReadWriteLock; #endif typedef pthread_cond_t PlatformCondition; -#elif PLATFORM(GTK) -typedef GOwnPtr PlatformMutex; -typedef void* PlatformReadWriteLock; // FIXME: Implement. -typedef GOwnPtr PlatformCondition; #elif PLATFORM(QT) typedef QT_PREPEND_NAMESPACE(QMutex)* PlatformMutex; typedef void* PlatformReadWriteLock; // FIXME: Implement. diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.cpp b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.cpp index 7c51ee1bd6..50c7b9ffc1 100644 --- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.cpp +++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.cpp @@ -37,18 +37,6 @@ template <> void freeOwnedGPtr(GList* ptr) g_list_free(ptr); } -template <> void freeOwnedGPtr(GCond* ptr) -{ - if (ptr) - g_cond_free(ptr); -} - -template <> void freeOwnedGPtr(GMutex* ptr) -{ - if (ptr) - g_mutex_free(ptr); -} - template <> void freeOwnedGPtr(GPatternSpec* ptr) { if (ptr) diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.h b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.h index 8c7e8372f7..9ff85c5a4f 100644 --- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.h +++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.h @@ -35,8 +35,6 @@ namespace WTF { template inline void freeOwnedGPtr(T* ptr); template<> void freeOwnedGPtr(GError*); template<> void freeOwnedGPtr(GList*); -template<> void freeOwnedGPtr(GCond*); -template<> void freeOwnedGPtr(GMutex*); template<> void freeOwnedGPtr(GPatternSpec*); template<> void freeOwnedGPtr(GDir*); diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h index c7f7ac4a51..136bde55af 100644 --- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h +++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h @@ -39,7 +39,6 @@ typedef void* gpointer; typedef struct _GAsyncResult GAsyncResult; typedef struct _GCancellable GCancellable; typedef struct _GCharsetConverter GCharsetConverter; -typedef struct _GCond GCond; typedef struct _GDir GDir; typedef struct _GdkAtom* GdkAtom; typedef struct _GdkCursor GdkCursor; @@ -52,7 +51,6 @@ typedef struct _GFile GFile; typedef struct _GHashTable GHashTable; typedef struct _GInputStream GInputStream; typedef struct _GList GList; -typedef struct _GMutex GMutex; typedef struct _GPatternSpec GPatternSpec; typedef struct _GPollableOutputStream GPollableOutputStream; typedef struct _GSocketClient GSocketClient; diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp deleted file mode 100644 index 863ee81d7c..0000000000 --- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp +++ /dev/null @@ -1,248 +0,0 @@ -/* - * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. - * Copyright (C) 2007 Justin Haygood (jhaygood@reaktix.com) - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Apple Inc. ("Apple") nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include "config.h" -#include "Threading.h" - -#if !USE(PTHREADS) - -#include "CurrentTime.h" -#include "HashMap.h" -#include "MainThread.h" -#include "RandomNumberSeed.h" -#include - -#include -#include - -namespace WTF { - -typedef HashMap ThreadMap; - -static Mutex* atomicallyInitializedStaticMutex; - -static Mutex& threadMapMutex() -{ - DEFINE_STATIC_LOCAL(Mutex, mutex, ()); - return mutex; -} - -void initializeThreading() -{ - if (!g_thread_supported()) - g_thread_init(NULL); - ASSERT(g_thread_supported()); - - if (!atomicallyInitializedStaticMutex) { - atomicallyInitializedStaticMutex = new Mutex; - threadMapMutex(); - initializeRandomNumberGenerator(); - } -} - -void lockAtomicallyInitializedStaticMutex() -{ - ASSERT(atomicallyInitializedStaticMutex); - atomicallyInitializedStaticMutex->lock(); -} - -void unlockAtomicallyInitializedStaticMutex() -{ - atomicallyInitializedStaticMutex->unlock(); -} - -static ThreadMap& threadMap() -{ - DEFINE_STATIC_LOCAL(ThreadMap, map, ()); - return map; -} - -static ThreadIdentifier identifierByGthreadHandle(GThread*& thread) -{ - MutexLocker locker(threadMapMutex()); - - ThreadMap::iterator i = threadMap().begin(); - for (; i != threadMap().end(); ++i) { - if (i->second == thread) - return i->first; - } - - return 0; -} - -static ThreadIdentifier establishIdentifierForThread(GThread*& thread) -{ - ASSERT(!identifierByGthreadHandle(thread)); - - MutexLocker locker(threadMapMutex()); - - static ThreadIdentifier identifierCount = 1; - - threadMap().add(identifierCount, thread); - - return identifierCount++; -} - -static GThread* threadForIdentifier(ThreadIdentifier id) -{ - MutexLocker locker(threadMapMutex()); - - return threadMap().get(id); -} - -static void clearThreadForIdentifier(ThreadIdentifier id) -{ - MutexLocker locker(threadMapMutex()); - - ASSERT(threadMap().contains(id)); - - threadMap().remove(id); -} - -ThreadIdentifier createThreadInternal(ThreadFunction entryPoint, void* data, const char*) -{ - GThread* thread; - if (!(thread = g_thread_create(entryPoint, data, TRUE, 0))) { - LOG_ERROR("Failed to create thread at entry point %p with data %p", entryPoint, data); - return 0; - } - - ThreadIdentifier threadID = establishIdentifierForThread(thread); - return threadID; -} - -void initializeCurrentThreadInternal(const char*) -{ -} - -int waitForThreadCompletion(ThreadIdentifier threadID, void** result) -{ - ASSERT(threadID); - - GThread* thread = threadForIdentifier(threadID); - - void* joinResult = g_thread_join(thread); - if (result) - *result = joinResult; - - clearThreadForIdentifier(threadID); - return 0; -} - -void detachThread(ThreadIdentifier) -{ -} - -ThreadIdentifier currentThread() -{ - GThread* currentThread = g_thread_self(); - if (ThreadIdentifier id = identifierByGthreadHandle(currentThread)) - return id; - return establishIdentifierForThread(currentThread); -} - -void yield() -{ - g_thread_yield(); -} - -Mutex::Mutex() - : m_mutex(g_mutex_new()) -{ -} - -Mutex::~Mutex() -{ -} - -void Mutex::lock() -{ - g_mutex_lock(m_mutex.get()); -} - -bool Mutex::tryLock() -{ - return g_mutex_trylock(m_mutex.get()); -} - -void Mutex::unlock() -{ - g_mutex_unlock(m_mutex.get()); -} - -ThreadCondition::ThreadCondition() - : m_condition(g_cond_new()) -{ -} - -ThreadCondition::~ThreadCondition() -{ -} - -void ThreadCondition::wait(Mutex& mutex) -{ - g_cond_wait(m_condition.get(), mutex.impl().get()); -} - -bool ThreadCondition::timedWait(Mutex& mutex, double absoluteTime) -{ - // Time is in the past - return right away. - if (absoluteTime < currentTime()) - return false; - - // Time is too far in the future for g_cond_timed_wait - wait forever. - if (absoluteTime > INT_MAX) { - wait(mutex); - return true; - } - - int timeSeconds = static_cast(absoluteTime); - int timeMicroseconds = static_cast((absoluteTime - timeSeconds) * 1000000.0); - - GTimeVal targetTime; - targetTime.tv_sec = timeSeconds; - targetTime.tv_usec = timeMicroseconds; - - return g_cond_timed_wait(m_condition.get(), mutex.impl().get(), &targetTime); -} - -void ThreadCondition::signal() -{ - g_cond_signal(m_condition.get()); -} - -void ThreadCondition::broadcast() -{ - g_cond_broadcast(m_condition.get()); -} - - -} - -#endif // !USE(PTHREADS) diff --git a/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebkitglobal.h b/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebkitglobal.h index b82d0c6e9b..8cf2a2b27a 100644 --- a/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebkitglobal.h +++ b/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebkitglobal.h @@ -22,9 +22,9 @@ #include -#define QTWEBKIT_VERSION_STR "2.2.2" +#define QTWEBKIT_VERSION_STR "2.2.3" // QTWEBKIT_VERSION is (major << 16) + (minor << 8) + patch. Similar to Qt. -#define QTWEBKIT_VERSION 0x020202 +#define QTWEBKIT_VERSION 0x020203 // Use: #if (QTWEBKIT_VERSION >= QTWEBKIT_VERSION_CHECK(2, 0, 0)). Similar to Qt. #define QTWEBKIT_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch)) diff --git a/src/3rdparty/webkit/Source/WebKit/qt/qt_webkit_version.pri b/src/3rdparty/webkit/Source/WebKit/qt/qt_webkit_version.pri index 681c7fc0d7..1c81ff6c27 100644 --- a/src/3rdparty/webkit/Source/WebKit/qt/qt_webkit_version.pri +++ b/src/3rdparty/webkit/Source/WebKit/qt/qt_webkit_version.pri @@ -1,7 +1,7 @@ -QT_WEBKIT_VERSION = 4.9.2 +QT_WEBKIT_VERSION = 4.9.3 QT_WEBKIT_MAJOR_VERSION = 4 QT_WEBKIT_MINOR_VERSION = 9 -QT_WEBKIT_PATCH_VERSION = 2 +QT_WEBKIT_PATCH_VERSION = 3 QT.webkit.name = QtWebKit QT.webkit.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtWebKit diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION index d8a9930275..36e4495f34 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 - a096458b01a9387719308c99e5917a7b42196078 + 2dea2a19feedc165596b933fe9509ddd0caf4d15 -- cgit v1.2.3