Test fix after r227848.
authormmaxfield@apple.com <mmaxfield@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 2 Feb 2018 04:46:23 +0000 (04:46 +0000)
committermmaxfield@apple.com <mmaxfield@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 2 Feb 2018 04:46:23 +0000 (04:46 +0000)
https://bugs.webkit.org/show_bug.cgi?id=180951

Unreviewed.

Using kCTFontNameAttribute on an in-memory font causes CTFontDescriptorCreateMatchingFontDescriptor()
to return nullptr. Luckily, we weren't using that attribute anyway.

Covered by existing tests.

* platform/graphics/cocoa/FontCacheCoreText.cpp:
(WebCore::mandatoryAttributesForUserInstalledFonts):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@227995 268f45cc-cd09-0410-ab3c-d52691b4dbfc

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

index b392cc0..e347a26 100644 (file)
@@ -1,3 +1,18 @@
+2018-02-01  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        Test fix after r227848.
+        https://bugs.webkit.org/show_bug.cgi?id=180951
+
+        Unreviewed.
+
+        Using kCTFontNameAttribute on an in-memory font causes CTFontDescriptorCreateMatchingFontDescriptor()
+        to return nullptr. Luckily, we weren't using that attribute anyway.
+
+        Covered by existing tests.
+
+        * platform/graphics/cocoa/FontCacheCoreText.cpp:
+        (WebCore::mandatoryAttributesForUserInstalledFonts):
+
 2018-02-01  Youenn Fablet  <youenn@apple.com>
 
         Delay service worker process creation until actually needed by SWServer
index bc97ea9..225b097 100644 (file)
@@ -1432,7 +1432,7 @@ RetainPtr<CFSetRef> mandatoryAttributesForUserInstalledFonts(AllowUserInstalledF
 {
 #if CAN_DISALLOW_USER_INSTALLED_FONTS
     if (allowUserInstalledFonts == AllowUserInstalledFonts::No) {
-        CFTypeRef mandatoryAttributesValues[] = { kCTFontFamilyNameAttribute, kCTFontPostScriptNameAttribute, kCTFontNameAttribute, kCTFontEnabledAttribute, kCTFontUserInstalledAttribute, kCTFontFallbackOptionAttribute };
+        CFTypeRef mandatoryAttributesValues[] = { kCTFontFamilyNameAttribute, kCTFontPostScriptNameAttribute, kCTFontEnabledAttribute, kCTFontUserInstalledAttribute, kCTFontFallbackOptionAttribute };
         return adoptCF(CFSetCreate(kCFAllocatorDefault, mandatoryAttributesValues, WTF_ARRAY_LENGTH(mandatoryAttributesValues), &kCFTypeSetCallBacks));
     }
 #else