Changeset 181870 in webkit

Timestamp:

Mar 23, 2015, 2:32:38 PM (11 years ago)

Author:

dino@apple.com

Message:

kCTFontSystemFontType is deprecated in CoreText
​https://bugs.webkit.org/show_bug.cgi?id=142981
<rdar://problem/20261171>

Reviewed by Beth Dakin.

Update to the non-deprecated version.

• rendering/RenderThemeIOS.mm: kCTFontSystemFontType -> kCTFontUIFontSystem

(WebCore::RenderThemeIOS::updateCachedSystemFontDescription):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderThemeIOS.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-03-23  Dean Jackson  <dino@apple.com>
+
+        kCTFontSystemFontType is deprecated in CoreText
+        https://bugs.webkit.org/show_bug.cgi?id=142981
+        <rdar://problem/20261171>
+
+        Reviewed by Beth Dakin.
+
+        Update to the non-deprecated version.
+
+        * rendering/RenderThemeIOS.mm: kCTFontSystemFontType -> kCTFontUIFontSystem
+        (WebCore::RenderThemeIOS::updateCachedSystemFontDescription):
+
 2015-03-23  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebCore/rendering/RenderThemeIOS.mm

@@ -1263 +1263 @@
     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
+        fontDescriptor = adoptCF(CTFontDescriptorCreateForUIType(kCTFontUIFontSystem, 0, nullptr));
     }