Title: [192823] tags/Safari-602.1.12.1/Source/WebCore
- Revision
- 192823
- Author
- bshaf...@apple.com
- Date
- 2015-11-30 13:49:47 -0800 (Mon, 30 Nov 2015)
Log Message
Merged r192678. rdar://problem/23624934
Modified Paths
Diff
Modified: tags/Safari-602.1.12.1/Source/WebCore/ChangeLog (192822 => 192823)
--- tags/Safari-602.1.12.1/Source/WebCore/ChangeLog 2015-11-30 21:48:50 UTC (rev 192822)
+++ tags/Safari-602.1.12.1/Source/WebCore/ChangeLog 2015-11-30 21:49:47 UTC (rev 192823)
@@ -1,5 +1,15 @@
2015-11-30 Babak Shafiei <bshaf...@apple.com>
+ Merge r192678.
+
+ 2015-11-20 David Kilzer <ddkil...@apple.com>
+
+ REGRESSION (r192460,r192677): Fix all the builds
+
+ * platform/spi/cocoa/QuartzCoreSPI.h: Check different.
+
+2015-11-30 Babak Shafiei <bshaf...@apple.com>
+
Merge r192677.
2015-11-19 David Kilzer <ddkil...@apple.com>
Modified: tags/Safari-602.1.12.1/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h (192822 => 192823)
--- tags/Safari-602.1.12.1/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h 2015-11-30 21:48:50 UTC (rev 192822)
+++ tags/Safari-602.1.12.1/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h 2015-11-30 21:49:47 UTC (rev 192823)
@@ -196,10 +196,10 @@
EXTERN_C NSString * const kCAContextDisplayId;
EXTERN_C NSString * const kCAContextIgnoresHitTest;
-#if (PLATFORM(APPLETV) && __TV_OS_VERSION_MAX_ALLOWED < 90000) \
- || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MAX_ALLOWED < 30000) \
- || (PLATFORM(IOS) && TARGET_OS_IOS && __IPHONE_OS_VERSION_MAX_ALLOWED < 100000) \
- || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED < 101200)
+#if (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED < 100000) \
+ || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED < 30000) \
+ || (PLATFORM(IOS) && TARGET_OS_IOS && __IPHONE_OS_VERSION_MIN_REQUIRED < 100000) \
+ || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200)
@protocol CALayerDelegate <NSObject>
@end
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
