Changeset 252710 in webkit
- Timestamp:
- Nov 20, 2019 2:29:44 PM (4 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r252706 r252710 1 2019-11-20 Myles C. Maxfield <mmaxfield@apple.com> 2 3 [Cocoa] Add ui-sans-serif as a sibling to ui-serif, ui-monospace, and ui-rounded 4 https://bugs.webkit.org/show_bug.cgi?id=204188 5 6 Reviewed by Simon Fraser. 7 8 * fast/text/design-system-ui-sans-serif-expected.html: Added. 9 * fast/text/design-system-ui-sans-serif.html: Added. 10 1 11 2019-11-20 Truitt Savell <tsavell@apple.com> 2 12 -
trunk/Source/WebCore/ChangeLog
r252702 r252710 1 2019-11-20 Myles C. Maxfield <mmaxfield@apple.com> 2 3 [Cocoa] Add ui-sans-serif as a sibling to ui-serif, ui-monospace, and ui-rounded 4 https://bugs.webkit.org/show_bug.cgi?id=204188 5 6 Reviewed by Simon Fraser. 7 8 As per https://github.com/w3c/csswg-drafts/commit/cd0059a32a74c5a48630ce7c77292642dac70fd9#diff-dd2d54c50c872e1e303daebd4794d642 9 10 Test: fast/text/design-system-ui-sans-serif.html 11 12 * platform/graphics/cocoa/FontCacheCoreText.cpp: 13 (WebCore::fontWithFamilySpecialCase): 14 * platform/graphics/cocoa/FontDescriptionCocoa.cpp: 15 (WebCore::matchSystemFontUse): 16 1 17 2019-11-19 Brian Burg <bburg@apple.com> 2 18 -
trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp
r252034 r252710 1270 1270 static RetainPtr<CTFontRef> fontWithFamilySpecialCase(const AtomString& family, const FontDescription& fontDescription, float size, AllowUserInstalledFonts allowUserInstalledFonts) 1271 1271 { 1272 Optional<SystemFontDatabaseCoreText::ClientUse> designSystemUI; 1273 1272 1274 #if HAVE(DESIGN_SYSTEM_UI_FONTS) 1273 Optional<SystemFontDatabaseCoreText::ClientUse> designSystemUI;1274 1275 if (equalLettersIgnoringASCIICase(family, "ui-serif")) 1275 1276 designSystemUI = SystemFontDatabaseCoreText::ClientUse::ForSystemUISerif; … … 1278 1279 else if (equalLettersIgnoringASCIICase(family, "ui-rounded")) 1279 1280 designSystemUI = SystemFontDatabaseCoreText::ClientUse::ForSystemUIRounded; 1281 #endif 1282 1283 if (equalLettersIgnoringASCIICase(family, "ui-sans-serif")) { 1284 ASSERT(!designSystemUI); 1285 designSystemUI = SystemFontDatabaseCoreText::ClientUse::ForSystemUI; 1286 } 1280 1287 1281 1288 if (designSystemUI) { … … 1284 1291 return createFontForInstalledFonts(cascadeList[0].get(), size, allowUserInstalledFonts); 1285 1292 } 1286 #else1287 UNUSED_PARAM(family);1288 UNUSED_PARAM(fontDescription);1289 UNUSED_PARAM(size);1290 UNUSED_PARAM(allowUserInstalledFonts);1291 #endif1292 1293 1293 1294 return nullptr; -
trunk/Source/WebCore/platform/graphics/cocoa/FontDescriptionCocoa.cpp
r252034 r252710 53 53 || equalLettersIgnoringASCIICase(string, "-apple-system") 54 54 || equalLettersIgnoringASCIICase(string, "-apple-system-font") 55 || equalLettersIgnoringASCIICase(string, "system-ui")) 55 || equalLettersIgnoringASCIICase(string, "system-ui") 56 || equalLettersIgnoringASCIICase(string, "ui-sans-serif")) 56 57 return SystemFontDatabaseCoreText::ClientUse::ForSystemUI; 57 58
Note: See TracChangeset
for help on using the changeset viewer.