Changeset 195150 in webkit

Timestamp:

Jan 15, 2016 2:58:45 PM (8 years ago)

Author:

mmaxfield@apple.com

Message:

[Cocoa] Font features are not applied to the system font
​https://bugs.webkit.org/show_bug.cgi?id=153053

Reviewed by Dean Jackson.

Source/WebCore:

We simply need to call preparePlatformFont() on it.

Test: fast/text/system-font-features.html

• platform/graphics/cocoa/FontCacheCoreText.cpp:

(WebCore::fontWithFamily):

LayoutTests:

• fast/text/system-font-features-expected.html: Added.
• fast/text/system-font-features.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/system-font-features-expected.html (added)
• LayoutTests/fast/text/system-font-features.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-01-15  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        [Cocoa] Font features are not applied to the system font
+        https://bugs.webkit.org/show_bug.cgi?id=153053
+
+        Reviewed by Dean Jackson.
+
+        * fast/text/system-font-features-expected.html: Added.
+        * fast/text/system-font-features.html: Added.
+
 2016-01-15  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-01-15  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        [Cocoa] Font features are not applied to the system font
+        https://bugs.webkit.org/show_bug.cgi?id=153053
+
+        Reviewed by Dean Jackson.
+
+        We simply need to call preparePlatformFont() on it.
+
+        Test: fast/text/system-font-features.html
+
+        * platform/graphics/cocoa/FontCacheCoreText.cpp:
+        (WebCore::fontWithFamily):
+
 2016-01-15  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp

@@ -677 +677 @@
     if (family.isEmpty())
         return nullptr;
-    if (auto specialCase = platformFontWithFamilySpecialCase(family, weight, desiredTraits, size))
-        return specialCase;
+
+    RetainPtr<CTFontRef> foundFont = platformFontWithFamilySpecialCase(family, weight, desiredTraits, size);
+    if (!foundFont) {
 #if ENABLE(PLATFORM_FONT_LOOKUP)
-    RetainPtr<CTFontRef> foundFont = platformFontLookupWithFamily(family, desiredTraits, weight, size);
+        foundFont = platformFontLookupWithFamily(family, desiredTraits, weight, size);
 #else
-    UNUSED_PARAM(featureSettings);
-    UNUSED_PARAM(variantSettings);
-    RetainPtr<CTFontRef> foundFont = platformFontWithFamily(family, desiredTraits, weight, textRenderingMode, size);
+        foundFont = platformFontWithFamily(family, desiredTraits, weight, textRenderingMode, size);
 #endif
+    }
     return preparePlatformFont(foundFont.get(), textRenderingMode, nullptr, nullptr, featureSettings, variantSettings);
 }