Add font backend swash

Author: declantsien

Cargo.lock

@@ -9,14 +9,16 @@ build = "build.rs"
 edition = "2018"
 
 [features]
-default = ["static_freetype"]
+default = ["font_backend_swash"]
 profiler = ["tracy-rs/enable_profiler"]
 capture = ["api/serialize", "ron", "serde", "smallvec/serde", "etagere/serialization", "glyph_rasterizer/capture"]
 replay = ["api/deserialize", "ron", "serde", "smallvec/serde", "etagere/serialization", "glyph_rasterizer/replay"]
 display_list_stats = ["api/display_list_stats"]
 serialize_program = ["serde", "webrender_build/serialize_program"]
 dynamic_freetype = ["glyph_rasterizer/dynamic_freetype"]
 static_freetype = ["glyph_rasterizer/static_freetype"]
+font_backend_swash = ["glyph_rasterizer/backend_swash", "api/font_backend_swash"]
+font_backend_native = ["glyph_rasterizer/backend_native"]
 leak_checks = []
 gecko = ["firefox-on-glean", "glean", "glyph_rasterizer/gecko"]
 sw_compositor = ["swgl"]

webrender/Cargo.toml

@@ -2301,14 +2301,21 @@ impl ResourceCache {
                         index,
                     }
                 }
-                #[cfg(not(any(target_os = "macos", target_os = "ios")))]
+                #[cfg(feature = "font_backend_swash")]
+                FontTemplate::Native(native) => {
+                    PlainFontTemplate {
+                        data: native.0.to_string(),
+                        index: 0,
+                    }
+                }
+                #[cfg(not(any(feature = "font_backend_swash", target_os = "macos", target_os = "ios")))]
                 FontTemplate::Native(native) => {
                     PlainFontTemplate {
                         data: native.path.to_string_lossy().to_string(),
                         index: native.index,
                     }
                 }
-                #[cfg(any(target_os = "macos", target_os = "ios"))]
+                #[cfg(all(not(feature = "font_backend_swash"), any(target_os = "macos", target_os = "ios")))]
                 FontTemplate::Native(native) => {
                     PlainFontTemplate {
                         data: native.name,

webrender/src/resource_cache.rs

@@ -12,6 +12,7 @@ nightly = ["euclid/unstable", "serde/unstable"]
 serialize = []
 deserialize = []
 display_list_stats = []
+font_backend_swash = []
 
 [dependencies]
 app_units = "0.7.3"

webrender_api/Cargo.toml

@@ -5,8 +5,6 @@
 use peek_poke::PeekPoke;
 use std::cmp::Ordering;
 use std::hash::{Hash, Hasher};
-#[cfg(not(any(target_os = "macos", target_os = "ios")))]
-use std::path::PathBuf;
 use std::sync::Arc;
 // local imports
 use crate::IdNamespace;
@@ -52,14 +50,19 @@ impl FontSize {
     pub fn to_f64_px(&self) -> f64 { self.0 as f64 }
 }
 
-#[cfg(not(any(target_os = "macos", target_os = "ios")))]
+/// Using Rust crate swash and font-index over native fonts
+#[cfg(feature = "font_backend_swash")]
+#[derive(Clone, Debug, Hash, Eq, PartialEq, PartialOrd, Ord, Serialize, Deserialize)]
+pub struct NativeFontHandle(pub u32);
+
+#[cfg(not(any(feature = "font_backend_swash", target_os = "macos", target_os = "ios")))]
 #[derive(Clone, Debug, Hash, Eq, PartialEq, PartialOrd, Ord, Serialize, Deserialize)]
 pub struct NativeFontHandle {
-    pub path: PathBuf,
+    pub path: std::path::PathBuf,
     pub index: u32,
 }
 
-#[cfg(any(target_os = "macos", target_os = "ios"))]
+#[cfg(all(not(feature = "font_backend_swash"), any(target_os = "macos", target_os = "ios")))]
 #[derive(Clone, Debug, Hash, Eq, PartialEq, PartialOrd, Ord, Serialize, Deserialize)]
 pub struct NativeFontHandle {
     pub name: String,

webrender_api/src/font.rs

@@ -7,12 +7,17 @@ license = "MPL-2.0"
 edition = "2018"
 
 [features]
-default = ["static_freetype"]
+default = ["backend_swash"]
 dynamic_freetype = []
 static_freetype = ["freetype/freetype-sys"]
 capture = ["api/serialize", "serde", "smallvec/serde"]
 replay = ["api/deserialize", "serde", "smallvec/serde"]
 gecko = ["firefox-on-glean", "glean"]
+backend_swash = ["swash", "zeno", "font-index", "api/font_backend_swash"]
+backend_native = [
+  "freetype", "libc",
+  "dwrote",
+  "core-foundation", "core-graphics", "core-text", "objc"]
 
 [dependencies]
 api = { version = "0.66.0", path = "../webrender_api", package = "webrender_api" }
@@ -28,6 +33,17 @@ fxhash = "0.2.1"
 glean = { workspace = true, optional = true }
 firefox-on-glean = { version = "0.1.0", optional = true }
 serde = { optional = true, version = "1.0", features = ["serde_derive"] }
+parking_lot = { version = "0.12", optional = true }
+zeno = { version = "0.2.2", optional = true }
+
+[dependencies.swash]
+git = "https://github.com/declantsien/swash.git"
+branch = "webrender-fix"
+optional = true
+
+[dependencies.font-index]
+git = "https://github.com/declantsien/font-index.git"
+optional = true
 
 [dev-dependencies]
 env_logger = { version = "0.10", default-features = false }
@@ -38,14 +54,14 @@ rayon = "1"
 winit = "0.26"
 
 [target.'cfg(any(target_os = "android", all(unix, not(any(target_os = "macos", target_os = "ios")))))'.dependencies]
-freetype = { version = "0.7", default-features = false }
-libc = "0.2"
+freetype = { version = "0.7", default-features = false, optional = true }
+libc = {version = "0.2", optional = true}
 
 [target.'cfg(target_os = "windows")'.dependencies]
-dwrote = "0.11"
+dwrote = { version = "0.11", optional = true }
 
 [target.'cfg(any(target_os = "macos", target_os = "ios"))'.dependencies]
-core-foundation = "0.9.2"
-core-graphics = "0.23"
-core-text = { version = "20.1", default-features = false }
-objc = "0.2"
+core-foundation = {version = "0.9.2", optional = true }
+core-graphics = {version = "0.23", optional = true }
+core-text = { version = "20.1", default-features = false, optional = true }
+objc = { version = "0.2", optional = true }