Skip to content

armgit / moli

Public Imported from GitHub
0

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

fix(cssom): serialize multiword font families as identifiers

ldm071a0dd38ea37
diff --git a/moli-renderer-v8/src/native_bridge/element/styles/declaration/values/cssom_accessors.rs b/moli-renderer-v8/src/native_bridge/element/styles/declaration/values/cssom_accessors.rs
index 9cf522728..a931b4d14 100644
--- a/moli-renderer-v8/src/native_bridge/element/styles/declaration/values/cssom_accessors.rs
+++ b/moli-renderer-v8/src/native_bridge/element/styles/declaration/values/cssom_accessors.rs
@@ -319,7 +319,27 @@ mod tests {
fn font_family_value_normalization_stays_renderer_local() {
assert_eq!(
normalize_style_value("font-family", "'Lucida Grande'"),
- r#""Lucida Grande""#
+ "Lucida Grande"
+ );
+ assert_eq!(
+ normalize_style_value("font-family", "'Twisty Tie'"),
+ "Twisty Tie"
+ );
+ assert_eq!(
+ normalize_style_value("font-family", "'Times New Roman'"),
+ "Times New Roman"
+ );
+ assert_eq!(
+ normalize_style_value("font-family", "'-Arial Bold'"),
+ "-Arial Bold"
+ );
+ assert_eq!(
+ normalize_style_value("font-family", "'Arial 2'"),
+ r#""Arial 2""#
+ );
+ assert_eq!(
+ normalize_style_value("font-family", "'Arial -'"),
+ r#""Arial -""#
);
assert_eq!(normalize_style_value("font-family", "'Arial'"), "Arial");
assert_eq!(normalize_style_value("font-family", "'-Arial'"), "-Arial");
diff --git a/moli-renderer-v8/src/native_bridge/element/styles/declaration/values/specified_values.rs b/moli-renderer-v8/src/native_bridge/element/styles/declaration/values/specified_values.rs
index c776303cc..23d7fec86 100644
--- a/moli-renderer-v8/src/native_bridge/element/styles/declaration/values/specified_values.rs
+++ b/moli-renderer-v8/src/native_bridge/element/styles/declaration/values/specified_values.rs
@@ -716,12 +716,14 @@ pub(super) fn normalize_cssom_font_family_value(value: &str) -> Option<String> {
fn font_family_name_can_serialize_unquoted(name: &str) -> bool {
let lowered = name.to_ascii_lowercase();
- if font_family_name_is_reserved(&lowered) {
+ if font_family_name_is_reserved(&lowered)
+ || name.chars().any(|ch| ch.is_whitespace() && ch != ' ')
+ {
return false;
}
- // Like Blink's SerializeFontFamily, only one unescaped CSS identifier
- // may lose its quotes, not a whitespace-separated identifier sequence.
- font_family_ident_is_valid(name)
+ // A family name may serialize as CSS identifiers joined by single spaces.
+ // Empty segments and names that need identifier escapes retain their quotes.
+ name.split(' ').all(font_family_ident_is_valid)
}
fn font_family_name_is_reserved(lowered: &str) -> bool {
diff --git a/moli-renderer-v8/src/script_vm/tests/dom_xhr/computed_style/computed_style_access.rs b/moli-renderer-v8/src/script_vm/tests/dom_xhr/computed_style/computed_style_access.rs
index efe19d8df..410e4b7d7 100644
--- a/moli-renderer-v8/src/script_vm/tests/dom_xhr/computed_style/computed_style_access.rs
+++ b/moli-renderer-v8/src/script_vm/tests/dom_xhr/computed_style/computed_style_access.rs
@@ -646,7 +646,7 @@ fn computed_font_family_serializes_css_fonts_generic_functions() {
assert_eq!(
result,
- r#"generic(fangsong)|-webkit-generic(fangsong)|"Times New Roman"|"34J""#
+ r#"generic(fangsong)|-webkit-generic(fangsong)|Times New Roman|"34J""#
);
}
diff --git a/moli-renderer-v8/src/script_vm/tests/dom_xhr/cssom/extracted/fonts.rs b/moli-renderer-v8/src/script_vm/tests/dom_xhr/cssom/extracted/fonts.rs
index f09aa568d..71c9bf4d5 100644
--- a/moli-renderer-v8/src/script_vm/tests/dom_xhr/cssom/extracted/fonts.rs
+++ b/moli-renderer-v8/src/script_vm/tests/dom_xhr/cssom/extracted/fonts.rs
@@ -891,6 +891,6 @@ fn live_inline_font_family_getter_normalizes_quoted_family_names() {
assert_eq!(
result,
- r#"[["\"Twisty Tie\"","\"Twisty Tie\""],["Veronica","Veronica"],["\"34J\"","\"34J\""],["\"serif\"","\"serif\""]]"#
+ r#"[["Twisty Tie","Twisty Tie"],["Veronica","Veronica"],["\"34J\"","\"34J\""],["\"serif\"","\"serif\""]]"#
);
}