Skip to content

armgit / moli

Public Imported from GitHub
0

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

perf(layout): answer specialized geometry queries once

ldm043dd80a89042
diff --git a/moli-layout/src/layout_tree/query.rs b/moli-layout/src/layout_tree/query.rs
index 3d297345b..143cb68da 100644
--- a/moli-layout/src/layout_tree/query.rs
+++ b/moli-layout/src/layout_tree/query.rs
@@ -211,63 +211,67 @@ where
let answers = batch
.queries
.iter()
- .map(|query| match query {
- LayoutQuery::DocumentMetrics => {
- LayoutQueryAnswer::DocumentMetrics(LayoutDocumentMetrics {
- viewport: self.viewport,
- viewport_scroll: self.viewport_scroll,
- content_size: self.content_size,
- })
- }
- LayoutQuery::BoxModel { source } => {
- LayoutQueryAnswer::BoxModel(self.box_model_for_source(*source))
- }
- LayoutQuery::ClientRects { source } => {
- LayoutQueryAnswer::ClientRects(self.client_rects_for_source(*source))
- }
- LayoutQuery::ContentQuads { source } => {
- LayoutQueryAnswer::ContentQuads(self.content_quads_for_source(*source))
- }
- LayoutQuery::TextRangeRects {
- source,
- utf16_range,
- } => LayoutQueryAnswer::TextRangeRects(
- self.text_range_rects(*source, utf16_range.clone()),
- ),
- LayoutQuery::ElementMetrics { source } => {
- LayoutQueryAnswer::ElementMetrics(self.element_metrics_for_source(*source))
- }
- LayoutQuery::UsedGridTracks { source } => {
- LayoutQueryAnswer::UsedGridTracks(self.used_grid_tracks_for_source(*source))
- }
- LayoutQuery::ScrollIntoViewGeometry { source } => {
- LayoutQueryAnswer::ScrollIntoViewGeometry(
- self.scroll_into_view_geometry_for_source(*source),
- )
- }
- LayoutQuery::IntersectionGeometry { target, root } => {
- LayoutQueryAnswer::IntersectionGeometry(
- self.intersection_geometry(*target, *root),
- )
- }
- LayoutQuery::HitTest {
- point,
- ignore_pointer_events_none,
- } => LayoutQueryAnswer::HitTest(self.hit_test(*point, *ignore_pointer_events_none)),
- LayoutQuery::HitTestAll {
- point,
- ignore_pointer_events_none,
- } => LayoutQueryAnswer::HitTestAll(
- self.hit_test_all(*point, *ignore_pointer_events_none),
- ),
- LayoutQuery::CaretPosition { point } => {
- LayoutQueryAnswer::CaretPosition(self.caret_position(*point))
- }
- LayoutQuery::EventOffset { source, point } => {
- LayoutQueryAnswer::EventOffset(self.event_offset_for_source(*source, *point))
- }
- })
+ .map(|query| self.answer_query(query))
.collect();
LayoutAnswers { answers, metrics }
}
+
+ /// Answers one query without allocating a batch. Consumers can specialize
+ /// selected queries without first computing and discarding their defaults.
+ pub fn answer_query(&self, query: &LayoutQuery<N>) -> LayoutQueryAnswer<N> {
+ match query {
+ LayoutQuery::DocumentMetrics => {
+ LayoutQueryAnswer::DocumentMetrics(LayoutDocumentMetrics {
+ viewport: self.viewport,
+ viewport_scroll: self.viewport_scroll,
+ content_size: self.content_size,
+ })
+ }
+ LayoutQuery::BoxModel { source } => {
+ LayoutQueryAnswer::BoxModel(self.box_model_for_source(*source))
+ }
+ LayoutQuery::ClientRects { source } => {
+ LayoutQueryAnswer::ClientRects(self.client_rects_for_source(*source))
+ }
+ LayoutQuery::ContentQuads { source } => {
+ LayoutQueryAnswer::ContentQuads(self.content_quads_for_source(*source))
+ }
+ LayoutQuery::TextRangeRects {
+ source,
+ utf16_range,
+ } => LayoutQueryAnswer::TextRangeRects(
+ self.text_range_rects(*source, utf16_range.clone()),
+ ),
+ LayoutQuery::ElementMetrics { source } => {
+ LayoutQueryAnswer::ElementMetrics(self.element_metrics_for_source(*source))
+ }
+ LayoutQuery::UsedGridTracks { source } => {
+ LayoutQueryAnswer::UsedGridTracks(self.used_grid_tracks_for_source(*source))
+ }
+ LayoutQuery::ScrollIntoViewGeometry { source } => {
+ LayoutQueryAnswer::ScrollIntoViewGeometry(
+ self.scroll_into_view_geometry_for_source(*source),
+ )
+ }
+ LayoutQuery::IntersectionGeometry { target, root } => {
+ LayoutQueryAnswer::IntersectionGeometry(self.intersection_geometry(*target, *root))
+ }
+ LayoutQuery::HitTest {
+ point,
+ ignore_pointer_events_none,
+ } => LayoutQueryAnswer::HitTest(self.hit_test(*point, *ignore_pointer_events_none)),
+ LayoutQuery::HitTestAll {
+ point,
+ ignore_pointer_events_none,
+ } => LayoutQueryAnswer::HitTestAll(
+ self.hit_test_all(*point, *ignore_pointer_events_none),
+ ),
+ LayoutQuery::CaretPosition { point } => {
+ LayoutQueryAnswer::CaretPosition(self.caret_position(*point))
+ }
+ LayoutQuery::EventOffset { source, point } => {
+ LayoutQueryAnswer::EventOffset(self.event_offset_for_source(*source, *point))
+ }
+ }
+ }
}
diff --git a/moli-layout/tests/phase5_output_contract.rs b/moli-layout/tests/phase5_output_contract.rs
index 57d7783b2..271f032e4 100644
--- a/moli-layout/tests/phase5_output_contract.rs
+++ b/moli-layout/tests/phase5_output_contract.rs
@@ -2090,12 +2090,18 @@ fn pass_result_owns_complete_box_models_and_answers_a_batch_from_one_pass() {
LayoutRect::new(0.0, 0.0, 120.0, 80.0),
);
- let answers = output.answer_queries(&LayoutQueryBatch::new(vec![
+ let queries = LayoutQueryBatch::new(vec![
LayoutQuery::DocumentMetrics,
LayoutQuery::BoxModel { source: 0 },
LayoutQuery::ClientRects { source: 0 },
- ]));
- assert_eq!(answers.answers.len(), 3);
+ LayoutQuery::ElementMetrics { source: 0 },
+ LayoutQuery::ElementMetrics { source: usize::MAX },
+ ]);
+ let answers = output.answer_queries(&queries);
+ assert_eq!(answers.answers.len(), 5);
+ for (query, answer) in queries.queries.iter().zip(&answers.answers) {
+ assert_eq!(&output.tree.answer_query(query), answer);
+ }
assert_eq!(answers.metrics.reason, LayoutFlushReason::Test);
assert_eq!(answers.metrics.box_count, output.boxes.len());
assert!(matches!(
@@ -2110,6 +2116,11 @@ fn pass_result_owns_complete_box_models_and_answers_a_batch_from_one_pass() {
&answers.answers[2],
LayoutQueryAnswer::ClientRects(rects) if rects.len() == 1
));
+ assert!(matches!(
+ answers.answers[3],
+ LayoutQueryAnswer::ElementMetrics(Some(_))
+ ));
+ assert_eq!(answers.answers[4], LayoutQueryAnswer::ElementMetrics(None));
}
#[test]
diff --git a/moli-renderer-v8/src/native_bridge/context_host/layout.rs b/moli-renderer-v8/src/native_bridge/context_host/layout.rs
index 256ca0e23..47b34531d 100644
--- a/moli-renderer-v8/src/native_bridge/context_host/layout.rs
+++ b/moli-renderer-v8/src/native_bridge/context_host/layout.rs
@@ -455,29 +455,31 @@ impl JsContextHost {
viewport: LayoutViewport,
queries: &LayoutQueryBatch<DomHandle>,
) -> LayoutAnswers<DomHandle> {
- let mut answers = tree.answer_queries(queries, metrics);
- for (query, answer) in queries.queries.iter().zip(&mut answers.answers) {
- match (query, answer) {
- (LayoutQuery::DocumentMetrics, LayoutQueryAnswer::DocumentMetrics(metrics)) => {
+ let answers = queries
+ .queries
+ .iter()
+ .map(|query| match query {
+ LayoutQuery::DocumentMetrics => {
// The content extent and scroll position are sampled
// geometry, but the viewport is explicit browser state.
// Window/viewport protocol commands must observe a resize
// immediately without forcing a new layout pass.
- metrics.viewport = viewport;
+ LayoutQueryAnswer::DocumentMetrics(moli_layout::LayoutDocumentMetrics {
+ viewport,
+ viewport_scroll: tree.viewport_scroll,
+ content_size: tree.content_size,
+ })
}
- (
- LayoutQuery::ElementMetrics { source },
- LayoutQueryAnswer::ElementMetrics(metrics),
- ) => {
- *metrics = tree.element_metrics_for_source_with_offset_parent_filter(
+ LayoutQuery::ElementMetrics { source } => LayoutQueryAnswer::ElementMetrics(
+ tree.element_metrics_for_source_with_offset_parent_filter(
*source,
|candidate| self.offset_parent_candidate_is_exposed(*source, candidate),
- );
- }
- _ => {}
- }
- }
- answers
+ ),
+ ),
+ _ => tree.answer_query(query),
+ })
+ .collect();
+ LayoutAnswers { answers, metrics }
}
/// Blink exposes only offset-parent candidates whose TreeScope is one of