Skip to content

Bound the parsed font cache #6

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

Closed
KickNext wants to merge 7 commits into from
Closed

Bound the parsed font cache #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
55b26ec
Add regression test for bounded font cache
KickNext Aug 17, 2026
4cdd7c1
Format parsed font cache regression test
KickNext Aug 17, 2026
0dd6347
Print formatter diff in CI
KickNext Aug 17, 2026
4ed791a
Apply Dart formatting to font cache test
KickNext Aug 17, 2026
bc14576
Restore strict formatting check
KickNext Aug 17, 2026
aa4641d
Use const icon fixtures in font cache regression test
KickNext Aug 17, 2026
e554267
Bound parsed OpenType font caching
KickNext Aug 17, 2026
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
21 changes: 13 additions & 8 deletions lib/src/font/font_asset_resolver.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import 'binary_reader.dart';
import 'font_selection.dart';
import 'open_type_font.dart';

const _maximumCachedFonts = 32;
const _maximumRetainedFontBytes = 32 << 20;
const _maximumCachedGlyphs = 256;
const _maximumRetainedGlyphBytes = 8 << 20;
typedef _GlyphCacheKey = (IconData, String, MorphFontSelection);
Expand All @@ -18,8 +20,11 @@ final class FontAssetResolver {

final AssetBundle bundle;
Future<List<_ManifestFamily>>? _manifest;
final Map<String, Future<OpenTypeFont>> _fonts =
<String, Future<OpenTypeFont>>{};
final SizedLruCache<String, Future<OpenTypeFont>> _fonts =
SizedLruCache<String, Future<OpenTypeFont>>(
maximumSize: _maximumCachedFonts,
maximumSizeBytes: _maximumRetainedFontBytes,
);
final SizedLruCache<_GlyphCacheKey, Future<GlyphOutline>> _glyphs =
SizedLruCache<_GlyphCacheKey, Future<GlyphOutline>>(
maximumSize: _maximumCachedGlyphs,
Expand Down Expand Up @@ -166,17 +171,17 @@ final class FontAssetResolver {
}

Future<OpenTypeFont> _loadFont(String assetKey) async {
var future = _fonts[assetKey];
var future = _fonts.get(assetKey);
if (future == null) {
future = _readFont(assetKey);
_fonts[assetKey] = future;
_fonts.put(assetKey, future);
}
try {
return await future;
final font = await future;
_fonts.updateSizeIfSame(assetKey, future, font.bytes.lengthInBytes);
return font;
} catch (_) {
if (identical(_fonts[assetKey], future)) {
_fonts.remove(assetKey);
}
_fonts.removeIfSame(assetKey, future);
rethrow;
}
}
Expand Down
60 changes: 60 additions & 0 deletions test/src/font/font_asset_resolver_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,66 @@ void main() {
expect(bundle.loadCount('assets/icons.ttf'), 1);
});

test('parsed font assets are evicted by the bounded cache', () async {
const retainedFontCount = 32;
const icons = <IconData>[
IconData(TestFontBuilder.quadraticCodePoint, fontFamily: 'Family0'),
IconData(TestFontBuilder.quadraticCodePoint, fontFamily: 'Family1'),
IconData(TestFontBuilder.quadraticCodePoint, fontFamily: 'Family2'),
IconData(TestFontBuilder.quadraticCodePoint, fontFamily: 'Family3'),
IconData(TestFontBuilder.quadraticCodePoint, fontFamily: 'Family4'),
IconData(TestFontBuilder.quadraticCodePoint, fontFamily: 'Family5'),
IconData(TestFontBuilder.quadraticCodePoint, fontFamily: 'Family6'),
IconData(TestFontBuilder.quadraticCodePoint, fontFamily: 'Family7'),
IconData(TestFontBuilder.quadraticCodePoint, fontFamily: 'Family8'),
IconData(TestFontBuilder.quadraticCodePoint, fontFamily: 'Family9'),
IconData(TestFontBuilder.quadraticCodePoint, fontFamily: 'Family10'),
IconData(TestFontBuilder.quadraticCodePoint, fontFamily: 'Family11'),
IconData(TestFontBuilder.quadraticCodePoint, fontFamily: 'Family12'),
IconData(TestFontBuilder.quadraticCodePoint, fontFamily: 'Family13'),
IconData(TestFontBuilder.quadraticCodePoint, fontFamily: 'Family14'),
IconData(TestFontBuilder.quadraticCodePoint, fontFamily: 'Family15'),
IconData(TestFontBuilder.quadraticCodePoint, fontFamily: 'Family16'),
IconData(TestFontBuilder.quadraticCodePoint, fontFamily: 'Family17'),
IconData(TestFontBuilder.quadraticCodePoint, fontFamily: 'Family18'),
IconData(TestFontBuilder.quadraticCodePoint, fontFamily: 'Family19'),
IconData(TestFontBuilder.quadraticCodePoint, fontFamily: 'Family20'),
IconData(TestFontBuilder.quadraticCodePoint, fontFamily: 'Family21'),
IconData(TestFontBuilder.quadraticCodePoint, fontFamily: 'Family22'),
IconData(TestFontBuilder.quadraticCodePoint, fontFamily: 'Family23'),
IconData(TestFontBuilder.quadraticCodePoint, fontFamily: 'Family24'),
IconData(TestFontBuilder.quadraticCodePoint, fontFamily: 'Family25'),
IconData(TestFontBuilder.quadraticCodePoint, fontFamily: 'Family26'),
IconData(TestFontBuilder.quadraticCodePoint, fontFamily: 'Family27'),
IconData(TestFontBuilder.quadraticCodePoint, fontFamily: 'Family28'),
IconData(TestFontBuilder.quadraticCodePoint, fontFamily: 'Family29'),
IconData(TestFontBuilder.quadraticCodePoint, fontFamily: 'Family30'),
IconData(TestFontBuilder.quadraticCodePoint, fontFamily: 'Family31'),
IconData(TestFontBuilder.quadraticCodePoint, fontFamily: 'Family32'),
];
final font = TestFontBuilder.trueType();
final manifest = <String, List<String>>{};
final assets = <String, Uint8List>{};
for (var index = 0; index <= retainedFontCount; index++) {
final asset = 'assets/font_$index.ttf';
manifest['Family$index'] = <String>[asset];
assets[asset] = font;
}
final bundle = TestAssetBundle.fonts(manifest: manifest, assets: assets);
final resolver = FontAssetResolver(bundle);

for (final icon in icons) {
await resolver.resolve(icon);
}
expect(bundle.loadCount('assets/font_0.ttf'), 1);

await resolver.resolve(
const IconData(TestFontBuilder.compositeCodePoint, fontFamily: 'Family0'),
);

expect(bundle.loadCount('assets/font_0.ttf'), 2);
});

test('unique glyph streams evict old decoded outlines', () async {
const glyphCount = 300;
final resolver = FontAssetResolver(aliasedFixtureBundle(glyphCount));
Expand Down