[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.17-2-1285-g515442a
Gustavo Noronha Silva
kov at debian.org
Tue Jan 5 23:41:41 UTC 2010
The following commit has been merged in the debian/unstable branch:
commit 67d97f551a48d5de660792e67b402e591dba9bb2
Merge: 7e26445042fbe310e558fb4e76e9bd3adf22a7fe cf603cf8d166fcad8951136643a9164b07e168f7
Author: Gustavo Noronha Silva <kov at debian.org>
Date: Tue Jan 5 21:34:48 2010 -0200
Merge branch 'webkit-1.1' into debian/unstable
Conflicts:
JavaScriptCore/wtf/Platform.h
WebCore/platform/text/AtomicString.cpp
WebCore/platform/text/StringHash.h
diff --combined JavaScriptCore/wtf/FastMalloc.cpp
index d883ffd,a5633ea..74d0b81
--- a/JavaScriptCore/wtf/FastMalloc.cpp
+++ b/JavaScriptCore/wtf/FastMalloc.cpp
@@@ -192,7 -192,7 +192,7 @@@ TryMallocReturnValue tryFastZeroedMallo
#if FORCE_SYSTEM_MALLOC
#include <stdlib.h>
- #if !PLATFORM(WIN_OS)
+ #if !OS(WINDOWS)
#include <pthread.h>
#else
#include "windows.h"
@@@ -349,7 -349,7 +349,7 @@@ FastMallocStatistics fastMallocStatisti
} // namespace WTF
- #if PLATFORM(DARWIN)
+ #if OS(DARWIN)
// This symbol is present in the JavaScriptCore exports file even when FastMalloc is disabled.
// It will never be used in this case, so it's type and value are less interesting than its presence.
extern "C" const int jscore_fastmalloc_introspection = 0;
@@@ -379,7 -379,7 +379,7 @@@
#include <stdarg.h>
#include <stddef.h>
#include <stdio.h>
- #if PLATFORM(UNIX)
+ #if OS(UNIX)
#include <unistd.h>
#endif
#if COMPILER(MSVC)
@@@ -391,7 -391,7 +391,7 @@@
#if WTF_CHANGES
- #if PLATFORM(DARWIN)
+ #if OS(DARWIN)
#include "MallocZoneSupport.h"
#include <wtf/HashSet.h>
#include <wtf/Vector.h>
@@@ -405,7 -405,7 +405,7 @@@
// call to the function on Mac OS X, and it's used in performance-critical code. So we
// use a function pointer. But that's not necessarily faster on other platforms, and we had
// problems with this technique on Windows, so we'll do this only on Mac OS X.
- #if PLATFORM(DARWIN)
+ #if OS(DARWIN)
static void* (*pthread_getspecific_function_pointer)(pthread_key_t) = pthread_getspecific;
#define pthread_getspecific(key) pthread_getspecific_function_pointer(key)
#endif
@@@ -433,7 -433,7 +433,7 @@@ namespace WTF
#define MESSAGE LOG_ERROR
#define CHECK_CONDITION ASSERT
- #if PLATFORM(DARWIN)
+ #if OS(DARWIN)
class Span;
class TCMalloc_Central_FreeListPadded;
class TCMalloc_PageHeap;
@@@ -990,7 -990,7 +990,7 @@@ class PageHeapAllocator
int inuse() const { return inuse_; }
- #if defined(WTF_CHANGES) && PLATFORM(DARWIN)
+ #if defined(WTF_CHANGES) && OS(DARWIN)
template <class Recorder>
void recordAdministrativeRegions(Recorder& recorder, const RemoteMemoryReader& reader)
{
@@@ -1172,7 -1172,7 +1172,7 @@@ template <int BITS> class MapSelector
};
#if defined(WTF_CHANGES)
- #if PLATFORM(X86_64)
+ #if CPU(X86_64)
// On all known X86-64 platforms, the upper 16 bits are always unused and therefore
// can be excluded from the PageMap key.
// See http://en.wikipedia.org/wiki/X86-64#Virtual_address_space_details
@@@ -1223,7 -1223,7 +1223,7 @@@ static const int kScavengeTimerDelayInS
static const size_t kMinimumFreeCommittedPageCount = 512;
// During a scavenge, we'll release up to a fraction of the free committed pages.
- #if PLATFORM(WIN)
+ #if OS(WINDOWS)
// We are slightly less aggressive in releasing memory on Windows due to performance reasons.
static const int kMaxScavengeAmountFactor = 3;
#else
@@@ -1372,7 -1372,7 +1372,7 @@@ class TCMalloc_PageHeap
// Index of last free list we scavenged
size_t scavenge_index_;
- #if defined(WTF_CHANGES) && PLATFORM(DARWIN)
+ #if defined(WTF_CHANGES) && OS(DARWIN)
friend class FastMallocZone;
#endif
@@@ -2259,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;
@@@ -2278,7 -2278,7 +2278,7 @@@ static inline TCMalloc_PageHeap* getPag
#define pageheap getPageHeap()
#if USE_BACKGROUND_THREAD_TO_SCAVENGE_MEMORY
- #if PLATFORM(WIN_OS)
+ #if OS(WINDOWS)
static void sleep(unsigned seconds)
{
::Sleep(seconds * 1000);
@@@ -2816,7 -2816,7 +2816,7 @@@ void TCMalloc_ThreadCache::InitModule(
}
pageheap->init();
phinited = 1;
- #if defined(WTF_CHANGES) && PLATFORM(DARWIN)
+ #if defined(WTF_CHANGES) && OS(DARWIN)
FastMallocZone::init();
#endif
}
@@@ -4014,7 -4014,7 +4014,7 @@@ void *(*__memalign_hook)(size_t, size_t
#endif
- #if defined(WTF_CHANGES) && PLATFORM(DARWIN)
+ #if defined(WTF_CHANGES) && OS(DARWIN)
class FreeObjectFinder {
const RemoteMemoryReader& m_reader;
@@@ -4297,7 -4297,7 +4297,7 @@@ extern "C"
malloc_introspection_t jscore_fastmalloc_introspection = { &FastMallocZone::enumerate, &FastMallocZone::goodSize, &FastMallocZone::check, &FastMallocZone::print,
&FastMallocZone::log, &FastMallocZone::forceLock, &FastMallocZone::forceUnlock, &FastMallocZone::statistics
- #if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !PLATFORM(IPHONE)
+ #if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !OS(IPHONE_OS)
, 0 // zone_locked will not be called on the zone unless it advertises itself as version five or higher.
#endif
diff --combined WebCore/platform/text/AtomicString.cpp
index 37fd960,e35627c..f02fe28
--- a/WebCore/platform/text/AtomicString.cpp
+++ b/WebCore/platform/text/AtomicString.cpp
@@@ -103,7 -103,9 +103,9 @@@ static inline bool equal(StringImpl* st
if (string->length() != length)
return false;
- #if PLATFORM(ARM) || PLATFORM(SPARC) || PLATFORM(SH4)
++#if CPU(ARM) || CPU(SPARC) || CPU(SH4)
+ // FIXME: perhaps we should have a more abstract macro that indicates when
+ // going 4 bytes at a time is unsafe
-#if CPU(ARM) || CPU(SH4)
const UChar* stringCharacters = string->characters();
for (unsigned i = 0; i != length; ++i) {
if (*stringCharacters++ != *characters++)
diff --combined WebCore/platform/text/StringHash.h
index 788c018,e6c548a..2f2c6ba
--- a/WebCore/platform/text/StringHash.h
+++ b/WebCore/platform/text/StringHash.h
@@@ -24,8 -24,8 +24,8 @@@
#include "AtomicString.h"
#include "PlatformString.h"
- #include <wtf/HashFunctions.h>
#include <wtf/HashTraits.h>
+ #include <wtf/StringHashFunctions.h>
#include <wtf/unicode/Unicode.h>
namespace WebCore {
@@@ -52,13 -52,15 +52,15 @@@
if (aLength != bLength)
return false;
- #if PLATFORM(ARM) || PLATFORM(SPARC) || PLATFORM(SH4)
+ // FIXME: perhaps we should have a more abstract macro that indicates when
+ // going 4 bytes at a time is unsafe
-#if CPU(ARM) || CPU(SH4)
++#if CPU(ARM) || CPU(SPARC) || CPU(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 */
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list