Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fallback to Roboto if no suitable font is found #14061

Merged
merged 1 commit into from
Nov 28, 2019
Merged

Fallback to Roboto if no suitable font is found #14061

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 17 additions & 0 deletions lib/web_ui/lib/src/engine/compositor/fonts.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down Expand Up @@ -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'];
Expand All @@ -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;
Expand Down
13 changes: 5 additions & 8 deletions lib/web_ui/lib/src/engine/compositor/text.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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)) {
Expand Down Expand Up @@ -205,7 +201,8 @@ class SkTextStyle implements ui.TextStyle {
style['fontSize'] = fontSize;
}

if (fontFamily == null) {
if (fontFamily == null ||
!skiaFontCollection.registeredFamilies.contains(fontFamily)) {
fontFamily = 'Roboto';
}

Expand Down