Title: [227995] trunk/Source/WebCore
- Revision
- 227995
- Author
- mmaxfi...@apple.com
- Date
- 2018-02-01 20:46:23 -0800 (Thu, 01 Feb 2018)
Log Message
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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (227994 => 227995)
--- trunk/Source/WebCore/ChangeLog 2018-02-02 04:30:37 UTC (rev 227994)
+++ trunk/Source/WebCore/ChangeLog 2018-02-02 04:46:23 UTC (rev 227995)
@@ -1,3 +1,18 @@
+2018-02-01 Myles C. Maxfield <mmaxfi...@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 <you...@apple.com>
Delay service worker process creation until actually needed by SWServer
Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp (227994 => 227995)
--- trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2018-02-02 04:30:37 UTC (rev 227994)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2018-02-02 04:46:23 UTC (rev 227995)
@@ -1432,7 +1432,7 @@
{
#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
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
