Skip to content

armgit / moli

Public Imported from GitHub
0

Best headless browser for AI agents. Lite, Fast, High-Compatibility. Built in Rust

fix(fonts): normalize computed descriptor range endpoints

ldm07ebd443a190e
diff --git a/moli-renderer-v8/src/context_bootstrap/css_fontface_runtime/query/selection.rs b/moli-renderer-v8/src/context_bootstrap/css_fontface_runtime/query/selection.rs
index 92d708067..d95f05207 100644
--- a/moli-renderer-v8/src/context_bootstrap/css_fontface_runtime/query/selection.rs
+++ b/moli-renderer-v8/src/context_bootstrap/css_fontface_runtime/query/selection.rs
@@ -26,11 +26,18 @@ struct Range {
}
impl Range {
+ fn new(first: f32, second: f32) -> Self {
+ Self {
+ min: first.min(second),
+ max: first.max(second),
+ }
+ }
+
fn parse(value: &str, parse: impl Fn(&str) -> Option<f32>, initial: f32) -> Self {
let mut values = components(value).into_iter();
let min = values.next().and_then(&parse).unwrap_or(initial);
let max = values.next().and_then(parse).unwrap_or(min);
- Self { min, max }
+ Self::new(min, max)
}
fn contains(self, value: f32) -> bool {
@@ -162,7 +169,7 @@ impl Selection {
};
Self {
width: Range::parse(stretch, width_value, 100.0),
- slope: Range { min, max },
+ slope: Range::new(min, max),
weight: Range::parse(weight, weight_value, 400.0),
}
}
diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/fonts/matching.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/fonts/matching.rs
index dd4797f5c..d9bef7225 100644
--- a/moli-renderer-v8/src/script_vm/tests/browser_api/fonts/matching.rs
+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/fonts/matching.rs
@@ -1,5 +1,42 @@
use super::*;
+#[test]
+fn font_set_queries_normalize_reversed_computed_descriptor_ranges() {
+ let mut vm = new_storage_test_vm("https://font-query-reversed.test/");
+ let url = fixture_font_url();
+ vm.eval(&format!(
+ r#"
+ const bytes=Uint8Array.from(atob('{}'),c=>c.charCodeAt(0));
+ globalThis.reversed=[];
+ for(const [property,range,single,request] of [
+ ['weight','900 100','800','700'],
+ ['stretch','125% 75%','120%','expanded'],
+ ['style','oblique 30deg 10deg','oblique 20deg','oblique 15deg'],
+ ['weight','calc(800 + 100) calc(200 - 100)','800','700'],
+ ['stretch','calc(100% + 25%) calc(50% + 25%)','120%','expanded'],
+ ['style','oblique calc(15deg + 15deg) calc(5deg + 5deg)','oblique 20deg','oblique 15deg']
+ ]) {{
+ const family='Reversed'+reversed.length;
+ const good=new FontFace(family,bytes,{{[property]:range}});
+ const bad=new FontFace(family,'url(data:font/ttf;base64,AA==)',{{[property]:single}});
+ bad.loaded.catch(()=>{{}});
+ document.fonts.add(good);document.fonts.add(bad);
+ const result=[good[property],document.fonts.check(request+' 16px '+family,'A')];
+ reversed.push(result);
+ document.fonts.load(request+' 16px '+family,'A').then(
+ faces=>result.push(faces.length,faces[0]===good,bad.status),
+ error=>result.push(error.name));
+ }}
+ "#,
+ url.split_once(',').unwrap().1
+ ))
+ .unwrap();
+ assert_eq!(
+ vm.eval("JSON.stringify(reversed)").unwrap(),
+ r#"[["900 100",true,1,true,"unloaded"],["125% 75%",true,1,true,"unloaded"],["oblique 30deg 10deg",true,1,true,"unloaded"],["calc(900) calc(100)",true,1,true,"unloaded"],["calc(125%) calc(75%)",true,1,true,"unloaded"],["oblique calc(30deg) calc(10deg)",true,1,true,"unloaded"]]"#
+ );
+}
+
#[test]
fn font_set_queries_resolve_css_calculations_in_requests_and_descriptors() {
let mut vm = new_storage_test_vm("https://font-query-calculations.test/");