Title: [181857] trunk/Source/WebCore
- Revision
- 181857
- Author
- [email protected]
- Date
- 2015-03-23 11:18:49 -0700 (Mon, 23 Mar 2015)
Log Message
[iOS] Build fix: CoreText deprecated kCTFontSystemFontType
Fix tracked by: <rdar://problem/20261171>
* rendering/RenderThemeIOS.mm:
(WebCore::RenderThemeIOS::updateCachedSystemFontDescription):
Add clang pragmas.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (181856 => 181857)
--- trunk/Source/WebCore/ChangeLog 2015-03-23 18:07:01 UTC (rev 181856)
+++ trunk/Source/WebCore/ChangeLog 2015-03-23 18:18:49 UTC (rev 181857)
@@ -1,3 +1,13 @@
+2015-03-23 David Kilzer <[email protected]>
+
+ [iOS] Build fix: CoreText deprecated kCTFontSystemFontType
+
+ Fix tracked by: <rdar://problem/20261171>
+
+ * rendering/RenderThemeIOS.mm:
+ (WebCore::RenderThemeIOS::updateCachedSystemFontDescription):
+ Add clang pragmas.
+
2015-03-23 Brent Fulgham <[email protected]>
Unreviewed test fix.
Modified: trunk/Source/WebCore/rendering/RenderThemeIOS.mm (181856 => 181857)
--- trunk/Source/WebCore/rendering/RenderThemeIOS.mm 2015-03-23 18:07:01 UTC (rev 181856)
+++ trunk/Source/WebCore/rendering/RenderThemeIOS.mm 2015-03-23 18:18:49 UTC (rev 181857)
@@ -1262,7 +1262,15 @@
default:
textStyle = kCTFontDescriptorTextStyleEmphasized;
+#if COMPILER(CLANG)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#endif
+ // <rdar://problem/20261171> kCTFontSystemFontType is deprecated in CoreText
fontDescriptor = adoptCF(CTFontDescriptorCreateForUIType(kCTFontSystemFontType, 0, nullptr));
+#if COMPILER(CLANG)
+#pragma clang diagnostic pop
+#endif
}
ASSERT(fontDescriptor);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes