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

Fallback to Roboto if no suitable font is found (flutter/engine#14061)

Browse Source
This commit is contained in:
Harry Terkelsen 2019-11-27 17:20:28 -08:00 committed by GitHub
parent ca9e7fc470
commit d3e9ea14e1
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
engine/src/flutter/lib/web_ui/lib/src/engine/compositor/fonts.dart
View File

@ -4,9 +4,14 @@
part of engine;
const String _robotoUrl =
'http://fonts.gstatic.com/s/roboto/v20/KFOmCnqEu92Fr1Me5WZLCzYlKw.ttf';
class SkiaFontCollection {
final List<Future<ByteBuffer>> _loadingFontBuffers = <Future<ByteBuffer>>[];
final Set<String> registeredFamilies = <String>{};
Future<void> ensureFontsLoaded() async {
final List<Uint8List> fontBuffers =
(await Future.wait<ByteBuffer>(_loadingFontBuffers))
@ -46,6 +51,8 @@ class SkiaFontCollection {
final String family = fontFamily['family'];
final List<dynamic> fontAssets = fontFamily['fonts'];
registeredFamilies.add(family);
for (dynamic fontAssetItem in fontAssets) {
final Map<String, dynamic> fontAsset = fontAssetItem;
final String asset = fontAsset['asset'];
@ -54,6 +61,16 @@ class SkiaFontCollection {
.then((dynamic fetchResult) => fetchResult.arrayBuffer()));
}
}
/// We need a default fallback font for CanvasKit, in order to
/// avoid crashing while laying out text with an unregistered font. We chose
/// Roboto to match Android.
if (!registeredFamilies.contains('Roboto')) {
// Download Roboto and add it to the font buffers.
_loadingFontBuffers.add(html.window
.fetch(_robotoUrl)
.then((dynamic fetchResult) => fetchResult.arrayBuffer()));
}
}
js.JsObject skFontMgr;

13
engine/src/flutter/lib/web_ui/lib/src/engine/compositor/text.dart
View File

@ -9,17 +9,12 @@ part of engine;
/// fonts. CanvasKit reads the font name from the font's bytes. So, we map
/// some common family names to how they are registered in the Gallery app.
const Map<String, String> _fontFamilyOverrides = <String, String>{
'Roboto': 'Google Sans',
'GoogleSans': 'Google Sans',
'GoogleSansDisplay': 'Google Sans Display',
'MaterialIcons': 'Material Icons',
'LibreFranklin': 'LibreFranklin',
'LibreFranklin': 'Libre Franklin',
'AbrilFatface': 'Abril Fatface',
'packages/cupertino_icons/CupertinoIcons': 'CupertinoIcons',
'.SF Pro Text': 'Google Sans',
'.SF Pro Display': 'Google Sans',
'.SF UI Text': 'Google Sans',
'.SF UI Display': 'Google Sans',
};
class SkParagraphStyle implements ui.ParagraphStyle {
@ -71,7 +66,8 @@ class SkParagraphStyle implements ui.ParagraphStyle {
skTextStyle['fontSize'] = fontSize;
}
if (fontFamily == null) {
if (fontFamily == null ||
!skiaFontCollection.registeredFamilies.contains(fontFamily)) {
fontFamily = 'Roboto';
}
if (_fontFamilyOverrides.containsKey(fontFamily)) {
@ -205,7 +201,8 @@ class SkTextStyle implements ui.TextStyle {
style['fontSize'] = fontSize;
}
if (fontFamily == null) {
if (fontFamily == null ||
!skiaFontCollection.registeredFamilies.contains(fontFamily)) {
fontFamily = 'Roboto';
}