Changeset 181873 in webkit

Timestamp:

Mar 23, 2015, 3:04:34 PM (11 years ago)

Author:

Conrad Shultz

Message:

Replace uses of kCTFontSystemFontType
​https://bugs.webkit.org/show_bug.cgi?id=142984

Reviewed by Tim Horton.

• rendering/RenderThemeMac.mm:

(WebCore::AttachmentLayout::layOutTitle):
(WebCore::AttachmentLayout::layOutSubtitle):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderThemeMac.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-03-23  Conrad Shultz  <conrad_shultz@apple.com>
+
+        Replace uses of kCTFontSystemFontType
+        https://bugs.webkit.org/show_bug.cgi?id=142984
+
+        Reviewed by Tim Horton.
+
+        * rendering/RenderThemeMac.mm:
+        (WebCore::AttachmentLayout::layOutTitle):
+        (WebCore::AttachmentLayout::layOutSubtitle):
+
 2015-03-23  Dean Jackson  <dino@apple.com>
 

trunk/Source/WebCore/rendering/RenderThemeMac.mm

@@ -2179 +2179 @@
 void AttachmentLayout::layOutTitle(const RenderAttachment& attachment)
 {
-    RetainPtr<CTFontRef> font = adoptCF(CTFontCreateUIFontForLanguage(kCTFontSystemFontType, attachmentTitleFontSize, nullptr));
+    RetainPtr<CTFontRef> font = adoptCF(CTFontCreateUIFontForLanguage(kCTFontUIFontSystem, attachmentTitleFontSize, nullptr));
     baseline = CGRound(attachmentIconBackgroundSize + attachmentIconToTitleMargin + CTFontGetAscent(font.get()));
 
@@ -2242 +2242 @@
         return;
 
-    RetainPtr<CTFontRef> font = adoptCF(CTFontCreateUIFontForLanguage(kCTFontSystemFontType, attachmentSubtitleFontSize, nullptr));
+    RetainPtr<CTFontRef> font = adoptCF(CTFontCreateUIFontForLanguage(kCTFontUIFontSystem, attachmentSubtitleFontSize, nullptr));
     NSDictionary *textAttributes = @{
         (id)kCTFontAttributeName: (id)font.get(),