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

[Skwasm] Respect the debugDisableFallbackFonts flag. #51626

Merged
auto-submit merged 2 commits into from
Mar 22, 2024
Merged

[Skwasm] Respect the debugDisableFallbackFonts flag. #51626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55c624c
Don't fetch fallback fonts when the debug flag is enabled.
eyebrowsoffire Mar 22, 2024
b639395
Update lib/web_ui/test/ui/fallback_fonts_golden_test.dart
eyebrowsoffire Mar 22, 2024
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
2 changes: 1 addition & 1 deletion lib/web_ui/lib/src/engine/skwasm/skwasm_impl/paragraph.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ class SkwasmParagraph extends SkwasmObjectWrapper<RawParagraph> implements ui.Pa
@override
void layout(ui.ParagraphConstraints constraints) {
paragraphLayout(handle, constraints.width);
if (!_hasCheckedForMissingCodePoints) {
if (!debugDisableFontFallbacks && !_hasCheckedForMissingCodePoints) {
Copy link
Member

@ditman ditman Mar 22, 2024

Choose a reason for hiding this comment

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

I find if !(debugDisableFontFallbacks || _hasCheckedForMissingCodePoints) a little bit more legible, but... it's the same.

_hasCheckedForMissingCodePoints = true;
final int missingCodePointCount = paragraphGetUnresolvedCodePoints(handle, nullptr, 0);
if (missingCodePointCount > 0) {
Expand Down
20 changes: 20 additions & 0 deletions lib/web_ui/test/ui/fallback_fonts_golden_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,6 +431,26 @@ void testMain() {
}
}
});

test('fallback fonts do not download when debugDisableFontFallbacks is set', () async {
debugDisableFontFallbacks = true;

expect(renderer.fontCollection.fontFallbackManager!.globalFontFallbacks, <String>['Roboto']);

// Creating this paragraph would cause us to start to download the
// fallback font if we didn't disable font fallbacks.
final ui.ParagraphBuilder pb = ui.ParagraphBuilder(
ui.ParagraphStyle(),
);
pb.addText('Hello 😊');
pb.build().layout(const ui.ParagraphConstraints(width: 1000));

await renderer.fontCollection.fontFallbackManager!.debugWhenIdle();

// Make sure we didn't download the fallback font.
expect(renderer.fontCollection.fontFallbackManager!.globalFontFallbacks,
isNot(contains('Noto Color Emoji')));
});
},
// HTML renderer doesn't use the fallback font manager.
skip: isHtml,
Expand Down