Title: [124797] trunk/Source/WebCore
- Revision
- 124797
- Author
- [email protected]
- Date
- 2012-08-06 13:31:29 -0700 (Mon, 06 Aug 2012)
Log Message
[chromium/mac] Unbreak debug builds with the 10.7 SDK
https://bugs.webkit.org/show_bug.cgi?id=93202
Reviewed by James Robinson.
FMGetATSFontRefFromFont() is not available with the 10.7 SDK
when targetting 10.6. Don't delete this code completely yet,
it's still used with the 10.6 SDK when targetting 10.6 (which
chromium's build bots use).
* platform/graphics/mac/SimpleFontDataMac.mm:
(WebCore):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (124796 => 124797)
--- trunk/Source/WebCore/ChangeLog 2012-08-06 20:31:23 UTC (rev 124796)
+++ trunk/Source/WebCore/ChangeLog 2012-08-06 20:31:29 UTC (rev 124797)
@@ -1,3 +1,18 @@
+2012-08-06 Nico Weber <[email protected]>
+
+ [chromium/mac] Unbreak debug builds with the 10.7 SDK
+ https://bugs.webkit.org/show_bug.cgi?id=93202
+
+ Reviewed by James Robinson.
+
+ FMGetATSFontRefFromFont() is not available with the 10.7 SDK
+ when targetting 10.6. Don't delete this code completely yet,
+ it's still used with the 10.6 SDK when targetting 10.6 (which
+ chromium's build bots use).
+
+ * platform/graphics/mac/SimpleFontDataMac.mm:
+ (WebCore):
+
2012-07-31 Ojan Vafai <[email protected]>
need tests to ensure flexboxes play nicely with box-sizing
Modified: trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm (124796 => 124797)
--- trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm 2012-08-06 20:31:23 UTC (rev 124796)
+++ trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm 2012-08-06 20:31:29 UTC (rev 124797)
@@ -82,7 +82,7 @@
}
#if !ERROR_DISABLED
-#if defined(__LP64__) || PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
+#if defined(__LP64__) || PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 || (__MAC_OS_X_VERSION_MAX_ALLOWED >= 107 && __MAC_OS_X_VERSION_MIN_REQUIRED >= 106)
static NSString* pathFromFont(NSFont*)
{
// FMGetATSFontRefFromFont is not available. As pathFromFont is only used for debugging purposes,
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
