Title: [122401] trunk/Source
Revision
122401
Author
[email protected]
Date
2012-07-11 19:00:27 -0700 (Wed, 11 Jul 2012)

Log Message

Switch a few cases that care about the SDK over to checking __MAC_OS_X_VERSION_MAX_ALLOWED so that things build.

Part of <http://webkit.org/b/91015> Remove BUILDING_ON / TARGETING macros in favor of system availability macros

Reviewed by Filip Pizlo.

Source/WebCore:

* platform/graphics/cg/GraphicsContextCG.cpp: The SDK we're building against determines whether the constant is available.
* platform/mac/EmptyProtocolDefinitions.h:  The SDK we're building against determines whether the protocols are declared.
* platform/mac/NSScrollerImpDetails.h: The SDK we're building against determines whether the constants and method are
available.
* platform/mac/SharedTimerMac.mm: The SDK we're building against determines whether the function has already been declared.

Source/WTF:

* wtf/FastMalloc.cpp:
(WTF::TCMalloc_ThreadCache::CreateCacheIfNecessary): The SDK we're building against determines how many elements
the structure is declared as having.

Modified Paths

Diff

Modified: trunk/Source/WTF/ChangeLog (122400 => 122401)


--- trunk/Source/WTF/ChangeLog	2012-07-12 02:00:04 UTC (rev 122400)
+++ trunk/Source/WTF/ChangeLog	2012-07-12 02:00:27 UTC (rev 122401)
@@ -1,5 +1,17 @@
 2012-07-11  Mark Rowe  <[email protected]>
 
+        Switch a few cases that care about the SDK over to checking __MAC_OS_X_VERSION_MAX_ALLOWED so that things build.
+
+        Part of <http://webkit.org/b/91015> Remove BUILDING_ON / TARGETING macros in favor of system availability macros
+
+        Reviewed by Filip Pizlo.
+
+        * wtf/FastMalloc.cpp:
+        (WTF::TCMalloc_ThreadCache::CreateCacheIfNecessary): The SDK we're building against determines how many elements
+        the structure is declared as having.
+
+2012-07-11  Mark Rowe  <[email protected]>
+
         <http://webkit.org/b/91015> Remove BUILDING_ON / TARGETING macros in favor of system availability macros
 
         This removal was handled by a script that translates the relevant macros in to the equivalent checks

Modified: trunk/Source/WTF/wtf/FastMalloc.cpp (122400 => 122401)


