[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.16-3-1415-g3bdb156
Gustavo Noronha Silva
gustavo.noronha at collabora.co.uk
Thu Dec 3 14:02:53 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 1a7d87c005694afe32853c1fa18f7a7d3725b59a
Merge: 402fc21c429f91b161967ea145a4e05bd5993791 5afdf4d4e1686c4d49c04e9f25f4445960e525b3
Author: Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
Date: Wed Dec 2 21:57:16 2009 -0200
Merge branch 'webkit-1.1' into debian/unstable
Conflicts:
JavaScriptCore/wtf/Platform.h
WebCore/platform/text/StringHash.h
WebKit/gtk/webkit/webkitwebinspector.cpp
WebKit/gtk/webkit/webkitwebinspector.h
diff --combined JavaScriptCore/wtf/ListHashSet.h
index 0cc2dd4,54ed36b..28a3ff6
--- a/JavaScriptCore/wtf/ListHashSet.h
+++ b/JavaScriptCore/wtf/ListHashSet.h
@@@ -51,7 -51,7 +51,7 @@@ namespace WTF
template<typename ValueArg> struct ListHashSetNodeAllocator;
template<typename ValueArg, typename HashArg> struct ListHashSetNodeHashFunctions;
- template<typename ValueArg, typename HashArg = typename DefaultHash<ValueArg>::Hash> class ListHashSet {
+ template<typename ValueArg, typename HashArg = typename DefaultHash<ValueArg>::Hash> class ListHashSet : public FastAllocBase {
private:
typedef ListHashSetNode<ValueArg> Node;
typedef ListHashSetNodeAllocator<ValueArg> NodeAllocator;
@@@ -127,7 -127,7 +127,7 @@@
: m_freeList(pool())
, m_isDoneWithInitialFreeList(false)
{
- memset(m_pool.pool, 0, sizeof(m_pool.pool));
+ memset(m_pool, 0, sizeof(m_pool));
}
Node* allocate()
@@@ -171,7 -171,7 +171,7 @@@
}
private:
- Node* pool() { return reinterpret_cast<Node*>(m_pool.pool); }
+ Node* pool() { return reinterpret_cast<Node*>(m_pool); }
Node* pastPool() { return pool() + m_poolSize; }
bool inPool(Node* node)
@@@ -182,7 -182,10 +182,7 @@@
Node* m_freeList;
bool m_isDoneWithInitialFreeList;
static const size_t m_poolSize = 256;
- union {
- char pool[sizeof(Node) * m_poolSize];
- double forAlignment;
- } m_pool;
+ uint32_t m_pool[(sizeof(Node) * m_poolSize + sizeof(uint32_t) - 1) / sizeof(uint32_t)];
};
template<typename ValueArg> struct ListHashSetNode {
diff --combined JavaScriptCore/wtf/Platform.h
index e5298cc,34c3532..27bff2f
--- a/JavaScriptCore/wtf/Platform.h
+++ b/JavaScriptCore/wtf/Platform.h
@@@ -47,6 -47,11 +47,11 @@@
#elif !defined(MAC_OS_X_VERSION_10_6) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6
#define BUILDING_ON_LEOPARD 1
#endif
+ #if !defined(MAC_OS_X_VERSION_10_5) || MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
+ #define TARGETING_TIGER 1
+ #elif !defined(MAC_OS_X_VERSION_10_6) || MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_6
+ #define TARGETING_LEOPARD 1
+ #endif
#include <TargetConditionals.h>
#endif
@@@ -127,7 -132,8 +132,8 @@@
|| defined(__unix__) \
|| defined(_AIX) \
|| defined(__HAIKU__) \
- || defined(__QNXNTO__)
+ || defined(__QNXNTO__) \
+ || defined(ANDROID)
#define WTF_PLATFORM_UNIX 1
#endif
@@@ -177,6 -183,11 +183,11 @@@
#define WTF_PLATFORM_IPHONE 0
#endif
+ /* PLATFORM(ANDROID) */
+ #if defined(ANDROID)
+ #define WTF_PLATFORM_ANDROID 1
+ #endif
+
/* Graphics engines */
/* PLATFORM(CG) and PLATFORM(CI) */
@@@ -200,7 -211,7 +211,7 @@@
/* Makes PLATFORM(WIN) default to PLATFORM(CAIRO) */
/* FIXME: This should be changed from a blacklist to a whitelist */
- #if !PLATFORM(MAC) && !PLATFORM(QT) && !PLATFORM(WX) && !PLATFORM(CHROMIUM) && !PLATFORM(WINCE) && !PLATFORM(HAIKU)
+ #if !PLATFORM(MAC) && !PLATFORM(QT) && !PLATFORM(WX) && !PLATFORM(CHROMIUM) && !PLATFORM(WINCE) && !PLATFORM(HAIKU) && !PLATFORM(ANDROID)
#define WTF_PLATFORM_CAIRO 1
#endif
@@@ -218,6 -229,16 +229,16 @@@
#define WTF_PLATFORM_BIG_ENDIAN 1
#endif
+ /* PLATFORM(SPARC32) */
+ #if defined(__sparc) && !defined(__arch64__) || defined(__sparcv8)
+ #define WTF_PLATFORM_SPARC32 1
+ #define WTF_PLATFORM_BIG_ENDIAN 1
+ #endif
+
+ #if PLATFORM(SPARC32) || PLATFORM(SPARC64)
+ #define WTF_PLATFORM_SPARC
+ #endif
+
/* PLATFORM(PPC64) */
#if defined(__ppc64__) \
|| defined(__PPC64__)
@@@ -237,7 -258,8 +258,8 @@@
#elif !defined(__ARM_EABI__) \
&& !defined(__EABI__) \
- && !defined(__VFP_FP__)
+ && !defined(__VFP_FP__) \
+ && !defined(ANDROID)
#define WTF_PLATFORM_MIDDLE_ENDIAN 1
#endif
@@@ -347,23 -369,6 +369,23 @@@
#define WTF_PLATFORM_X86_64 1
#endif
+/* PLATFORM(IA64) */
+#if defined(__ia64__)
+#define WTF_PLATFORM_IA64 1
+#endif
+
+/* PLATFORM(ALPHA) */
+#if defined(__alpha__)
+#define WTF_PLATFORM_ALPHA 1
+#endif
+
+/* PLATFORM(SPARC) */
+#if defined(__sparc__) \
+ || defined(__sparc)
+#define WTF_PLATFORM_SPARC 1
+#define WTF_PLATFORM_BIG_ENDIAN 1
+#endif
+
/* PLATFORM(SH4) */
#if defined(__SH4__)
#define WTF_PLATFORM_SH4 1
@@@ -387,18 -392,10 +409,20 @@@
# if Q_BYTE_ORDER == Q_BIG_EDIAN
# define WTF_PLATFORM_BIG_ENDIAN 1
# endif
+
+ # include <ce_time.h>
#endif
+/* For undefined platforms */
+#if !defined(WTF_PLATFORM_BIG_ENDIAN) && !defined(WTF_PLATFORM_MIDDLE_ENDIAN)
+#include <sys/param.h>
+#if __BYTE_ORDER == __BIG_ENDIAN
+#define WTF_PLATFORM_BIG_ENDIAN 1
+#elif __BYTE_ORDER == __PDP_ENDIAN
+#define WTF_PLATFORM_MIDDLE_ENDIAN 1
+#endif
+#endif
+
/* Compiler */
/* COMPILER(MSVC) */
@@@ -443,7 -440,7 +467,7 @@@
#define WTF_COMPILER_WINSCW 1
#endif
- #if (PLATFORM(IPHONE) || PLATFORM(MAC) || PLATFORM(WIN)) && !defined(ENABLE_JSC_MULTIPLE_THREADS)
+ #if (PLATFORM(IPHONE) || PLATFORM(MAC) || PLATFORM(WIN) || (PLATFORM(QT) && PLATFORM(DARWIN))) && !defined(ENABLE_JSC_MULTIPLE_THREADS)
#define ENABLE_JSC_MULTIPLE_THREADS 1
#endif
@@@ -513,6 -510,10 +537,10 @@@
#define HAVE_PTHREAD_RWLOCK 1
#endif
+ #if PLATFORM(QT) && PLATFORM(DARWIN)
+ #define WTF_PLATFORM_CF 1
+ #endif
+
#if PLATFORM(IPHONE)
#define ENABLE_CONTEXT_MENUS 0
#define ENABLE_DRAG_SUPPORT 0
@@@ -530,6 -531,18 +558,18 @@@
#define HAVE_PTHREAD_RWLOCK 1
#endif
+ #if PLATFORM(ANDROID)
+ #define WTF_USE_PTHREADS 1
+ #define WTF_PLATFORM_SGL 1
+ #define USE_SYSTEM_MALLOC 1
+ #define ENABLE_MAC_JAVA_BRIDGE 1
+ #define LOG_DISABLED 1
+ // Prevents Webkit from drawing the caret in textfields and textareas
+ // This prevents unnecessary invals.
+ #define ENABLE_TEXT_CARET 1
+ #define ENABLE_JAVASCRIPT_DEBUGGER 0
+ #endif
+
#if PLATFORM(WIN)
#define WTF_USE_WININET 1
#endif
@@@ -565,7 -578,8 +605,8 @@@
#endif
#if !PLATFORM(WIN_OS) && !PLATFORM(SOLARIS) && !PLATFORM(QNX) \
- && !PLATFORM(SYMBIAN) && !PLATFORM(HAIKU) && !COMPILER(RVCT)
+ && !PLATFORM(SYMBIAN) && !PLATFORM(HAIKU) && !COMPILER(RVCT) \
+ && !PLATFORM(ANDROID)
#define HAVE_TM_GMTOFF 1
#define HAVE_TM_ZONE 1
#define HAVE_TIMEGM 1
@@@ -583,7 -597,7 +624,7 @@@
#define HAVE_SYS_TIME_H 1
#define HAVE_SYS_TIMEB_H 1
- #if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !PLATFORM(IPHONE)
+ #if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !PLATFORM(IPHONE) && !PLATFORM(QT)
#define HAVE_MADV_FREE_REUSE 1
#define HAVE_MADV_FREE 1
#define HAVE_PTHREAD_SETNAME_NP 1
@@@ -595,7 -609,6 +636,6 @@@
#elif PLATFORM(WIN_OS)
- #define HAVE_FLOAT_H 1
#if PLATFORM(WINCE)
#define HAVE_ERRNO_H 0
#else
@@@ -625,6 -638,16 +665,16 @@@
#define HAVE_SYS_PARAM_H 1
#define HAVE_SYS_TIME_H 1
+ #elif PLATFORM(ANDROID)
+
+ #define HAVE_ERRNO_H 1
+ #define HAVE_LANGINFO_H 0
+ #define HAVE_MMAP 1
+ #define HAVE_SBRK 1
+ #define HAVE_STRINGS_H 1
+ #define HAVE_SYS_PARAM_H 1
+ #define HAVE_SYS_TIME_H 1
+
#else
/* FIXME: is this actually used or do other platforms generate their own config.h? */
@@@ -721,6 -744,10 +771,10 @@@
#define ENABLE_NOTIFICATIONS 0
#endif
+ #if !defined(ENABLE_SHARED_SCRIPT)
+ #define ENABLE_SHARED_SCRIPT 0
+ #endif
+
#if !defined(ENABLE_TEXT_CARET)
#define ENABLE_TEXT_CARET 1
#endif
@@@ -730,7 -757,7 +784,7 @@@
#endif
#if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
- #if (PLATFORM(X86_64) && PLATFORM(UNIX)) || PLATFORM(IA64) || PLATFORM(ALPHA)
-#if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX) || PLATFORM(WIN_OS))
++#if (PLATFORM(X86_64) && PLATFORM(UNIX)) || PLATFORM(IA64) || PLATFORM(ALPHA) || PLATFORM(WIN_OS)
#define WTF_USE_JSVALUE64 1
#elif PLATFORM(ARM) || PLATFORM(PPC64)
#define WTF_USE_JSVALUE32 1
@@@ -757,16 -784,19 +811,19 @@@ on MinGW. See https://bugs.webkit.org/s
#define ENABLE_JIT 1
#define WTF_USE_JIT_STUB_ARGUMENT_VA_LIST 1
#elif PLATFORM(ARM_THUMB2) && PLATFORM(IPHONE)
- /* Under development, temporarily disabled until 16Mb link range limit in assembler is fixed. */
- #define ENABLE_JIT 0
- #define ENABLE_JIT_OPTIMIZE_NATIVE_CALL 0
+ #define ENABLE_JIT 1
/* The JIT is tested & working on x86 Windows */
#elif PLATFORM(X86) && PLATFORM(WIN)
#define ENABLE_JIT 1
#endif
#if PLATFORM(QT)
- #if PLATFORM(X86) && PLATFORM(WIN_OS) && COMPILER(MINGW) && GCC_VERSION >= 40100
+ #if PLATFORM(X86_64) && PLATFORM(DARWIN)
+ #define ENABLE_JIT 1
+ #elif PLATFORM(X86) && PLATFORM(DARWIN)
+ #define ENABLE_JIT 1
+ #define WTF_USE_JIT_STUB_ARGUMENT_VA_LIST 1
+ #elif PLATFORM(X86) && PLATFORM(WIN_OS) && COMPILER(MINGW) && GCC_VERSION >= 40100
#define ENABLE_JIT 1
#define WTF_USE_JIT_STUB_ARGUMENT_VA_LIST 1
#elif PLATFORM(X86) && PLATFORM(WIN_OS) && COMPILER(MSVC)
@@@ -777,9 -807,6 +834,6 @@@
#define WTF_USE_JIT_STUB_ARGUMENT_VA_LIST 1
#elif PLATFORM(ARM_TRADITIONAL) && PLATFORM(LINUX)
#define ENABLE_JIT 1
- #if PLATFORM(ARM_THUMB2)
- #define ENABLE_JIT_OPTIMIZE_NATIVE_CALL 0
- #endif
#endif
#endif /* PLATFORM(QT) */
@@@ -824,8 -851,7 +878,7 @@@
/* YARR supports x86 & x86-64, and has been tested on Mac and Windows. */
#if (PLATFORM(X86) && PLATFORM(MAC)) \
|| (PLATFORM(X86_64) && PLATFORM(MAC)) \
- /* Under development, temporarily disabled until 16Mb link range limit in assembler is fixed. */ \
- || (PLATFORM(ARM_THUMB2) && PLATFORM(IPHONE) && 0) \
+ || (PLATFORM(ARM_THUMB2) && PLATFORM(IPHONE)) \
|| (PLATFORM(X86) && PLATFORM(WIN))
#define ENABLE_YARR 1
#define ENABLE_YARR_JIT 1
@@@ -885,6 -911,10 +938,10 @@@
#define WTF_USE_ACCELERATED_COMPOSITING 1
#endif
+ #if PLATFORM(WIN)
+ #define WTF_USE_ACCELERATED_COMPOSITING 0
+ #endif
+
#if COMPILER(GCC)
#define WARN_UNUSED_RETURN __attribute__ ((warn_unused_result))
#else
diff --combined WebCore/platform/text/StringHash.h
index 0f14ef3,21a478e..788c018
--- a/WebCore/platform/text/StringHash.h
+++ b/WebCore/platform/text/StringHash.h
@@@ -1,5 -1,6 +1,6 @@@
/*
* Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved
+ * Copyright (C) Research In Motion Limited 2009. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@@ -29,6 -30,10 +30,10 @@@
namespace WebCore {
+ // The hash() functions on StringHash and CaseFoldingHash do not support
+ // null strings. get(), contains(), and add() on HashMap<String,..., StringHash>
+ // cause a null-pointer dereference when passed null strings.
+
// FIXME: We should really figure out a way to put the computeHash function that's
// currently a member function of StringImpl into this file so we can be a little
// closer to having all the nearly-identical hash functions in one place.
@@@ -47,15 -52,16 +52,16 @@@
if (aLength != bLength)
return false;
- #if PLATFORM(ARM) || PLATFORM(SPARC)
-#if PLATFORM(ARM) || PLATFORM(SH4)
++#if PLATFORM(ARM) || PLATFORM(SPARC) || PLATFORM(SH4)
const UChar* aChars = a->characters();
const UChar* bChars = b->characters();
- for (unsigned i = 0; i != aLength; ++i) {
+ for (unsigned i = 0; i != aLength; ++i)
if (*aChars++ != *bChars++)
return false;
- }
+
return true;
#else
+ /* Do it 4-bytes-at-a-time on architectures where it's safe */
const uint32_t* aChars = reinterpret_cast<const uint32_t*>(a->characters());
const uint32_t* bChars = reinterpret_cast<const uint32_t*>(b->characters());
diff --combined WebKit/gtk/webkit/webkitwebinspector.h
index 94fd806,bde4854..2b75de2
--- a/WebKit/gtk/webkit/webkitwebinspector.h
+++ b/WebKit/gtk/webkit/webkitwebinspector.h
@@@ -63,9 -63,11 +63,10 @@@ webkit_web_inspector_get_inspected_uri(
WEBKIT_API void
webkit_web_inspector_inspect_coordinates(WebKitWebInspector* web_inspector, gdouble x, gdouble y);
-WEBKIT_API void
+ webkit_web_inspector_show(WebKitWebInspector* webInspector);
+
WEBKIT_API void
webkit_web_inspector_close(WebKitWebInspector* webInspector);
-
G_END_DECLS
#endif /* webkitwebinspector_h */
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list