Diff
Modified: trunk/Source/WTF/ChangeLog (147524 => 147525)
--- trunk/Source/WTF/ChangeLog 2013-04-03 07:54:04 UTC (rev 147524)
+++ trunk/Source/WTF/ChangeLog 2013-04-03 08:21:49 UTC (rev 147525)
@@ -1,3 +1,20 @@
+2013-04-02 Ryosuke Niwa <[email protected]>
+
+ Remove code for Mac 10.5 and earlier from WTF and WebKit2
+ https://bugs.webkit.org/show_bug.cgi?id=113844
+
+ Reviewed by Benjamin Poulain.
+
+ Removed the code for 10.5 and removed if-def for 10.6.
+
+ * wtf/FastMalloc.cpp:
+ (WTF::TCMalloc_ThreadCache::CreateCacheIfNecessary):
+ * wtf/Platform.h:
+ * wtf/ThreadingPthreads.cpp:
+ (WTF::initializeCurrentThreadInternal):
+ * wtf/unicode/icu/CollatorICU.cpp:
+ (WTF::Collator::userDefault):
+
2013-04-02 Max Vujovic <[email protected]>
[CSS Filters] Filter outsets clipped on composited layers when filter is applied after first layout
Modified: trunk/Source/WTF/wtf/FastMalloc.cpp (147524 => 147525)
--- trunk/Source/WTF/wtf/FastMalloc.cpp 2013-04-03 07:54:04 UTC (rev 147524)
+++ trunk/Source/WTF/wtf/FastMalloc.cpp 2013-04-03 08:21:49 UTC (rev 147525)
@@ -4965,10 +4965,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 OS(IOS) || __MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
, 0 // zone_locked will not be called on the zone unless it advertises itself as version five or higher.
-#endif
#if OS(IOS) || __MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
, 0, 0, 0, 0 // These members will not be used unless the zone advertises itself as version seven or higher.
#endif
Modified: trunk/Source/WTF/wtf/Platform.h (147524 => 147525)
--- trunk/Source/WTF/wtf/Platform.h 2013-04-03 07:54:04 UTC (rev 147524)
+++ trunk/Source/WTF/wtf/Platform.h 2013-04-03 08:21:49 UTC (rev 147525)
@@ -664,23 +664,18 @@
#if OS(DARWIN)
+#define HAVE_DISPATCH_H 1
+#define HAVE_MADV_FREE 1
#define HAVE_MERGESORT 1
+#define HAVE_PTHREAD_SETNAME_NP 1
#define HAVE_SYS_TIMEB_H 1
#define WTF_USE_ACCELERATE 1
-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
-
-#define HAVE_DISPATCH_H 1
-#define HAVE_MADV_FREE 1
-#define HAVE_PTHREAD_SETNAME_NP 1
-
#if !PLATFORM(IOS)
#define HAVE_HOSTED_CORE_ANIMATION 1
#define HAVE_MADV_FREE_REUSE 1
#endif /* !PLATFORM(IOS) */
-#endif /* PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 */
-
#endif /* OS(DARWIN) */
#if OS(WINDOWS) && !OS(WINCE)
Modified: trunk/Source/WTF/wtf/ThreadingPthreads.cpp (147524 => 147525)
--- trunk/Source/WTF/wtf/ThreadingPthreads.cpp 2013-04-03 07:54:04 UTC (rev 147524)
+++ trunk/Source/WTF/wtf/ThreadingPthreads.cpp 2013-04-03 08:21:49 UTC (rev 147525)
@@ -56,7 +56,7 @@
#include <sys/time.h>
#endif
-#if OS(MAC_OS_X) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
+#if OS(MAC_OS_X)
#include <objc/objc-auto.h>
#endif
@@ -223,7 +223,7 @@
UNUSED_PARAM(threadName);
#endif
-#if OS(MAC_OS_X) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
+#if OS(MAC_OS_X)
// All threads that potentially use APIs above the BSD layer must be registered with the Objective-C
// garbage collector in case API implementations use garbage-collected memory.
objc_registerThreadWithCollector();
Modified: trunk/Source/WTF/wtf/unicode/icu/CollatorICU.cpp (147524 => 147525)
--- trunk/Source/WTF/wtf/unicode/icu/CollatorICU.cpp 2013-04-03 07:54:04 UTC (rev 147524)
+++ trunk/Source/WTF/wtf/unicode/icu/CollatorICU.cpp 2013-04-03 08:21:49 UTC (rev 147525)
@@ -62,7 +62,7 @@
{
#if OS(DARWIN) && USE(CF)
// Mac OS X doesn't set UNIX locale to match user-selected one, so ICU default doesn't work.
-#if !OS(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
+#if !OS(IOS)
RetainPtr<CFLocaleRef> currentLocale(AdoptCF, CFLocaleCopyCurrent());
CFStringRef collationOrder = (CFStringRef)CFLocaleGetValue(currentLocale.get(), kCFLocaleCollatorIdentifier);
#else
Modified: trunk/Source/WebKit2/ChangeLog (147524 => 147525)
--- trunk/Source/WebKit2/ChangeLog 2013-04-03 07:54:04 UTC (rev 147524)
+++ trunk/Source/WebKit2/ChangeLog 2013-04-03 08:21:49 UTC (rev 147525)
@@ -1,3 +1,15 @@
+2013-04-02 Ryosuke Niwa <[email protected]>
+
+ Remove code for Mac 10.5 and earlier from WTF and WebKit2
+ https://bugs.webkit.org/show_bug.cgi?id=113844
+
+ Reviewed by Benjamin Poulain.
+
+ Removed the code for 10.5 and removed if-def for 10.6.
+
+ * Shared/mac/PasteboardTypes.mm:
+ (WebKit::PasteboardTypes::forEditing):
+
2013-04-02 Anders Carlsson <[email protected]>
Be more robust against empty message receiver names in incoming messages
Modified: trunk/Source/WebKit2/Shared/mac/PasteboardTypes.mm (147524 => 147525)
--- trunk/Source/WebKit2/Shared/mac/PasteboardTypes.mm 2013-04-03 07:54:04 UTC (rev 147524)
+++ trunk/Source/WebKit2/Shared/mac/PasteboardTypes.mm 2013-04-03 08:21:49 UTC (rev 147525)
@@ -44,9 +44,6 @@
NSArray* PasteboardTypes::forEditing()
{
static NSArray *types = retain([NSArray arrayWithObjects:WebArchivePboardType, NSHTMLPboardType, NSFilenamesPboardType, NSTIFFPboardType, NSPDFPboardType,
-#if __MAC_OS_X_VERSION_MIN_REQUIRED == 1050
- NSPICTPboardType,
-#endif
NSURLPboardType, NSRTFDPboardType, NSRTFPboardType, NSStringPboardType, NSColorPboardType, kUTTypePNG, nil]);
return types;
}
