Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Include firefox in check to quote font families #12288

Merged
jonahwilliams merged 4 commits into from
Sep 16, 2019
Merged

Include firefox in check to quote font families #12288

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
10fb85b
make ImageShader implement Shader
Sep 10, 2019
0754262
include firefox in check to quote fonts
Sep 14, 2019
e0a394e
Update window.dart
Sep 14, 2019
28921f0
Update font_collection.dart
Sep 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions lib/web_ui/lib/src/engine/text/font_collection.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,11 +123,11 @@ class _FontManager {
String asset,
Map<String, String> descriptors,
) {
// Safari crashes if you create a [html.FontFace] with a font family that
// is not correct CSS syntax. To ensure the font family is accepted on
// Safari, wrap it in quotes.
// Safari and Firefox crashes if you create a [html.FontFace] with a font
Copy link
Contributor

@harryterkelsen harryterkelsen Sep 16, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

crashes -> crash

Copy link
Contributor Author

@jonahwilliams jonahwilliams Sep 16, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

// family that is not correct CSS syntax. To ensure the font family is
// accepted on these browsers, wrap it in quotes.
// See: https://drafts.csswg.org/css-fonts-3/#font-family-prop
if (browserEngine == BrowserEngine.webkit) {
if (browserEngine == BrowserEngine.webkit || browserEngine == BrowserEngine.firefox) {
family = "'$family'";
}
// try/catch because `new FontFace` can crash with an improper font family.
Expand Down