[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15.1-1-1425-g03b254a
Gustavo Noronha Silva
kov at debian.org
Fri Oct 30 11:51:16 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 912948c39d5ffc231718b62996e055fbd0651345
Merge: ad8f3c79f7d81f35eeb1a868146e1e9df6ef74b6 c69ee757a3b687ab12bcbc0e824c1d4a5c784764
Author: Gustavo Noronha Silva <kov at debian.org>
Date: Thu Oct 29 18:39:00 2009 -0200
Merge branch 'webkit-1.1' into debian/unstable
diff --combined JavaScriptCore/wtf/FastMalloc.cpp
index fe7c913,6cd8ef0..d883ffd
--- a/JavaScriptCore/wtf/FastMalloc.cpp
+++ b/JavaScriptCore/wtf/FastMalloc.cpp
@@@ -379,6 -379,9 +379,9 @@@ extern "C" const int jscore_fastmalloc_
#include <stdarg.h>
#include <stddef.h>
#include <stdio.h>
+ #if PLATFORM(UNIX)
+ #include <unistd.h>
+ #endif
#if COMPILER(MSVC)
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
@@@ -391,6 -394,7 +394,7 @@@
#if PLATFORM(DARWIN)
#include "MallocZoneSupport.h"
#include <wtf/HashSet.h>
+ #include <wtf/Vector.h>
#endif
#ifndef PRIuS
@@@ -2255,13 -2259,13 +2259,13 @@@ static TCMalloc_Central_FreeListPadded
// Page-level allocator
static SpinLock pageheap_lock = SPINLOCK_INITIALIZER;
-static void* pageheap_memory[(sizeof(TCMalloc_PageHeap) + sizeof(void*) - 1) / sizeof(void*)];
+static uint64_t pageheap_memory[(sizeof(TCMalloc_PageHeap) + sizeof(uint64_t) - 1) / sizeof(uint64_t)];
static bool phinited = false;
// Avoid extra level of indirection by making "pageheap" be just an alias
// of pageheap_memory.
typedef union {
- void* m_memory;
+ uint64_t* m_memory;
TCMalloc_PageHeap* m_pageHeap;
} PageHeapUnion;
@@@ -2274,7 -2278,7 +2278,7 @@@ static inline TCMalloc_PageHeap* getPag
#define pageheap getPageHeap()
#if USE_BACKGROUND_THREAD_TO_SCAVENGE_MEMORY
- #if PLATFORM(WIN)
+ #if PLATFORM(WIN_OS)
static void sleep(unsigned seconds)
{
::Sleep(seconds * 1000);
@@@ -2283,6 -2287,10 +2287,10 @@@
void TCMalloc_PageHeap::scavengerThread()
{
+ #if HAVE(PTHREAD_SETNAME_NP)
+ pthread_setname_np("JavaScriptCore: FastMalloc scavenger");
+ #endif
+
while (1) {
if (!shouldContinueScavenging()) {
pthread_mutex_lock(&m_scavengeMutex);
@@@ -2388,7 -2396,7 +2396,7 @@@ ALWAYS_INLINE void TCMalloc_Central_Fre
// The following check is expensive, so it is disabled by default
if (false) {
// Check that object does not occur in list
- int got = 0;
+ unsigned got = 0;
for (void* p = span->objects; p != NULL; p = *((void**) p)) {
ASSERT(p != object);
got++;
diff --combined JavaScriptCore/wtf/Platform.h
index f73bba5,6bae0eb..580f4bc
--- a/JavaScriptCore/wtf/Platform.h
+++ b/JavaScriptCore/wtf/Platform.h
@@@ -231,39 -231,94 +231,94 @@@
#if defined(arm) \
|| defined(__arm__)
#define WTF_PLATFORM_ARM 1
+
#if defined(__ARMEB__)
#define WTF_PLATFORM_BIG_ENDIAN 1
- #elif !defined(__ARM_EABI__) && !defined(__EABI__) && !defined(__VFP_FP__)
+
+ #elif !defined(__ARM_EABI__) \
+ && !defined(__EABI__) \
+ && !defined(__VFP_FP__)
#define WTF_PLATFORM_MIDDLE_ENDIAN 1
+
#endif
- #define ARM_ARCH_VERSION 3
- #if defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__)
- #undef ARM_ARCH_VERSION
+
+ /* Set ARM_ARCH_VERSION */
+ #if defined(__ARM_ARCH_4__) \
+ || defined(__ARM_ARCH_4T__) \
+ || defined(__MARM_ARMV4__) \
+ || defined(_ARMV4I_)
#define ARM_ARCH_VERSION 4
- #endif
- #if defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5T__) \
- || defined(__ARM_ARCH_5E__) || defined(__ARM_ARCH_5TE__) \
- || defined(__ARM_ARCH_5TEJ__)
- #undef ARM_ARCH_VERSION
+
+ #elif defined(__ARM_ARCH_5__) \
+ || defined(__ARM_ARCH_5T__) \
+ || defined(__ARM_ARCH_5E__) \
+ || defined(__ARM_ARCH_5TE__) \
+ || defined(__ARM_ARCH_5TEJ__) \
+ || defined(__MARM_ARMV5__)
#define ARM_ARCH_VERSION 5
- #endif
- #if defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) \
- || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) \
- || defined(__ARM_ARCH_6ZK__)
- #undef ARM_ARCH_VERSION
+
+ #elif defined(__ARM_ARCH_6__) \
+ || defined(__ARM_ARCH_6J__) \
+ || defined(__ARM_ARCH_6K__) \
+ || defined(__ARM_ARCH_6Z__) \
+ || defined(__ARM_ARCH_6ZK__) \
+ || defined(__ARM_ARCH_6T2__) \
+ || defined(__ARMV6__)
#define ARM_ARCH_VERSION 6
- #endif
- #if defined(__ARM_ARCH_7A__)
- #undef ARM_ARCH_VERSION
+
+ #elif defined(__ARM_ARCH_7A__) \
+ || defined(__ARM_ARCH_7R__)
#define ARM_ARCH_VERSION 7
+
+ /* RVCT sets _TARGET_ARCH_ARM */
+ #elif defined(__TARGET_ARCH_ARM)
+ #define ARM_ARCH_VERSION __TARGET_ARCH_ARM
+
+ #else
+ #define ARM_ARCH_VERSION 0
+
+ #endif
+
+ /* Set THUMB_ARM_VERSION */
+ #if defined(__ARM_ARCH_4T__)
+ #define THUMB_ARCH_VERSION 1
+
+ #elif defined(__ARM_ARCH_5T__) \
+ || defined(__ARM_ARCH_5TE__) \
+ || defined(__ARM_ARCH_5TEJ__)
+ #define THUMB_ARCH_VERSION 2
+
+ #elif defined(__ARM_ARCH_6J__) \
+ || defined(__ARM_ARCH_6K__) \
+ || defined(__ARM_ARCH_6Z__) \
+ || defined(__ARM_ARCH_6ZK__) \
+ || defined(__ARM_ARCH_6M__)
+ #define THUMB_ARCH_VERSION 3
+
+ #elif defined(__ARM_ARCH_6T2__) \
+ || defined(__ARM_ARCH_7__) \
+ || defined(__ARM_ARCH_7A__) \
+ || defined(__ARM_ARCH_7R__) \
+ || defined(__ARM_ARCH_7M__)
+ #define THUMB_ARCH_VERSION 4
+
+ /* RVCT sets __TARGET_ARCH_THUMB */
+ #elif defined(__TARGET_ARCH_THUMB)
+ #define THUMB_ARCH_VERSION __TARGET_ARCH_THUMB
+
+ #else
+ #define THUMB_ARCH_VERSION 0
#endif
+
/* On ARMv5 and below the natural alignment is required. */
#if !defined(ARM_REQUIRE_NATURAL_ALIGNMENT) && ARM_ARCH_VERSION <= 5
#define ARM_REQUIRE_NATURAL_ALIGNMENT 1
#endif
+
/* Defines two pseudo-platforms for ARM and Thumb-2 instruction set. */
#if !defined(WTF_PLATFORM_ARM_TRADITIONAL) && !defined(WTF_PLATFORM_ARM_THUMB2)
- # if defined(thumb2) || defined(__thumb2__)
+ # if defined(thumb2) || defined(__thumb2__) \
+ || ((defined(__thumb) || defined(__thumb__)) && THUMB_ARCH_VERSION == 4)
# define WTF_PLATFORM_ARM_TRADITIONAL 0
# define WTF_PLATFORM_ARM_THUMB2 1
# elif PLATFORM_ARM_ARCH(4)
@@@ -292,23 -347,6 +347,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
@@@ -334,16 -372,6 +389,16 @@@
# endif
#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) */
@@@ -438,6 -466,10 +493,10 @@@
#if PLATFORM(MAC) && !PLATFORM(IPHONE)
#define WTF_PLATFORM_CF 1
#define WTF_USE_PTHREADS 1
+ #define HAVE_PTHREAD_RWLOCK 1
+ #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_TIGER) && defined(__x86_64__)
+ #define WTF_USE_PLUGIN_HOST_PROCESS 1
+ #endif
#if !defined(ENABLE_MAC_JAVA_BRIDGE)
#define ENABLE_MAC_JAVA_BRIDGE 1
#endif
@@@ -446,26 -478,29 +505,29 @@@
#endif
#define HAVE_READLINE 1
#define HAVE_RUNLOOP_TIMER 1
- #endif
+ #endif /* PLATFORM(MAC) && !PLATFORM(IPHONE) */
#if PLATFORM(CHROMIUM) && PLATFORM(DARWIN)
#define WTF_PLATFORM_CF 1
#define WTF_USE_PTHREADS 1
+ #define HAVE_PTHREAD_RWLOCK 1
#endif
#if PLATFORM(IPHONE)
#define ENABLE_CONTEXT_MENUS 0
#define ENABLE_DRAG_SUPPORT 0
#define ENABLE_FTPDIR 1
+ #define ENABLE_GEOLOCATION 1
+ #define ENABLE_ICONDATABASE 0
#define ENABLE_INSPECTOR 0
#define ENABLE_MAC_JAVA_BRIDGE 0
- #define ENABLE_ICONDATABASE 0
- #define ENABLE_GEOLOCATION 1
#define ENABLE_NETSCAPE_PLUGIN_API 0
- #define HAVE_READLINE 1
+ #define ENABLE_ORIENTATION_EVENTS 1
#define ENABLE_REPAINT_THROTTLING 1
+ #define HAVE_READLINE 1
+ #define WTF_PLATFORM_CF 1
+ #define WTF_USE_PTHREADS 1
+ #define HAVE_PTHREAD_RWLOCK 1
#endif
#if PLATFORM(WIN)
@@@ -479,6 -514,7 +541,7 @@@
#if PLATFORM(GTK)
#if HAVE(PTHREAD_H)
#define WTF_USE_PTHREADS 1
+ #define HAVE_PTHREAD_RWLOCK 1
#endif
#endif
@@@ -486,6 -522,7 +549,7 @@@
#define HAVE_POSIX_MEMALIGN 1
#define WTF_USE_CURL 1
#define WTF_USE_PTHREADS 1
+ #define HAVE_PTHREAD_RWLOCK 1
#define USE_SYSTEM_MALLOC 1
#define ENABLE_NETSCAPE_PLUGIN_API 0
#endif
@@@ -522,6 -559,7 +586,7 @@@
#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !PLATFORM(IPHONE)
#define HAVE_MADV_FREE_REUSE 1
#define HAVE_MADV_FREE 1
+ #define HAVE_PTHREAD_SETNAME_NP 1
#endif
#if PLATFORM(IPHONE)
@@@ -625,6 -663,14 +690,14 @@@
#define ENABLE_NETSCAPE_PLUGIN_API 1
#endif
+ #if !defined(WTF_USE_PLUGIN_HOST_PROCESS)
+ #define WTF_USE_PLUGIN_HOST_PROCESS 0
+ #endif
+
+ #if !defined(ENABLE_ORIENTATION_EVENTS)
+ #define ENABLE_ORIENTATION_EVENTS 0
+ #endif
+
#if !defined(ENABLE_OPCODE_STATS)
#define ENABLE_OPCODE_STATS 0
#endif
@@@ -657,7 -703,7 +730,7 @@@
#endif
#if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
-#if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX))
+#if (PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX) || PLATFORM(FREEBSD))) || PLATFORM(IA64) || PLATFORM(ALPHA)
#define WTF_USE_JSVALUE64 1
#elif PLATFORM(ARM) || PLATFORM(PPC64)
#define WTF_USE_JSVALUE32 1
@@@ -790,11 -836,11 +863,11 @@@ on MinGW. See https://bugs.webkit.org/s
#define ENABLE_PAN_SCROLLING 1
#endif
- /* Use the QtXmlStreamReader implementation for XMLTokenizer */
+ /* Use the QXmlStreamReader implementation for XMLTokenizer */
+ /* Use the QXmlQuery implementation for XSLTProcessor */
#if PLATFORM(QT)
- #if !ENABLE(XSLT)
#define WTF_USE_QXMLSTREAM 1
- #endif
+ #define WTF_USE_QXMLQUERY 1
#endif
#if !PLATFORM(QT)
@@@ -818,6 -864,10 +891,10 @@@
#define WARN_UNUSED_RETURN
#endif
+ #if !ENABLE(NETSCAPE_PLUGIN_API) || (ENABLE(NETSCAPE_PLUGIN_API) && ((PLATFORM(UNIX) && (PLATFORM(QT) || PLATFORM(WX))) || PLATFORM(GTK)))
+ #define ENABLE_PLUGIN_PACKAGE_SIMPLE_HASH 1
+ #endif
+
/* Set up a define for a common error that is intended to cause a build error -- thus the space after Error. */
#define WTF_PLATFORM_CFNETWORK Error USE_macro_should_be_used_with_CFNETWORK
diff --combined WebCore/platform/text/AtomicString.cpp
index 9552fd7,17d7832..37fd960
--- a/WebCore/platform/text/AtomicString.cpp
+++ b/WebCore/platform/text/AtomicString.cpp
@@@ -65,7 -65,9 +65,9 @@@ struct CStringTranslator
static void translate(StringImpl*& location, const char* const& c, unsigned hash)
{
- location = new StringImpl(c, strlen(c), hash);
+ location = StringImpl::create(c).releaseRef();
+ location->setHash(hash);
+ location->setInTable();
}
};
@@@ -101,7 -103,7 +103,7 @@@ static inline bool equal(StringImpl* st
if (string->length() != length)
return false;
-#if PLATFORM(ARM) || PLATFORM(SH4)
+#if PLATFORM(ARM) || PLATFORM(SPARC) || PLATFORM(SH4)
const UChar* stringCharacters = string->characters();
for (unsigned i = 0; i != length; ++i) {
if (*stringCharacters++ != *characters++)
@@@ -140,7 -142,9 +142,9 @@@ struct UCharBufferTranslator
static void translate(StringImpl*& location, const UCharBuffer& buf, unsigned hash)
{
- location = new StringImpl(buf.s, buf.length, hash);
+ location = StringImpl::create(buf.s, buf.length).releaseRef();
+ location->setHash(hash);
+ location->setInTable();
}
};
@@@ -164,7 -168,9 +168,9 @@@ struct HashAndCharactersTranslator
static void translate(StringImpl*& location, const HashAndCharacters& buffer, unsigned hash)
{
- location = new StringImpl(buffer.characters, buffer.length, hash);
+ location = StringImpl::create(buffer.characters, buffer.length).releaseRef();
+ location->setHash(hash);
+ location->setInTable();
}
};
@@@ -222,6 -228,16 +228,16 @@@ void AtomicString::remove(StringImpl* r
{
stringTable().remove(r);
}
+
+ AtomicString AtomicString::lower() const
+ {
+ // Note: This is a hot function in the Dromaeo benchmark.
+ StringImpl* impl = this->impl();
+ RefPtr<StringImpl> newImpl = impl->lower();
+ if (LIKELY(newImpl == impl))
+ return *this;
+ return AtomicString(newImpl);
+ }
#if USE(JSC)
PassRefPtr<StringImpl> AtomicString::add(const JSC::Identifier& identifier)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list