Title: [182553] tags/Safari-601.1.26/Source/WebCore
- Revision
- 182553
- Author
- [email protected]
- Date
- 2015-04-08 10:53:24 -0700 (Wed, 08 Apr 2015)
Log Message
Merged r182521. rdar://problem/20113980
Modified Paths
Diff
Modified: tags/Safari-601.1.26/Source/WebCore/ChangeLog (182552 => 182553)
--- tags/Safari-601.1.26/Source/WebCore/ChangeLog 2015-04-08 17:52:24 UTC (rev 182552)
+++ tags/Safari-601.1.26/Source/WebCore/ChangeLog 2015-04-08 17:53:24 UTC (rev 182553)
@@ -1,5 +1,18 @@
2015-04-08 Babak Shafiei <[email protected]>
+ Merge r182521.
+
+ 2015-04-07 Chris Dumez <[email protected]>
+
+ Unreviewed, another iOS build fix after r182516.
+
+ I missed another use of __MAC_OS_X_VERSION_MIN_REQUIRED without a
+ PLATFORM(MAC) check.
+
+ * platform/graphics/cocoa/FontCascadeCocoa.mm:
+
+2015-04-08 Babak Shafiei <[email protected]>
+
Merge r182519.
2015-04-07 Chris Dumez <[email protected]>
Modified: tags/Safari-601.1.26/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm (182552 => 182553)
--- tags/Safari-601.1.26/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm 2015-04-08 17:52:24 UTC (rev 182552)
+++ tags/Safari-601.1.26/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm 2015-04-08 17:53:24 UTC (rev 182553)
@@ -203,7 +203,7 @@
}
#endif
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
static CGSize dilationSizeForTextColor(const Color& color)
{
double hue;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
