Best headless browser for AI agents. Lite, Fast, High-Compatibility. Built in Rust
Rust ai-agentsai-toolsbrowserbrowser-automationcloud-browserheadlessheadless-browserkitesurfplaywrightpuppeteerrustservoweb-crawlerweb-crawlingweb-scraperweb-scraping
fix(cssom): preserve required font-family quotes
ldm0ab4dcb281d22
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.rsindex 53a1ea758..9cf522728 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,8 +319,13 @@ mod tests {fn font_family_value_normalization_stays_renderer_local() {assert_eq!(normalize_style_value("font-family", "'Lucida Grande'"),- "Lucida Grande"+ r#""Lucida Grande""#);+ assert_eq!(normalize_style_value("font-family", "'Arial'"), "Arial");+ assert_eq!(normalize_style_value("font-family", "'-Arial'"), "-Arial");+ assert_eq!(normalize_style_value("font-family", "'-'"), r#""-""#);+ assert_eq!(normalize_style_value("font-family", "'--'"), r#""--""#);+ assert_eq!(normalize_style_value("font-family", "'-1'"), r#""-1""#);assert_eq!(normalize_style_value("font-family", "'34J'"), r#""34J""#);assert_eq!(normalize_style_value("font-family", "'serif'"),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.rsindex e00b1fe09..785c80577 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@@ -649,17 +649,13 @@ pub(super) fn normalize_cssom_font_family_value(value: &str) -> Option<String> {}fn font_family_name_can_serialize_unquoted(name: &str) -> bool {- if name.is_empty()- || name.trim() != name- || name.chars().any(|ch| ch.is_whitespace() && ch != ' ')- {- return false;- }let lowered = name.to_ascii_lowercase();if font_family_name_is_reserved(&lowered) {return false;}- name.split(' ').all(font_family_ident_is_valid)+ // 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)}fn font_family_name_is_reserved(lowered: &str) -> bool {@@ -689,16 +685,17 @@ fn font_family_name_is_reserved(lowered: &str) -> bool {fn font_family_ident_is_valid(ident: &str) -> bool {let mut chars = ident.chars();- let Some(first) = chars.next() else {+ let Some(mut first) = chars.next() else {return false;};- if first.is_ascii_digit() {- return false;- }- if first == '-' && chars.clone().next().is_some_and(|ch| ch.is_ascii_digit()) {- return false;+ if first == '-' {+ let Some(next) = chars.next() else {+ return false;+ };+ first = next;}- font_family_ident_char_is_valid(first) && chars.all(font_family_ident_char_is_valid)+ (first.is_ascii_alphabetic() || first == '_' || !first.is_ascii())+ && chars.all(font_family_ident_char_is_valid)}fn font_family_ident_char_is_valid(ch: char) -> 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.rsindex 410e4b7d7..efe19d8df 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.rsindex 71c9bf4d5..f09aa568d 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\""]]"#);}