From e98da919c28bf9fe0be4bb0cb2fa44c97e2ac01b Mon Sep 17 00:00:00 2001 From: ldm0 Date: Fri, 13 Nov 2026 03:47:41 +0800 Subject: [PATCH] perf(html): select frame escaping once per text value --- .../src/native/html_serialization/engine.rs | 126 ++++++++++++++++-- .../child_frame_snapshots/document_lookup.rs | 3 +- .../src/runtime/page_vm/tests/html_dump.rs | 30 +++++ 3 files changed, 147 insertions(+), 12 deletions(-) diff --git a/moli-dom/src/native/html_serialization/engine.rs b/moli-dom/src/native/html_serialization/engine.rs index 369f2b4352c..73ebee6dc6d 100644 --- a/moli-dom/src/native/html_serialization/engine.rs +++ b/moli-dom/src/native/html_serialization/engine.rs @@ -101,6 +101,7 @@ impl HtmlSerializationSink for String { } } +#[inline] fn escape_html_text(value: &str, out: &mut S) where S: HtmlSerializationSink + ?Sized, @@ -119,6 +120,7 @@ where } } +#[inline] fn escape_html_attribute(value: &str, out: &mut S) where S: HtmlSerializationSink + ?Sized, @@ -138,15 +140,17 @@ where } } -fn serialize_cdata_section(value: &str, out: &mut S, raw_text_parent: bool, html_document: bool) -where - S: HtmlSerializationSink + ?Sized, -{ +fn serialize_cdata_section( + value: &str, + out: &mut HtmlEscapingWriter<'_, S, EMBEDDED>, + raw_text_parent: bool, + html_document: bool, +) { if html_document { if raw_text_parent { out.push_str(value); } else { - escape_html_text(value, out); + out.text(value); } } else { out.push_str(" { attribute_depth: usize, } +impl HtmlEscapingWriter<'_, S, EMBEDDED> { + // Choose once per value. Ordinary text must not pay a frame-depth branch + // for every character just because another node embeds a Document. + #[inline] + fn text(&mut self, value: &str) { + if EMBEDDED && let [byte] = value.as_bytes() { + match byte { + b'&' => self.push_str("&"), + b'<' => self.push_str("<"), + b'>' => self.push_str(">"), + b'"' => self.push('"'), + _ => self.sink.push(char::from(*byte)), + } + return; + } + if EMBEDDED && self.attribute_depth == 0 { + escape_html_text(value, self.sink); + } else { + escape_html_text(value, self); + } + } + + #[inline] + fn attribute(&mut self, value: &str) { + if EMBEDDED && self.attribute_depth == 0 { + escape_html_attribute(value, self.sink); + } else { + escape_html_attribute(value, self); + } + } +} + impl HtmlSerializationSink for HtmlEscapingWriter<'_, S, EMBEDDED> { @@ -378,7 +414,7 @@ impl<'dom, S: HtmlSerializationSink, const EMBEDDED: bool, const POLICY: bool> .any(|a| a.namespace().is_empty() && a.local_name() == "is") { self.out.push_str(" is=\""); - escape_html_attribute(name, &mut self.out); + self.out.attribute(name); self.out.push('"'); } // Filtering happens before lookup; excluded ancestors never @@ -435,7 +471,7 @@ impl<'dom, S: HtmlSerializationSink, const EMBEDDED: bool, const POLICY: bool> ) { self.out.push_str(text.data()); } else { - escape_html_text(text.data(), &mut self.out); + self.out.text(text.data()); } } NodeData::CDataSection(cdata) => serialize_cdata_section( @@ -532,7 +568,7 @@ impl<'dom, S: HtmlSerializationSink, const EMBEDDED: bool, const POLICY: bool> if attribute.name_matches("data-moli-frame-url") { state.wrote_url = true; self.out.push_str(" data-moli-frame-url=\""); - escape_html_attribute(&state.embedded.url, &mut self.out); + self.out.attribute(&state.embedded.url); self.out.push('"'); } else if self .options @@ -549,7 +585,7 @@ impl<'dom, S: HtmlSerializationSink, const EMBEDDED: bool, const POLICY: bool> } if !state.wrote_url { self.out.push_str(" data-moli-frame-url=\""); - escape_html_attribute(&state.embedded.url, &mut self.out); + self.out.attribute(&state.embedded.url); self.out.push('"'); } self.end_open_element(state.owner); @@ -590,11 +626,15 @@ fn replacement_attribute<'a>( .find(|a| attribute_key_eq(a, attribute)) .unwrap_or(attribute) } -fn serialize_attribute(attribute: &super::super::Attribute, out: &mut S) { +#[inline(always)] +fn serialize_attribute( + attribute: &super::super::Attribute, + out: &mut HtmlEscapingWriter<'_, S, EMBEDDED>, +) { out.push(' '); attribute.push_html_serialized_name(|part| out.push_str(part)); out.push_str("=\""); - escape_html_attribute(attribute.value(), out); + out.attribute(attribute.value()); out.push('"'); } @@ -840,6 +880,70 @@ pub(super) fn serialize_html_with_limit( mod escaping_tests { use super::*; + #[test] + fn single_byte_text_keeps_text_and_nested_attribute_escaping() { + for byte in 0..=127 { + let value = char::from(byte).to_string(); + let mut expected = String::new(); + escape_html_text(&value, &mut expected); + for depth in 0..8 { + let mut output = String::new(); + HtmlEscapingWriter::<_, true> { + sink: &mut output, + attribute_depth: depth, + } + .text(&value); + assert_eq!(output, expected, "byte={byte}, depth={depth}"); + let mut next = String::new(); + escape_html_attribute(&expected, &mut next); + expected = next; + } + } + } + + #[test] + fn value_escaping_preserves_rules_and_limits_at_each_embedding_depth() { + let value = "prefix<&>\"\u{a0}雪🙂tail"; + let mut expected_text = "prefix<&>\" 雪🙂tail".to_owned(); + let mut expected_attribute = "prefix<&>" 雪🙂tail".to_owned(); + for depth in 0..8 { + let expected = format!("{expected_text}{expected_attribute}"); + let mut output = String::new(); + let mut writer = HtmlEscapingWriter::<_, true> { + sink: &mut output, + attribute_depth: depth, + }; + writer.text(value); + writer.attribute(value); + assert_eq!(output, expected, "depth={depth}"); + for limit in [0, expected.len() - 1, expected.len()] { + let mut output = BoundedHtmlSerialization::new(limit); + let mut writer = HtmlEscapingWriter::<_, true> { + sink: &mut output, + attribute_depth: depth, + }; + writer.text(value); + writer.attribute(value); + if limit < expected.len() { + assert_eq!( + output.finish(), + Err(HtmlSerializationLimitExceeded { max_bytes: limit }) + ); + } else { + assert_eq!(output.finish().unwrap(), expected); + } + } + for value in [&mut expected_text, &mut expected_attribute] { + *value = value + .replace('&', "&") + .replace('<', "<") + .replace('>', ">") + .replace('"', """) + .replace('\u{a0}', " "); + } + } + } + #[test] fn fixed_depth_writer_matches_repeated_attribute_escaping_for_unicode_and_token_splits() { let mut seed = 1_u64; diff --git a/moli-renderer-v8/src/native_bridge/context_host/child_frame_snapshots/document_lookup.rs b/moli-renderer-v8/src/native_bridge/context_host/child_frame_snapshots/document_lookup.rs index 0a0b88681b3..fd2ed932d7b 100644 --- a/moli-renderer-v8/src/native_bridge/context_host/child_frame_snapshots/document_lookup.rs +++ b/moli-renderer-v8/src/native_bridge/context_host/child_frame_snapshots/document_lookup.rs @@ -43,7 +43,8 @@ impl PageScriptHost { document, &scripting, policy, - with_frames.then_some(self as &dyn HtmlEmbeddedDocumentProvider), + (with_frames && !self.child_browsing_context_document_handles.is_empty()) + .then_some(self as &dyn HtmlEmbeddedDocumentProvider), max_bytes, ) } diff --git a/moli-renderer-v8/src/runtime/page_vm/tests/html_dump.rs b/moli-renderer-v8/src/runtime/page_vm/tests/html_dump.rs index acf7583e1fb..dc15c1c2e7c 100644 --- a/moli-renderer-v8/src/runtime/page_vm/tests/html_dump.rs +++ b/moli-renderer-v8/src/runtime/page_vm/tests/html_dump.rs @@ -1,6 +1,36 @@ use super::*; use crate::runtime::page_surface::{RendererContentStripOptions, RendererHtmlSerializeOptions}; +#[tokio::test(flavor = "current_thread")] +async fn html_dump_without_child_documents_preserves_shadows_and_output_limits() { + run_page_vm_async_test(async move { + let loader = crate::network::ResourceRequestClient::new(&FetchConfig::default()).unwrap(); + let mut page = test_page_vm_with_loader_and_document_url( + &loader, + Vec::new(), + Url::parse("https://example.test/").unwrap(), + ); + page.vm_mut().eval(r#" + document.body.innerHTML = '

BEFORE & text

AFTER

'; + document.getElementById('host').attachShadow({mode:'closed'}).innerHTML = 'SHADOW'; + "#).unwrap(); + let expected = page.serialize_html(Default::default()).unwrap(); + assert!(expected.contains("BEFORE & text") && expected.contains("SHADOW")); + assert!(expected.contains("title=\"&"\"")); + let options = RendererHtmlSerializeOptions { + with_frames: true, + max_output_bytes: Some(expected.len()), + ..Default::default() + }; + assert_eq!(page.serialize_html(options).unwrap(), expected); + assert!(page.serialize_html(RendererHtmlSerializeOptions { + max_output_bytes: Some(expected.len() - 1), + ..options + }).is_err()); + assert_eq!(page.serialize_html(options).unwrap(), expected); + }).await; +} + #[tokio::test(flavor = "current_thread")] async fn html_dump_reads_live_frames_and_keeps_dom_indices_and_observers_unchanged() { run_page_vm_async_test(async move {