Title: [182552] tags/Safari-601.1.26/Source/WebCore
- Revision
- 182552
- Author
- [email protected]
- Date
- 2015-04-08 10:52:24 -0700 (Wed, 08 Apr 2015)
Log Message
Merged r182519. rdar://problem/20113980
Modified Paths
Diff
Modified: tags/Safari-601.1.26/Source/WebCore/ChangeLog (182551 => 182552)
--- tags/Safari-601.1.26/Source/WebCore/ChangeLog 2015-04-08 17:52:15 UTC (rev 182551)
+++ tags/Safari-601.1.26/Source/WebCore/ChangeLog 2015-04-08 17:52:24 UTC (rev 182552)
@@ -1,5 +1,17 @@
2015-04-08 Babak Shafiei <[email protected]>
+ Merge r182519.
+
+ 2015-04-07 Chris Dumez <[email protected]>
+
+ Unreviewed, speculative iOS build fix after r182516.
+
+ Add #if PLATFORM(MAC) checks.
+
+ * platform/spi/cg/CoreGraphicsSPI.h:
+
+2015-04-08 Babak Shafiei <[email protected]>
+
Merge r182518.
2015-04-07 Simon Fraser <[email protected]>
Modified: tags/Safari-601.1.26/Source/WebCore/platform/spi/cg/CoreGraphicsSPI.h (182551 => 182552)
--- tags/Safari-601.1.26/Source/WebCore/platform/spi/cg/CoreGraphicsSPI.h 2015-04-08 17:52:15 UTC (rev 182551)
+++ tags/Safari-601.1.26/Source/WebCore/platform/spi/cg/CoreGraphicsSPI.h 2015-04-08 17:52:24 UTC (rev 182552)
@@ -79,7 +79,7 @@
enum {
kCGFontAntialiasingStyleUnfiltered = 0 << 7,
kCGFontAntialiasingStyleFilterLight = 1 << 7,
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
kCGFontAntialiasingStyleUnfilteredCustomDilation = (8 << 7),
#endif
};
@@ -129,7 +129,7 @@
void CGContextSetCTM(CGContextRef, CGAffineTransform);
void CGContextSetCompositeOperation(CGContextRef, CGCompositeOperation);
void CGContextSetShouldAntialiasFonts(CGContextRef, bool shouldAntialiasFonts);
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
void CGContextSetFontDilation(CGContextRef, CGSize);
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
