improv: use cosmic_text's persistent cached fonts

Author: hojjatabdollahi

Cargo.lock

@@ -238,8 +238,8 @@ async-std = "1.0"
 bitflags = "2.5"
 bytemuck = { version = "1.0", features = ["derive"] }
 bytes = "1.6"
-cosmic-text = "0.19"
-cryoglyph = { git = "https://github.com/iced-rs/cryoglyph.git", rev = "e429a025df36ab8145708acb309080ae3deec17a" }
+cosmic-text = { git = "https://github.com/pop-os/cosmic-text.git", rev = "4fe1195e6451d6aaa3dc383895d6fd366ea9fc7b" }
+cryoglyph = { git = "https://github.com/hojjatabdollahi/cryoglyph.git", rev = "76e8d4bcd28b92faa42a1c6107f5724a2db068aa" }
 dark-light = "1.0"
 resvg = "0.45"
 web-sys = "0.3.69"

Cargo.toml

@@ -133,7 +133,7 @@ pub fn font_system() -> &'static RwLock<FontSystem> {
 
     FONT_SYSTEM.get_or_init(|| {
         RwLock::new(FontSystem {
-            raw: cosmic_text::FontSystem::new_with_fonts([
+            raw: cosmic_text::FontSystem::new_with_fonts_and_cache([
                 cosmic_text::fontdb::Source::Binary(Arc::new(
                     include_bytes!("../fonts/Iced-Icons.ttf").as_slice(),
                 )),

graphics/src/text.rs

@@ -1,5 +1,6 @@
 use crate::core::svg;
 use crate::core::{Color, Size};
+use crate::graphics::text;
 use crate::image::atlas::{self, Atlas};
 
 use resvg::tiny_skia;
@@ -40,6 +41,7 @@ pub struct Cache {
     rasterized_hits: FxHashSet<(u64, u32, u32, ColorFilter)>,
     should_trim: bool,
     fontdb: Option<Arc<usvg::fontdb::Database>>,
+    fontdb_version: Option<text::Version>,
 }
 
 type ColorFilter = Option<[u8; 4]>;
@@ -51,12 +53,12 @@ impl Cache {
             return self.svgs.get(&handle.id()).unwrap();
         }
 
-        // TODO: Reuse `cosmic-text` font database
-        if self.fontdb.is_none() {
-            let mut fontdb = usvg::fontdb::Database::new();
-            fontdb.load_system_fonts();
+        let font_system = text::font_system().read().expect("Read font system");
+        let version = font_system.version();
 
-            self.fontdb = Some(Arc::new(fontdb));
+        if self.fontdb_version != Some(version) {
+            self.fontdb = Some(Arc::new(font_system.db().clone()));
+            self.fontdb_version = Some(version);
         }
 
         let options = usvg::Options {