DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't crash while loading improperly formatted fonts on Safari (flutter/engine#11655)

Browse Source 
(cl/265763028)

Fixes https://github.com/flutter/flutter/issues/39259
This commit is contained in:
David Iglesias 2019-08-29 09:03:14 -07:00 committed by GitHub
parent 2b3149235c
commit 6792c2ceae
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
engine/src/flutter/lib/web_ui/lib/src/engine/text/font_collection.dart
View File

@ -123,14 +123,27 @@ class _FontManager {
String asset,
Map<String, String> descriptors,
) {
final html.FontFace fontFace = html.FontFace(family, asset, descriptors);
_fontLoadingFutures.add(fontFace
.load()
.then((_) => html.document.fonts.add(fontFace), onError: (dynamic e) {
// 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.
// See: https://drafts.csswg.org/css-fonts-3/#font-family-prop
if (browserEngine == BrowserEngine.webkit) {
family = "'$family'";
}
// try/catch because `new FontFace` can crash with an improper font family.
try {
final html.FontFace fontFace = html.FontFace(family, asset, descriptors);
_fontLoadingFutures.add(fontFace
.load()
.then((_) => html.document.fonts.add(fontFace), onError: (dynamic e) {
html.window.console
.warn('Error while trying to load font family "$family":\n$e');
return null;
}));
} catch (e) {
html.window.console
.warn('Error while trying to load font family "$family":\n$e');
return null;
}));
.warn('Error while loading font family "$family":\n$e');
}
}
/// Returns a [Future] that completes when all fonts that have been