--- trunk/Source/WTF/wtf/FastMalloc.cpp	2012-07-12 02:00:04 UTC (rev 122400)
+++ trunk/Source/WTF/wtf/FastMalloc.cpp	2012-07-12 02:00:27 UTC (rev 122401)
@@ -4654,10 +4654,10 @@
 malloc_introspection_t jscore_fastmalloc_introspection = { &FastMallocZone::enumerate, &FastMallocZone::goodSize, &FastMallocZone::check, &FastMallocZone::print,
     &FastMallocZone::log, &FastMallocZone::forceLock, &FastMallocZone::forceUnlock, &FastMallocZone::statistics
 
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 || OS(IOS)
+#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 1060 || OS(IOS)
     , 0 // zone_locked will not be called on the zone unless it advertises itself as version five or higher.
 #endif
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 || OS(IOS)
+#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 || OS(IOS)
     , 0, 0, 0, 0 // These members will not be used unless the zone advertises itself as version seven or higher.
 #endif
 

Modified: trunk/Source/WebCore/ChangeLog (122400 => 122401)


--- trunk/Source/WebCore/ChangeLog	2012-07-12 02:00:04 UTC (rev 122400)
+++ trunk/Source/WebCore/ChangeLog	2012-07-12 02:00:27 UTC (rev 122401)
@@ -1,5 +1,19 @@
 2012-07-11  Mark Rowe  <[email protected]>
 
+        Switch a few cases that care about the SDK over to checking __MAC_OS_X_VERSION_MAX_ALLOWED so that things build.
+
+        Part of <http://webkit.org/b/91015> Remove BUILDING_ON / TARGETING macros in favor of system availability macros
+
+        Reviewed by Filip Pizlo.
+
+        * platform/graphics/cg/GraphicsContextCG.cpp: The SDK we're building against determines whether the constant is available.
+        * platform/mac/EmptyProtocolDefinitions.h:  The SDK we're building against determines whether the protocols are declared.
+        * platform/mac/NSScrollerImpDetails.h: The SDK we're building against determines whether the constants and method are
+        available.
+        * platform/mac/SharedTimerMac.mm: The SDK we're building against determines whether the function has already been declared.
+
+2012-07-11  Mark Rowe  <[email protected]>
+
         <http://webkit.org/b/91015> Remove BUILDING_ON / TARGETING macros in favor of system availability macros
 
         This removal was handled by a script that translates the relevant macros in to the equivalent checks

Modified: trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp (122400 => 122401)


--- trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp	2012-07-12 02:00:04 UTC (rev 122400)
+++ trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp	2012-07-12 02:00:27 UTC (rev 122401)
@@ -54,7 +54,7 @@
 
 #if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
 
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
+#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
 // Building on 10.6 or later: kCGInterpolationMedium is defined in the CGInterpolationQuality enum.
 #define HAVE_CG_INTERPOLATION_MEDIUM 1
 #endif

Modified: trunk/Source/WebCore/platform/mac/EmptyProtocolDefinitions.h (122400 => 122401)


--- trunk/Source/WebCore/platform/mac/EmptyProtocolDefinitions.h	2012-07-12 02:00:04 UTC (rev 122400)
+++ trunk/Source/WebCore/platform/mac/EmptyProtocolDefinitions.h	2012-07-12 02:00:27 UTC (rev 122401)
@@ -29,7 +29,7 @@
 @protocol NAME <NSObject> \
 @end
 
-#if __MAC_OS_X_VERSION_MIN_REQUIRED == 1050
+#if __MAC_OS_X_VERSION_MAX_ALLOWED == 1050
 
 EMPTY_PROTOCOL(NSTableViewDataSource)
 EMPTY_PROTOCOL(NSTableViewDelegate)
@@ -38,7 +38,7 @@
 
 #endif
 
-#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1060
+#if __MAC_OS_X_VERSION_MAX_ALLOWED <= 1060
 
 EMPTY_PROTOCOL(NSURLConnectionDelegate)
 EMPTY_PROTOCOL(NSURLDownloadDelegate)

Modified: trunk/Source/WebCore/platform/mac/NSScrollerImpDetails.h (122400 => 122401)


--- trunk/Source/WebCore/platform/mac/NSScrollerImpDetails.h	2012-07-12 02:00:04 UTC (rev 122400)
+++ trunk/Source/WebCore/platform/mac/NSScrollerImpDetails.h	2012-07-12 02:00:27 UTC (rev 122401)
@@ -29,7 +29,7 @@
 #include "config.h"
 
 // Public APIs not available on versions of Mac on which we build
-#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1060
+#if __MAC_OS_X_VERSION_MAX_ALLOWED <= 1060
 enum {
     NSScrollerStyleLegacy       = 0,
     NSScrollerStyleOverlay      = 1
@@ -44,7 +44,7 @@
 typedef NSInteger NSScrollerKnobStyle;
 #endif
 
-#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1060
+#if __MAC_OS_X_VERSION_MAX_ALLOWED <= 1060
 @interface NSScroller(NSObject)
 + (NSScrollerStyle)preferredScrollerStyle;
 @end

Modified: trunk/Source/WebCore/platform/mac/SharedTimerMac.mm (122400 => 122401)


--- trunk/Source/WebCore/platform/mac/SharedTimerMac.mm	2012-07-12 02:00:04 UTC (rev 122400)
+++ trunk/Source/WebCore/platform/mac/SharedTimerMac.mm	2012-07-12 02:00:27 UTC (rev 122401)
@@ -46,7 +46,7 @@
 static void (*sharedTimerFiredFunction)();
 static void timerFired(CFRunLoopTimerRef, void*);
 
-#if !defined(IOKIT_WITHOUT_LIBDISPATCH) && __MAC_OS_X_VERSION_MIN_REQUIRED == 1060
+#if !defined(IOKIT_WITHOUT_LIBDISPATCH) && __MAC_OS_X_VERSION_MAX_ALLOWED == 1060
 extern "C" void IONotificationPortSetDispatchQueue(IONotificationPortRef notify, dispatch_queue_t queue);
 #endif
 
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to