Changeset 202538 in webkit

Timestamp:

Jun 27, 2016 9:04:48 PM (8 years ago)

Author:

mmaxfield@apple.com

Message:

[macOS] Test gardening: Generic font families should not map to fonts which aren't installed
​https://bugs.webkit.org/show_bug.cgi?id=159111
<rdar://problem/25807529>

Unreviewed.

Osaka-Mono does not come preinstalled on macOS Sierra. However, many Japanese users
will have the font installed. Before setting the generic font family, we should check
to see if the font is present.

• page/cocoa/SettingsCocoa.mm:

(WebCore::osakaMonoIsInstalled):
(WebCore::Settings::initializeDefaultFontFamilies):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/cocoa/SettingsCocoa.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-06-27  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        [macOS] Test gardening: Generic font families should not map to fonts which aren't installed
+        https://bugs.webkit.org/show_bug.cgi?id=159111
+        <rdar://problem/25807529>
+
+        Unreviewed.
+
+        Osaka-Mono does not come preinstalled on macOS Sierra. However, many Japanese users
+        will have the font installed. Before setting the generic font family, we should check
+        to see if the font is present.
+
+        * page/cocoa/SettingsCocoa.mm:
+        (WebCore::osakaMonoIsInstalled):
+        (WebCore::Settings::initializeDefaultFontFamilies):
+
 2016-06-24  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/page/cocoa/SettingsCocoa.mm

@@ -52 +52 @@
 #if PLATFORM(MAC)
 
+static bool osakaMonoIsInstalled()
+{
+    int one = 1;
+    RetainPtr<CFNumberRef> yes = adoptCF(CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &one));
+    CFTypeRef keys[] = { kCTFontEnabledAttribute, kCTFontNameAttribute };
+    CFTypeRef values[] = { yes.get(), CFSTR("Osaka-Mono") };
+    RetainPtr<CFDictionaryRef> attributes = adoptCF(CFDictionaryCreate(kCFAllocatorDefault, keys, values, WTF_ARRAY_LENGTH(values), &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
+    RetainPtr<CTFontDescriptorRef> descriptor = adoptCF(CTFontDescriptorCreateWithAttributes(attributes.get()));
+    RetainPtr<CFSetRef> mandatoryAttributes = adoptCF(CFSetCreate(kCFAllocatorDefault, keys, WTF_ARRAY_LENGTH(keys), &kCFTypeSetCallBacks));
+    return adoptCF(CTFontDescriptorCreateMatchingFontDescriptor(descriptor.get(), mandatoryAttributes.get()));
+}
+
 void Settings::initializeDefaultFontFamilies()
 {
@@ -65 +77 @@
 
     setStandardFontFamily("Hiragino Mincho ProN", USCRIPT_KATAKANA_OR_HIRAGANA);
-    setFixedFontFamily("Osaka-Mono", USCRIPT_KATAKANA_OR_HIRAGANA);
+    setFixedFontFamily(osakaMonoIsInstalled() ? "Osaka-Mono" : "Hiragino Sans", USCRIPT_KATAKANA_OR_HIRAGANA);
     setSerifFontFamily("Hiragino Mincho ProN", USCRIPT_KATAKANA_OR_HIRAGANA);
     setSansSerifFontFamily("Hiragino Kaku Gothic ProN", USCRIPT_KATAKANA_OR_HIRAGANA);