Add support for woffv1 and change woff feature flag names to avoid

confusion between crate names and woff format versiosns.

Author: nicoburns

apps/wpt/Cargo.toml

@@ -5,7 +5,7 @@ edition = "2024"
 license.workspace = true
 
 [dependencies]
-blitz-dom = { path = "../../packages/blitz-dom", default-features = false, features = ["svg", "woff"] }
+blitz-dom = { path = "../../packages/blitz-dom", default-features = false, features = ["svg", "woff-c"] }
 blitz-html = { path = "../../packages/blitz-html" }
 blitz-traits = { path = "../../packages/blitz-traits" }
 blitz-renderer-vello = { path = "../../packages/blitz-renderer-vello" }

packages/blitz-dom/Cargo.toml

@@ -5,11 +5,16 @@ license.workspace = true
 edition = "2024"
 
 [features]
-default = ["tracing", "svg", "woff", "clipboard", "accessibility"]
+default = ["tracing", "svg", "woff-c", "clipboard", "accessibility"]
 tracing = ["dep:tracing"]
 svg = ["dep:usvg"]
-woff = ["dep:woff"]
-woff2 = ["dep:woff2"]
+# WOFF decoding using the "woff" crate which binds to C libraries
+# ("woff" for woff2) and "sfnt2woff" for woff1).
+# Both woff1 and woff2 are supported
+woff-c = ["dep:woff"]
+# WOFF decoding using the "woff2" crate which is pure Rust
+# Only woff2 is supported. Does not work correct with all woff2 fonts
+woff-rust = ["dep:woff2"]
 clipboard = ["dep:arboard"]
 accessibility = ["accesskit"]
 

packages/blitz-dom/src/net.rs

@@ -159,12 +159,11 @@ impl NetHandler for FontFaceHandler {
             self.0 = match bytes.as_ref() {
                 // WOFF (v1) files begin with 0x774F4646 ('wOFF' in ascii)
                 // See: <https://w3c.github.io/woff/woff1/spec/Overview.html#WOFFHeader>
-                #[cfg(any(feature = "woff", feature = "woff2"))]
-                [b'w', b'O', b'F', b'F', ..] => FontFaceSourceFormatKeyword::Woff
+                #[cfg(any(feature = "woff-c", feature = "woff-rust"))]
                 [b'w', b'O', b'F', b'F', ..] => FontFaceSourceFormatKeyword::Woff,
                 // WOFF2 files begin with 0x774F4632 ('wOF2' in ascii)
                 // See: <https://w3c.github.io/woff/woff2/#woff20Header>
-                #[cfg(any(feature = "woff", feature = "woff2"))]
+                #[cfg(any(feature = "woff-c", feature = "woff-rust"))]
                 [b'w', b'O', b'F', b'2', ..] => FontFaceSourceFormatKeyword::Woff2,
                 // Opentype fonts with CFF data begin with 0x4F54544F ('OTTO' in ascii)
                 // See: <https://learn.microsoft.com/en-us/typography/opentype/spec/otff#organization-of-an-opentype-font>
@@ -180,21 +179,36 @@ impl NetHandler for FontFaceHandler {
         }
 
         // Satisfy rustc's mutability linting with woff feature both enabled/disabled
-        #[cfg(any(feature = "woff", feature = "woff2"))]
+        #[cfg(any(feature = "woff-c", feature = "woff-rust"))]
         let mut bytes = bytes;
 
         match self.0 {
-            #[cfg(any(feature = "woff", feature = "woff2"))]
+            #[cfg(feature = "woff-c")]
+            FontFaceSourceFormatKeyword::Woff => {
+                #[cfg(feature = "tracing")]
+                tracing::info!("Decompressing woff1 font");
+
+                // Use woff crate to decompress font
+                let decompressed = woff::version1::decompress(&bytes);
+
+                if let Some(decompressed) = decompressed {
+                    bytes = Bytes::from(decompressed);
+                } else {
+                    #[cfg(feature = "tracing")]
+                    tracing::warn!("Failed to decompress woff1 font");
+                }
+            }
+            #[cfg(any(feature = "woff-c", feature = "woff-rust"))]
             FontFaceSourceFormatKeyword::Woff2 => {
                 #[cfg(feature = "tracing")]
                 tracing::info!("Decompressing woff2 font");
 
                 // Use woff crate to decompress font
-                #[cfg(feature = "woff")]
+                #[cfg(feature = "woff-c")]
                 let decompressed = woff::version2::decompress(&bytes);
 
                 // Use woff2 crate to decompress font
-                #[cfg(feature = "woff2")]
+                #[cfg(feature = "woff-rust")]
                 let decompressed = woff2::decode::convert_woff2_to_ttf(&mut bytes).ok();
 
                 if let Some(decompressed) = decompressed {