Changeset 252034 in webkit
- Timestamp:
- Nov 4, 2019 7:16:01 PM (4 years ago)
- Location:
- trunk
- Files:
-
- 16 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r252033 r252034 1 2019-11-04 Myles C. Maxfield <mmaxfield@apple.com> 2 3 Rename ui-monospaced to ui-monospace to match the monospace generic font family 4 https://bugs.webkit.org/show_bug.cgi?id=203602 5 6 Reviewed by Simon Fraser. 7 8 Updated existing tests. 9 10 * fast/text/design-system-ui-12.html: 11 * fast/text/design-system-ui-15.html: 12 * fast/text/design-system-ui-2-expected.html: 13 * fast/text/design-system-ui-2.html: 14 * fast/text/design-system-ui-4-expected-mismatch.html: 15 * fast/text/design-system-ui-4.html: 16 * fast/text/design-system-ui-7-expected.html: 17 * fast/text/design-system-ui-7.html: 18 * fast/text/design-system-ui-9-expected-mismatch.html: 19 * fast/text/design-system-ui-9.html: 20 1 21 2019-11-04 Chris Dumez <cdumez@apple.com> 2 22 -
trunk/LayoutTests/fast/text/design-system-ui-12.html
r251413 r252034 5 5 <body> 6 6 <div> 7 <div style="display: inline-block; font: 72px 'ui-monospace d';">HeJllo</div>7 <div style="display: inline-block; font: 72px 'ui-monospace';">HeJllo</div> 8 8 </div> 9 9 </body> -
trunk/LayoutTests/fast/text/design-system-ui-15.html
r251413 r252034 4 4 <style> 5 5 @font-face { 6 font-family: "AppleSystemUIMonospace d";7 src: local("ui-monospace d");6 font-family: "AppleSystemUIMonospace"; 7 src: local("ui-monospace"); 8 8 } 9 9 </style> … … 11 11 <body> 12 12 <div> 13 <div style="display: inline-block; font: 72px 'AppleSystemUIMonospace d';">HeJllo</div>13 <div style="display: inline-block; font: 72px 'AppleSystemUIMonospace';">HeJllo</div> 14 14 </div> 15 15 </body> -
trunk/LayoutTests/fast/text/design-system-ui-2-expected.html
r251413 r252034 7 7 <div> 8 8 <div style="display: inline-block; font: bold 72px 'ui-serif';">HeJllo</div> 9 <div style="display: inline-block; font: bold 72px 'ui-monospace d';">HeJllo</div>9 <div style="display: inline-block; font: bold 72px 'ui-monospace';">HeJllo</div> 10 10 <div style="display: inline-block; font: bold 72px 'ui-rounded';">HeJllo</div> 11 11 <div style="display: inline-block; font: bold 72px '.AppleSystemUIFontSerif';">HeJllo</div> -
trunk/LayoutTests/fast/text/design-system-ui-2.html
r251413 r252034 7 7 <div> 8 8 <div style="display: inline-block; font: bold 72px 'ui-serif'; font-synthesis: none;">HeJllo</div> 9 <div style="display: inline-block; font: bold 72px 'ui-monospace d'; font-synthesis: none;">HeJllo</div>9 <div style="display: inline-block; font: bold 72px 'ui-monospace'; font-synthesis: none;">HeJllo</div> 10 10 <div style="display: inline-block; font: bold 72px 'ui-rounded'; font-synthesis: none;">HeJllo</div> 11 11 <div style="display: inline-block; font: bold 72px '.AppleSystemUIFontSerif'; font-synthesis: none;">HeJllo</div> -
trunk/LayoutTests/fast/text/design-system-ui-4-expected-mismatch.html
r251413 r252034 5 5 <body> 6 6 <div> 7 <div style="display: inline-block; font: 72px 'ui-monospace d'; font-synthesis: none;">HeJllo</div>7 <div style="display: inline-block; font: 72px 'ui-monospace'; font-synthesis: none;">HeJllo</div> 8 8 </div> 9 9 </body> -
trunk/LayoutTests/fast/text/design-system-ui-4.html
r251413 r252034 5 5 <body> 6 6 <div> 7 <div style="display: inline-block; font: bold 72px 'ui-monospace d'; font-synthesis: none;">HeJllo</div>7 <div style="display: inline-block; font: bold 72px 'ui-monospace'; font-synthesis: none;">HeJllo</div> 8 8 </div> 9 9 </body> -
trunk/LayoutTests/fast/text/design-system-ui-7-expected.html
r251413 r252034 8 8 } 9 9 @font-face { 10 font-family: "AppleSystemUIMonospace d";11 src: local("ui-monospace d");10 font-family: "AppleSystemUIMonospace"; 11 src: local("ui-monospace"); 12 12 } 13 13 @font-face { … … 37 37 <div> 38 38 <div style="display: inline-block; font: bold 72px 'AppleSystemUISerif';">HeJllo</div> 39 <div style="display: inline-block; font: bold 72px 'AppleSystemUIMonospace d';">HeJllo</div>39 <div style="display: inline-block; font: bold 72px 'AppleSystemUIMonospace';">HeJllo</div> 40 40 <div style="display: inline-block; font: bold 72px 'AppleSystemUIRounded';">HeJllo</div> 41 41 <div style="display: inline-block; font: bold 72px 'DotAppleSystemUIFontSerif';">HeJllo</div> -
trunk/LayoutTests/fast/text/design-system-ui-7.html
r251413 r252034 8 8 } 9 9 @font-face { 10 font-family: "AppleSystemUIMonospace d";11 src: local("ui-monospace d");10 font-family: "AppleSystemUIMonospace"; 11 src: local("ui-monospace"); 12 12 } 13 13 @font-face { … … 37 37 <div> 38 38 <div style="display: inline-block; font: bold 72px 'AppleSystemUISerif'; font-synthesis: none;">HeJllo</div> 39 <div style="display: inline-block; font: bold 72px 'AppleSystemUIMonospace d'; font-synthesis: none;">HeJllo</div>39 <div style="display: inline-block; font: bold 72px 'AppleSystemUIMonospace'; font-synthesis: none;">HeJllo</div> 40 40 <div style="display: inline-block; font: bold 72px 'AppleSystemUIRounded'; font-synthesis: none;">HeJllo</div> 41 41 <div style="display: inline-block; font: bold 72px 'DotAppleSystemUIFontSerif'; font-synthesis: none;">HeJllo</div> -
trunk/LayoutTests/fast/text/design-system-ui-9-expected-mismatch.html
r251413 r252034 4 4 <style> 5 5 @font-face { 6 font-family: "AppleSystemUIMonospace d";7 src: local("ui-monospace d");6 font-family: "AppleSystemUIMonospace"; 7 src: local("ui-monospace"); 8 8 } 9 9 </style> … … 11 11 <body> 12 12 <div> 13 <div style="display: inline-block; font: 72px 'AppleSystemUIMonospace d'; font-synthesis: none;">HeJllo</div>13 <div style="display: inline-block; font: 72px 'AppleSystemUIMonospace'; font-synthesis: none;">HeJllo</div> 14 14 </div> 15 15 </body> -
trunk/LayoutTests/fast/text/design-system-ui-9.html
r251413 r252034 4 4 <style> 5 5 @font-face { 6 font-family: "AppleSystemUIMonospace d";7 src: local("ui-monospace d");6 font-family: "AppleSystemUIMonospace"; 7 src: local("ui-monospace"); 8 8 } 9 9 </style> … … 11 11 <body> 12 12 <div> 13 <div style="display: inline-block; font: bold 72px 'AppleSystemUIMonospace d'; font-synthesis: none;">HeJllo</div>13 <div style="display: inline-block; font: bold 72px 'AppleSystemUIMonospace'; font-synthesis: none;">HeJllo</div> 14 14 </div> 15 15 </body> -
trunk/Source/WebCore/ChangeLog
r252033 r252034 1 2019-11-04 Myles C. Maxfield <mmaxfield@apple.com> 2 3 Rename ui-monospaced to ui-monospace to match the monospace generic font family 4 https://bugs.webkit.org/show_bug.cgi?id=203602 5 6 Reviewed by Simon Fraser. 7 8 As per https://github.com/w3c/csswg-drafts/issues/4469 9 10 Updated existing tests. 11 12 * platform/graphics/cocoa/FontCacheCoreText.cpp: 13 (WebCore::platformFontLookupWithFamily): 14 (WebCore::fontWithFamilySpecialCase): 15 * platform/graphics/cocoa/FontDescriptionCocoa.cpp: 16 (WebCore::matchSystemFontUse): 17 * platform/graphics/cocoa/SystemFontDatabaseCoreText.cpp: 18 (WebCore::SystemFontDatabaseCoreText::createDesignSystemUIFont): 19 (WebCore::SystemFontDatabaseCoreText::cascadeList): 20 (WebCore::SystemFontDatabaseCoreText::systemFontParameters): 21 * platform/graphics/cocoa/SystemFontDatabaseCoreText.h: 22 1 23 2019-11-04 Chris Dumez <cdumez@apple.com> 2 24 -
trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp
r251413 r252034 1207 1207 || equalLettersIgnoringASCIICase(family, ".sf ui mono") 1208 1208 || equalLettersIgnoringASCIICase(family, ".applesystemuifontrounded")) { 1209 // If you want to use these fonts, use ui-serif, ui-monospace d, and ui-rounded.1209 // If you want to use these fonts, use ui-serif, ui-monospace, and ui-rounded. 1210 1210 return { nullptr }; 1211 1211 } … … 1274 1274 if (equalLettersIgnoringASCIICase(family, "ui-serif")) 1275 1275 designSystemUI = SystemFontDatabaseCoreText::ClientUse::ForSystemUISerif; 1276 else if (equalLettersIgnoringASCIICase(family, "ui-monospace d"))1277 designSystemUI = SystemFontDatabaseCoreText::ClientUse::ForSystemUIMonospace d;1276 else if (equalLettersIgnoringASCIICase(family, "ui-monospace")) 1277 designSystemUI = SystemFontDatabaseCoreText::ClientUse::ForSystemUIMonospace; 1278 1278 else if (equalLettersIgnoringASCIICase(family, "ui-rounded")) 1279 1279 designSystemUI = SystemFontDatabaseCoreText::ClientUse::ForSystemUIRounded; -
trunk/Source/WebCore/platform/graphics/cocoa/FontDescriptionCocoa.cpp
r251413 r252034 59 59 if (equalLettersIgnoringASCIICase(string, "ui-serif")) 60 60 return SystemFontDatabaseCoreText::ClientUse::ForSystemUISerif; 61 if (equalLettersIgnoringASCIICase(string, "ui-monospace d"))62 return SystemFontDatabaseCoreText::ClientUse::ForSystemUIMonospace d;61 if (equalLettersIgnoringASCIICase(string, "ui-monospace")) 62 return SystemFontDatabaseCoreText::ClientUse::ForSystemUIMonospace; 63 63 if (equalLettersIgnoringASCIICase(string, "ui-rounded")) 64 64 return SystemFontDatabaseCoreText::ClientUse::ForSystemUIRounded; -
trunk/Source/WebCore/platform/graphics/cocoa/SystemFontDatabaseCoreText.cpp
r251413 r252034 69 69 design = kCTFontUIFontDesignSerif; 70 70 break; 71 case ClientUse::ForSystemUIMonospace d:71 case ClientUse::ForSystemUIMonospace: 72 72 design = kCTFontUIFontDesignMonospaced; 73 73 break; … … 109 109 break; 110 110 case ClientUse::ForSystemUISerif: 111 case ClientUse::ForSystemUIMonospace d:111 case ClientUse::ForSystemUIMonospace: 112 112 case ClientUse::ForSystemUIRounded: 113 113 #if HAVE(DESIGN_SYSTEM_UI_FONTS) … … 222 222 break; 223 223 } 224 case ClientUse::ForSystemUIMonospace d: {225 static NeverDestroyed<AtomString> systemUIMonospace d = AtomString("ui-monospaced", AtomString::ConstructFromLiteral);226 result.fontName = systemUIMonospace d.get();224 case ClientUse::ForSystemUIMonospace: { 225 static NeverDestroyed<AtomString> systemUIMonospace = AtomString("ui-monospace", AtomString::ConstructFromLiteral); 226 result.fontName = systemUIMonospace.get(); 227 227 break; 228 228 } -
trunk/Source/WebCore/platform/graphics/cocoa/SystemFontDatabaseCoreText.h
r247377 r252034 100 100 ForSystemUI, 101 101 ForSystemUISerif, 102 ForSystemUIMonospace d,102 ForSystemUIMonospace, 103 103 ForSystemUIRounded, 104 104 ForTextStyle
Note: See TracChangeset
for help on using the changeset viewer.