feature/fontique - softwarerenderer - Replace usage of fontdb with fontique #9405
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tronical
approved these changes
Sep 12, 2025
ogoffart
reviewed
Sep 12, 2025
internal/common/sharedfontique.rs
Outdated
| pub static COLLECTION: once_cell::sync::OnceCell<Collection> = once_cell::sync::OnceCell::new(); | ||
|
|
||
| pub fn get_collection() -> Collection { | ||
| COLLECTION.get_or_init(Default::default).clone() |
There was a problem hiding this comment.
Doesn't this clone() not copies the cache?
I think you may want to return a reference, maybe to a Mutex.
There was a problem hiding this comment.
ogoffart
approved these changes
Sep 15, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Turns out that fontique Collections have interior mutability and can be cloned, so no more
FONTDB.with_borrow_mut(...)stuff. I commented out where fontdb was used, inserted a bunch oftodo!()s and got to implementing it in fontique instead. Should be mostly good to merge though with the possible exception of error handling.When registering a font, fontique doesn't give you an error on failure but does return a list of all the fonts added. We could potentially change the registration code to error when no fonts were added: https://docs.rs/fontique/latest/fontique/struct.Collection.html#method.register_fonts.