Changeset 147525 in webkit

Timestamp:

Apr 3, 2013, 1:21:49 AM (12 years ago)

Author:

rniwa@webkit.org

Message:

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.

Source/WebKit2:

• Shared/mac/PasteboardTypes.mm:

(WebKit::PasteboardTypes::forEditing):

Source/WTF:

• wtf/FastMalloc.cpp:

(WTF::TCMalloc_ThreadCache::CreateCacheIfNecessary):

• wtf/Platform.h:
• wtf/ThreadingPthreads.cpp:

(WTF::initializeCurrentThreadInternal):

• wtf/unicode/icu/CollatorICU.cpp:

(WTF::Collator::userDefault):

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/FastMalloc.cpp (modified) (1 diff)
• WTF/wtf/Platform.h (modified) (2 diffs)
• WTF/wtf/ThreadingPthreads.cpp (modified) (2 diffs)
• WTF/wtf/unicode/icu/CollatorICU.cpp (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/Shared/mac/PasteboardTypes.mm (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2013-04-02  Ryosuke Niwa  <rniwa@webkit.org>
+
+        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  <mvujovic@adobe.com>
 

trunk/Source/WTF/wtf/FastMalloc.cpp

@@ -4966 +4966 @@
 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.

trunk/Source/WTF/wtf/Platform.h

@@ -665 +665 @@
 #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)
@@ -679 +676 @@
 #define HAVE_MADV_FREE_REUSE 1
 #endif /* !PLATFORM(IOS) */
-
-#endif /* PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 */
 
 #endif /* OS(DARWIN) */

trunk/Source/WTF/wtf/ThreadingPthreads.cpp

@@ -57 +57 @@
 #endif
 
-#if OS(MAC_OS_X) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
+#if OS(MAC_OS_X)
 #include <objc/objc-auto.h>
 #endif
@@ -224 +224 @@
 #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.

trunk/Source/WTF/wtf/unicode/icu/CollatorICU.cpp

@@ -63 +63 @@
 #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);

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-04-02  Ryosuke Niwa  <rniwa@webkit.org>
+
+        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  <andersca@apple.com>
 

trunk/Source/WebKit2/Shared/mac/PasteboardTypes.mm

@@ -45 +45 @@
 {
     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;