Title: [181873] trunk/Source/WebCore
- Revision
- 181873
- Author
- [email protected]
- Date
- 2015-03-23 15:04:34 -0700 (Mon, 23 Mar 2015)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (181872 => 181873)
--- trunk/Source/WebCore/ChangeLog 2015-03-23 22:00:19 UTC (rev 181872)
+++ trunk/Source/WebCore/ChangeLog 2015-03-23 22:04:34 UTC (rev 181873)
@@ -1,3 +1,14 @@
+2015-03-23 Conrad Shultz <[email protected]>
+
+ 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 <[email protected]>
kCTFontSystemFontType is deprecated in CoreText
Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (181872 => 181873)
--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2015-03-23 22:00:19 UTC (rev 181872)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2015-03-23 22:04:34 UTC (rev 181873)
@@ -2178,7 +2178,7 @@
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()));
String title = attachment.attachmentElement().attachmentTitle();
@@ -2241,7 +2241,7 @@
if (subtitleText.isEmpty())
return;
- RetainPtr<CTFontRef> font = adoptCF(CTFontCreateUIFontForLanguage(kCTFontSystemFontType, attachmentSubtitleFontSize, nullptr));
+ RetainPtr<CTFontRef> font = adoptCF(CTFontCreateUIFontForLanguage(kCTFontUIFontSystem, attachmentSubtitleFontSize, nullptr));
NSDictionary *textAttributes = @{
(id)kCTFontAttributeName: (id)font.get(),
(id)kCTForegroundColorAttributeName: (NSColor *)cachedCGColor(attachmentSubtitleTextColor(), ColorSpaceDeviceRGB)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
