Skip to content

armgit / moli

Public Imported from GitHub
0

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

feat(layout): initialize shared geometry on first demand

ldm0ddbf52a66876
diff --git a/moli-cdp-smoke/README.md b/moli-cdp-smoke/README.md
index 00689a8e9..51e56ec15 100644
--- a/moli-cdp-smoke/README.md
+++ b/moli-cdp-smoke/README.md
@@ -249,21 +249,21 @@ Covered well:
asynchronous request cancellation, and suppression of asynchronous events and
timers while a synchronous request owns the main thread.
- The focused `layout-screenshot` group drives a real raw WebSocket session through target creation/attachment, fixed viewport, lifecycle-gated navigation, DevTools-style PNG capture (`quality: 100`), paint/layout mutations, page clips, `captureBeyondViewport`, and the Chromium DevTools node-screenshot chain (`DOM.getBoxModel` + `Page.getLayoutMetrics` + page clip). Its Moli-only TreeScope fixture also captures 104 open/closed Shadow Roots, nested roots, and 24 roots in an iframe twice, requiring stable pixels and completion within the protocol timeout. The group covers Moli's generation-gated 1 FPS JPEG screencast as well: initial-frame delivery, clean-state frame suppression without ACK backpressure, 400x300 scaling, metadata/session routing, mutation freshness, stop cleanup, and a separately restarted default-Mock boundary without `--layout`. The screenshot surface sequence can also run against Chromium as a coarse reference; the TreeScope, fixed-1-FPS, and default-Mock branches are Moli-only.
-- The default `playwright-compat` group takes viewport and clipped
- screenshots through `page.screenshot()` on fresh pages, without a raw CDP capture first.
- This covers Playwright's `Page.getLayoutMetrics` preflight before layout has
- been published. DPR/resize and concurrent-page screenshot cases likewise use
- Playwright directly, so a fixture cannot hide a broken first screenshot.
- In Moli, before the first layout publication, DOM dimensions remain zero,
- while `Page.getLayoutMetrics.cssContentSize` falls back to the configured
- viewport. Clients can use those page metrics to submit a positive screenshot
- clip. Empty clips are rejected regardless of layout publication state.
- Playwright computes its own full-page clip from DOM dimensions, so a cold
- `fullPage: true` request fails. The smoke test checks that rejection leaves
- geometry unpublished, then verifies viewport output and subsequent full-page
- and full-page clip output on a tall page. CLI `moli fetch --layout --dump
- screenshot_full` directly requests full-document output and works on the
- first capture without a DOM-size preflight.
+- The default `playwright-compat` group takes viewport, clipped, full-page,
+ and full-page clipped screenshots through `page.screenshot()` on fresh pages,
+ without a geometry probe or raw CDP capture first. DOM geometry reads initialize
+ Moli's first layout on demand; subsequent reads consume that published layout
+ until a screenshot or new screencast frame refreshes it. The tall-page fixture
+ checks the first full-page image's height and bottom pixels, then repeats the
+ full-page capture. It sets `scrollbar-width: none` explicitly to match
+ Playwright's Chromium `--hide-scrollbars` launch default. With visible native
+ scrollbars, both Chromium and Moli produce a 305px-wide full-page capture for
+ this narrow-content, 320px-viewport fixture. Empty clips remain invalid
+ regardless of layout state.
+ CLI `moli fetch --layout --dump screenshot_full` directly requests full-document
+ output and works on the first capture without a DOM-size preflight.
+ The four first-capture modes were checked with the same test against
+ `/usr/bin/chromium` 145.0.7632.116 on 2026-09-27 (one run per mode).
- The default raw `action-window` group holds Moli's on-demand input policy at
the public CDP boundary. Three acknowledged `Input.dispatchMouseEvent`
wheel commands remain delayed until one fixed one-second deadline, preserve
diff --git a/moli-cdp-smoke/moli_cdp_smoke/groups/playwright_compat.py b/moli-cdp-smoke/moli_cdp_smoke/groups/playwright_compat.py
index 2e1e12190..40cff070c 100644
--- a/moli-cdp-smoke/moli_cdp_smoke/groups/playwright_compat.py
+++ b/moli-cdp-smoke/moli_cdp_smoke/groups/playwright_compat.py
@@ -30,80 +30,38 @@ async def run_playwright_compat_group(state: SmokeState) -> None:
async def _verify_playwright_first_screenshot(state: SmokeState) -> None:
- # Each case starts on a new page. A raw CDP capture here would hide a broken
- # getLayoutMetrics preflight in Playwright's own screenshot implementation.
+ # Start each mode on a new page, without geometry probes or raw captures
+ # that could initialize layout before Playwright's own screenshot preflight.
for name, options, size in [
("viewport", {}, (320, 240)),
("clip", {"clip": {"x": 10, "y": 15, "width": 60, "height": 50}}, (60, 50)),
+ ("full-page", {"full_page": True}, (320, 900)),
+ ("full-page-clip", {"full_page": True, "clip": {"x": 10, "y": 15, "width": 60, "height": 50}}, (60, 50)),
]:
page = await state.context.new_page()
try:
await page.set_viewport_size({"width": 320, "height": 240})
+ # Match Playwright's Chromium --hide-scrollbars launch default.
await page.goto(
- "data:text/html,<!doctype html><body style='margin:0'>"
+ "data:text/html,<!doctype html><style>html{scrollbar-width:none}</style>"
+ "<body style='margin:0'>"
"<div style='width:80px;height:900px;background:rgb(20,30,40)'></div>",
wait_until="load",
timeout=10_000,
)
- assert_equal(
- await page.evaluate("""() => [
- document.documentElement.clientWidth,
- document.documentElement.clientHeight,
- document.querySelector('div').getBoundingClientRect().width
- ]"""),
- [0, 0, 0],
- f"unpublished geometry before first Playwright {name} screenshot",
- )
- if name == "viewport":
- # Playwright derives fullPage clips from DOM dimensions, which
- # are zero before publication. CDP must reject that empty clip.
- try:
- await page.screenshot(full_page=True, timeout=10_000)
- except Exception as error:
- if "positive finite width, height, and scale" not in str(error):
- raise SmokeError(f"unexpected cold full-page error: {error}") from error
- else:
- raise SmokeError("cold Playwright full-page screenshot should reject its empty clip")
- assert_equal(
- await page.evaluate("""() => [
- document.documentElement.clientWidth,
- document.documentElement.clientHeight,
- document.querySelector('div').getBoundingClientRect().width
- ]"""),
- [0, 0, 0],
- "rejected full-page screenshot must not publish layout",
- )
image = decode_png(await page.screenshot(timeout=10_000, **options))
assert_equal((image.width, image.height), size, f"first Playwright {name} screenshot size")
assert_equal(image.pixel(5, 5), (20, 30, 40, 255), f"first Playwright {name} screenshot pixel")
- if name == "viewport":
- # A successful viewport capture publishes the DOM dimensions
- # used by subsequent Playwright full-page requests.
- full_image = decode_png(await page.screenshot(full_page=True, timeout=10_000))
- assert_equal(full_image.height, 900, "published Playwright full-page screenshot height")
- assert_equal(
- full_image.pixel(5, 880),
- (20, 30, 40, 255),
- "published Playwright full-page bottom pixel",
- )
- # Playwright clips against DOM dimensions before sending CDP.
- # A full-page clip therefore needs a previously published frame.
- clipped = decode_png(await page.screenshot(
- full_page=True,
- clip={"x": 10, "y": 15, "width": 60, "height": 50},
- timeout=10_000,
- ))
- assert_equal((clipped.width, clipped.height), (60, 50), "published full-page clip size")
- assert_equal(clipped.pixel(5, 5), (20, 30, 40, 255), "published full-page clip pixel")
+ if name == "full-page":
+ assert_equal(image.pixel(5, 880), (20, 30, 40, 255), "cold full-page bottom pixel")
+ full_image = decode_png(await page.screenshot(full_page=True, timeout=10_000))
+ assert_equal(full_image.height, 900, "subsequent full-page screenshot height")
+ assert_equal(full_image.pixel(5, 880), (20, 30, 40, 255), "subsequent full-page bottom pixel")
finally:
await page.close()
state.record(
"playwright_first_screenshot_without_published_layout",
- {
- "modes": ["viewport", "clip"],
- "rejected_unpublished_modes": ["full-page"],
- "published_modes": ["full-page", "full-page-clip"],
- },
+ {"modes": ["viewport", "clip", "full-page", "full-page-clip"]},
)
diff --git a/moli-layout/src/error.rs b/moli-layout/src/error.rs
index 53f7380c8..9ba41ab2e 100644
--- a/moli-layout/src/error.rs
+++ b/moli-layout/src/error.rs
@@ -3,9 +3,9 @@ use thiserror::Error;
/// A structured failure while constructing or evaluating one layout pass.
#[derive(Clone, Debug, Error, PartialEq, Eq)]
pub enum LayoutError {
- /// Geometry and input consume published layout and cannot create it.
+ /// The published page does not contain the requested Document's geometry.
#[error(
- "no published layout is available for the current document; call Page.captureScreenshot, or start Page.startScreencast and wait for a frame, then retry. Geometry queries and input do not create layout"
+ "no published layout is available for the requested document; call Page.captureScreenshot, or start Page.startScreencast and wait for a frame, then retry. Geometry queries and input do not refresh an existing layout"
)]
NoLayoutSnapshot,
/// A geometry consumer forced layout before the Document had an element root.
diff --git a/moli-layout/src/pass.rs b/moli-layout/src/pass.rs
index e519c2eac..f6fe5716a 100644
--- a/moli-layout/src/pass.rs
+++ b/moli-layout/src/pass.rs
@@ -186,7 +186,7 @@ where
build_layout_pass_with_embedded_frames(source, styles, services, request, &mut NoEmbeddedFrames)
}
-/// Builds one complete layout result and resolves embedded frame pixels after
+/// Builds one complete layout result and resolves embedded frame geometry after
/// the parent numeric layout has established their exact content viewports.
///
/// This is a one-shot composition seam, not a per-Document cache. Child trees
@@ -230,41 +230,40 @@ where
let numeric_layout_elapsed = phase_started.elapsed();
let phase_started = Instant::now();
let mut embedded_frames = HashMap::new();
- if request.requests_paint() {
- for index in 0..world.boxes.len() {
- let layout_box = &world.boxes[index];
- if !layout_box.element_semantics().is_some_and(|semantics| {
- semantics.replaced == Some(crate::LayoutReplacedKind::Frame)
- }) {
- continue;
- }
- let Some(source) = layout_box.source() else {
- continue;
- };
- let layout = layout_box.final_layout();
- let width = (layout.size.width
- - layout.border.left
- - layout.border.right
- - layout.padding.left
- - layout.padding.right)
- .max(0.0);
- let height = (layout.size.height
- - layout.border.top
- - layout.border.bottom
- - layout.padding.top
- - layout.padding.bottom)
- .max(0.0);
- if width <= 0.0 || height <= 0.0 {
- continue;
- }
- let viewport = LayoutViewport::new(
- css_viewport_dimension(width),
- css_viewport_dimension(height),
- request.viewport.device_pixel_ratio,
- );
- if let Some(snapshot) = frames.render_embedded_frame(source, viewport)? {
- embedded_frames.insert(crate::LayoutBoxId::from_index(index), (source, snapshot));
- }
+ for index in 0..world.boxes.len() {
+ let layout_box = &world.boxes[index];
+ if !layout_box
+ .element_semantics()
+ .is_some_and(|semantics| semantics.replaced == Some(crate::LayoutReplacedKind::Frame))
+ {
+ continue;
+ }
+ let Some(source) = layout_box.source() else {
+ continue;
+ };
+ let layout = layout_box.final_layout();
+ let width = (layout.size.width
+ - layout.border.left
+ - layout.border.right
+ - layout.padding.left
+ - layout.padding.right)
+ .max(0.0);
+ let height = (layout.size.height
+ - layout.border.top
+ - layout.border.bottom
+ - layout.padding.top
+ - layout.padding.bottom)
+ .max(0.0);
+ if width <= 0.0 || height <= 0.0 {
+ continue;
+ }
+ let viewport = LayoutViewport::new(
+ css_viewport_dimension(width),
+ css_viewport_dimension(height),
+ request.viewport.device_pixel_ratio,
+ );
+ if let Some(snapshot) = frames.render_embedded_frame(source, viewport)? {
+ embedded_frames.insert(crate::LayoutBoxId::from_index(index), (source, snapshot));
}
}
let embedded_frame_elapsed = phase_started.elapsed();
diff --git a/moli-protocol-server/src/protocol_server/tests/classic.rs b/moli-protocol-server/src/protocol_server/tests/classic.rs
index afe032408..bb4bd025d 100644
--- a/moli-protocol-server/src/protocol_server/tests/classic.rs
+++ b/moli-protocol-server/src/protocol_server/tests/classic.rs
@@ -11273,29 +11273,8 @@ async fn webdriver_classic_element_click_uses_shared_dom_geometry_and_input() {
&format!("/session/{session_id}/element/{element_id}/click"),
)
.await;
- assert_eq!(cold_status, StatusCode::INTERNAL_SERVER_ERROR);
- for command in ["Page.captureScreenshot", "Page.startScreencast"] {
- assert!(
- cold["value"]["message"].as_str().unwrap().contains(command),
- "{cold}"
- );
- }
- assert!(
- !cold["value"]["message"]
- .as_str()
- .unwrap()
- .contains("Page.printToPDF"),
- "{cold}"
- );
- classic_capture_layout(app.clone(), session_id).await;
-
- let clicked = classic_request_json(
- app.clone(),
- Method::POST,
- &format!("/session/{session_id}/element/{element_id}/click"),
- )
- .await;
- assert_eq!(clicked, json!({ "value": null }));
+ assert_eq!(cold_status, StatusCode::OK);
+ assert_eq!(cold, json!({ "value": null }));
let clicked_state = classic_request_json_with_body(
app.clone(),
diff --git a/moli-protocol/src/domains/input/tests/mouse_snapshot.rs b/moli-protocol/src/domains/input/tests/mouse_snapshot.rs
index cd1c51c64..b089fa3e9 100644
--- a/moli-protocol/src/domains/input/tests/mouse_snapshot.rs
+++ b/moli-protocol/src/domains/input/tests/mouse_snapshot.rs
@@ -1,7 +1,7 @@
use super::*;
#[tokio::test(flavor = "multi_thread")]
-async fn cdp_geometry_and_mouse_require_explicit_layout_publication() {
+async fn cdp_geometry_initializes_layout_and_mouse_reuses_it_until_capture() {
let mut ctx = TestContext::new();
with_loaded_document(&mut ctx, r#"<html><body style='margin:0;min-height:100px'>
<button id='target' style='position:absolute;left:0;top:0;width:100px;height:100px'>go</button>
@@ -10,57 +10,11 @@ async fn cdp_geometry_and_mouse_require_explicit_layout_publication() {
for(const type of ['mousemove','mousedown','mouseup','click','wheel'])
document.addEventListener(type,e=>events.push([type,e.target.id]));
</script></body></html>"#).await;
- for (id, event) in [
- (701, "mouseMoved"),
- (702, "mousePressed"),
- (703, "mouseReleased"),
- (704, "mouseWheel"),
- ] {
- ctx.process_async(json!({
- "id":id, "method":"Input.dispatchMouseEvent",
- "params":{"type":event,"x":20,"y":20,"button":"left","deltaX":0,"deltaY":10}
- }))
- .await;
- let response = ctx.take_response_by_id(id);
- assert_eq!(response["error"]["code"], -32000, "{response}");
- assert!(
- response["error"]["message"]
- .as_str()
- .unwrap()
- .contains("no published layout is available"),
- "{response}"
- );
- }
- assert_eq!(
- evaluate_string(&mut ctx, "JSON.stringify(events)").await,
- "[]"
- );
-
let object_id = resolve_selector_object_id(&mut ctx, "#target", 710).await;
- ctx.process_async(json!({"id":719,"method":"Page.getLayoutMetrics"}))
- .await;
- assert!(ctx.take_response_by_id(719)["result"]["visualViewport"].is_object());
- ctx.process_async(json!({"id":720,"method":"DOM.getBoxModel","params":{"objectId":object_id}}))
- .await;
- let cold = ctx.take_response_by_id(720);
- assert_eq!(cold["error"]["code"], -32000, "{cold}");
- let message = cold["error"]["message"]
- .as_str()
- .expect("missing-layout error");
- for command in [
- "Page.captureScreenshot",
- "Page.startScreencast",
- "wait for a frame",
- ] {
- assert!(message.contains(command), "{cold}");
- }
- assert!(!message.contains("Page.printToPDF"), "{cold}");
- ctx.process_async(json!({"id":719,"method":"Page.captureScreenshot"}))
- .await;
- assert!(ctx.take_response_by_id(719)["result"]["data"].is_string());
ctx.process_async(json!({"id":720,"method":"DOM.getBoxModel","params":{"objectId":object_id}}))
.await;
- assert!(ctx.take_response_by_id(720)["result"]["model"].is_object());
+ let initial = ctx.take_response_by_id(720);
+ assert!(initial["result"]["model"].is_object(), "{initial}");
assert!(
evaluate_bool(
&mut ctx,
diff --git a/moli-protocol/src/domains/page/tests/capture.rs b/moli-protocol/src/domains/page/tests/capture.rs
index e906b8371..dbd272ccb 100644
--- a/moli-protocol/src/domains/page/tests/capture.rs
+++ b/moli-protocol/src/domains/page/tests/capture.rs
@@ -549,11 +549,6 @@ async fn print_to_pdf_returns_base64_pdf_without_publishing_interactive_geometry
"sessionId": "SID-PDF-BASE64",
"params": {"expression": "document.querySelector('main').getBoundingClientRect().width"}
});
- ctx.process_async(query.clone()).await;
- assert_eq!(
- take_response_by_id(&mut ctx, 1111)["result"]["result"]["value"],
- 0
- );
ctx.process_async(json!({
"id": 1112,
"method": "Page.printToPDF",
@@ -563,31 +558,39 @@ async fn print_to_pdf_returns_base64_pdf_without_publishing_interactive_geometry
let pdf = screenshot_bytes(&take_response_by_id(&mut ctx, 1112));
assert!(pdf.starts_with(b"%PDF-1.7"));
assert!(pdf.ends_with(b"%%EOF\n"));
+ // Printing a cold page must not publish its print-media geometry.
+ ctx.process_async(json!({
+ "id":1113,"method":"Runtime.evaluate","sessionId":"SID-PDF-BASE64",
+ "params":{"expression":"document.querySelector('main').style.width='60px'"}
+ }))
+ .await;
+ take_response_by_id(&mut ctx, 1113);
ctx.process_async(query.clone()).await;
assert_eq!(
take_response_by_id(&mut ctx, 1111)["result"]["result"]["value"],
- 0
+ 60
);
+
+ // Printing a warm page must also leave its previous screen geometry alone.
ctx.process_async(json!({
- "id":1113,"method":"Page.getLayoutMetrics","sessionId":"SID-PDF-BASE64"
- }))
- .await;
- assert!(take_response_by_id(&mut ctx, 1113)["result"]["visualViewport"].is_object());
- ctx.process_async(json!({
- "id":1113,"method":"Input.dispatchMouseEvent","sessionId":"SID-PDF-BASE64",
- "params":{"type":"mousePressed","x":20,"y":20,"button":"left"}
+ "id":1113,"method":"Runtime.evaluate","sessionId":"SID-PDF-BASE64",
+ "params":{"expression":"document.querySelector('main').style.width='100px'"}
}))
.await;
- let response = take_response_by_id(&mut ctx, 1113);
- assert_eq!(response["error"]["code"], -32000, "{response}");
- let message = response["error"]["message"].as_str().unwrap();
- assert!(message.contains("Page.captureScreenshot"), "{response}");
- assert!(!message.contains("Page.printToPDF"), "{response}");
+ take_response_by_id(&mut ctx, 1113);
+ ctx.process_async(json!({"id":1112,"method":"Page.printToPDF","sessionId":"SID-PDF-BASE64"}))
+ .await;
+ assert!(screenshot_bytes(&take_response_by_id(&mut ctx, 1112)).starts_with(b"%PDF-1.7"));
+ ctx.process_async(query.clone()).await;
+ assert_eq!(
+ take_response_by_id(&mut ctx, 1111)["result"]["result"]["value"],
+ 60
+ );
ctx.capture_fixture_layout(Some("SID-PDF-BASE64")).await;
ctx.process_async(query).await;
assert_eq!(
take_response_by_id(&mut ctx, 1111)["result"]["result"]["value"],
- 40
+ 100
);
}
#[tokio::test(flavor = "multi_thread")]
@@ -1088,7 +1091,7 @@ async fn get_layout_metrics_before_first_screenshot_does_not_publish_layout() {
ctx.process_async(geometry.clone()).await;
assert_eq!(
take_response_by_id(&mut ctx, 122)["result"]["result"]["value"],
- 0
+ 80
);
// Playwright gets these metrics before issuing its first capture request.
@@ -1134,11 +1137,11 @@ async fn get_layout_metrics_before_first_screenshot_does_not_publish_layout() {
}
#[tokio::test(flavor = "multi_thread")]
-async fn full_page_clip_from_layout_metrics_preserves_geometry_until_capture() {
+async fn full_page_clip_from_dom_initialized_layout_preserves_capture_semantics() {
for (dpr, scale, beyond, width, height) in [
- (1.0, 1.0, false, 320, 240),
- (2.0, 1.0, false, 640, 480),
- (2.0, 0.5, true, 320, 240),
+ (1.0, 1.0, false, 320, 900),
+ (2.0, 1.0, false, 640, 1800),
+ (2.0, 0.5, true, 320, 900),
] {
let mut ctx = TestContext::new();
let session = "SID-COLD-FULL-SCREENSHOT";
@@ -1161,7 +1164,7 @@ async fn full_page_clip_from_layout_metrics_preserves_geometry_until_capture() {
ctx.process_async(geometry.clone()).await;
assert_eq!(
take_response_by_id(&mut ctx, 121)["result"]["result"]["value"],
- json!([0, 0, 0])
+ json!([305, 240, 80])
);
// Empty clips are invalid both before and after layout publication.
@@ -1180,15 +1183,15 @@ async fn full_page_clip_from_layout_metrics_preserves_geometry_until_capture() {
.await;
let unpublished = take_response_by_id(&mut ctx, 123);
let mut clip = unpublished["result"]["cssContentSize"].clone();
- assert_eq!(clip, json!({"x":0,"y":0,"width":320.0,"height":240.0}));
+ assert_eq!(clip, json!({"x":0,"y":0,"width":320.0,"height":900.0}));
clip["scale"] = json!(scale);
- // The page-size fallback and rejected capture must leave DOM geometry
- // unpublished. The caller supplies a positive clip to the screenshot.
+ // Rejected clips leave the already published geometry unchanged.
+ // The caller supplies the actual content extent to the screenshot.
ctx.process_async(geometry.clone()).await;
assert_eq!(
take_response_by_id(&mut ctx, 121)["result"]["result"]["value"],
- json!([0, 0, 0])
+ json!([305, 240, 80])
);
ctx.process_async(json!({
"id":122,"method":"Page.captureScreenshot","sessionId":session,
diff --git a/moli-renderer-v8/src/context_bootstrap/resize_observer_runtime.rs b/moli-renderer-v8/src/context_bootstrap/resize_observer_runtime.rs
index a8d736028..256335e28 100644
--- a/moli-renderer-v8/src/context_bootstrap/resize_observer_runtime.rs
+++ b/moli-renderer-v8/src/context_bootstrap/resize_observer_runtime.rs
@@ -438,7 +438,7 @@ fn build_resize_observer_entries<'s>(
.copied()
.map(|source| moli_layout::LayoutQuery::ElementMetrics { source }),
);
- let answers = match crate::native_bridge::element::observable_geometry_batch(
+ let answers = match crate::native_bridge::element::published_geometry_batch(
runtime,
document,
&moli_layout::LayoutQueryBatch::new(queries),
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 9e890d5d5..39dc9b964 100644
--- a/moli-renderer-v8/src/native_bridge/context_host/layout.rs
+++ b/moli-renderer-v8/src/native_bridge/context_host/layout.rs
@@ -206,6 +206,37 @@ impl JsContextHost {
.inferred_frame_style_viewport_cache_observability()
}
+ /// Lazily publishes the first screen layout for this main Document.
+ ///
+ /// Every consumer shares the same recursive tree. Missing nodes or newly
+ /// navigated frames in an existing tree must not refresh the whole page.
+ pub(crate) fn ensure_initial_layout(&self) -> Result<(), LayoutError> {
+ if !self.layout_policy.uses_real_layout() {
+ return Ok(());
+ }
+ if self.layout_pass_active.get() {
+ return Err(LayoutError::ReentrantLayoutPass);
+ }
+ let document = self.document_handle();
+ if self
+ .document_layout_state
+ .borrow()
+ .latest_layout(document)
+ .is_some()
+ {
+ return Ok(());
+ }
+ let request = LayoutPassRequest::new(
+ self.layout_viewport_for_document(document),
+ moli_layout::LayoutFlushReason::SynchronousGeometry,
+ );
+ let pass = self
+ .build_layout_pass_for_document(document, request)?
+ .ok_or(LayoutError::NoLayoutRoot)?;
+ self.publish_layout_pass_for_document(document, pass);
+ Ok(())
+ }
+
pub(crate) fn build_layout_pass_for_document(
&self,
document: DomHandle,
diff --git a/moli-renderer-v8/src/native_bridge/context_host/layout_snapshot.rs b/moli-renderer-v8/src/native_bridge/context_host/layout_snapshot.rs
index a19b71a78..55e56c57c 100644
--- a/moli-renderer-v8/src/native_bridge/context_host/layout_snapshot.rs
+++ b/moli-renderer-v8/src/native_bridge/context_host/layout_snapshot.rs
@@ -12,7 +12,8 @@ struct LatestFrozenLayout {
/// This owns exactly one recursively frozen snapshot. It has no separately
/// keyed child tree, working layout world, source index, hit-test index, Taffy
/// cache, style borrow, pass diagnostics, paint snapshot, timer, or invalidation
-/// policy. Screenshots, screencast frames and explicit layout refreshes replace
+/// policy. The first geometry demand initializes it. Screenshots, screencast
+/// frames and explicit layout refreshes replace
/// this published layout; print projections never enter this cache.
#[derive(Default)]
pub(super) struct LatestLayoutTreeCache {
diff --git a/moli-renderer-v8/src/native_bridge/element.rs b/moli-renderer-v8/src/native_bridge/element.rs
index 6b2e4f05a..752f67fd4 100644
--- a/moli-renderer-v8/src/native_bridge/element.rs
+++ b/moli-renderer-v8/src/native_bridge/element.rs
@@ -398,7 +398,7 @@ pub(crate) use geometry::{
observable_geometry_batch, observable_hit_test, observable_hit_test_all,
observable_input_hit_test, observable_sources_with_fragments,
perform_scrollbar_scroll_default_action, perform_wheel_scroll_default_action,
- queue_scroll_observable_effects, scroll_node_into_view_at_center,
+ published_geometry_batch, queue_scroll_observable_effects, scroll_node_into_view_at_center,
scroll_node_into_view_at_start,
};
pub(super) use geometry::{
diff --git a/moli-renderer-v8/src/native_bridge/element/geometry.rs b/moli-renderer-v8/src/native_bridge/element/geometry.rs
index 6ba395d52..e12d73c68 100644
--- a/moli-renderer-v8/src/native_bridge/element/geometry.rs
+++ b/moli-renderer-v8/src/native_bridge/element/geometry.rs
@@ -33,8 +33,8 @@ pub(crate) use mock::{
pub(crate) use provider::{
observable_bounding_client_rects, observable_caret_position, observable_event_offset,
observable_geometry_batch, observable_hit_test_all, observable_sources_with_fragments,
- observable_used_grid_tracks, read_bounding_client_rect, read_client_rects,
- read_element_metrics,
+ observable_used_grid_tracks, published_geometry_batch, read_bounding_client_rect,
+ read_client_rects, read_element_metrics,
};
pub(in crate::native_bridge) use rects::{
node_get_bounding_client_rect_callback, node_get_client_rects_callback,
diff --git a/moli-renderer-v8/src/native_bridge/element/geometry/hit_test.rs b/moli-renderer-v8/src/native_bridge/element/geometry/hit_test.rs
index de77e302d..d88a780ac 100644
--- a/moli-renderer-v8/src/native_bridge/element/geometry/hit_test.rs
+++ b/moli-renderer-v8/src/native_bridge/element/geometry/hit_test.rs
@@ -87,8 +87,8 @@ pub(crate) fn observable_scrollbar_hit_test(
})
}
-/// Coordinate input must not create or refresh geometry, including embedded
-/// frame geometry. Live DOM checks only reject sources that no longer exist.
+/// Coordinate input initializes a cold page once, then consumes the same
+/// published tree, including embedded frames, until an explicit refresh.
pub(crate) fn input_surface_hit_test(
runtime: &JsContextHost,
document: DomHandle,
@@ -103,6 +103,7 @@ pub(crate) fn input_surface_hit_test(
control: None,
});
}
+ runtime.ensure_initial_layout()?;
runtime
.with_latest_layout_tree_for_document(document, |tree| {
input_surface_hit_test_in_tree(
diff --git a/moli-renderer-v8/src/native_bridge/element/geometry/provider.rs b/moli-renderer-v8/src/native_bridge/element/geometry/provider.rs
index e1f5f8e80..57486035a 100644
--- a/moli-renderer-v8/src/native_bridge/element/geometry/provider.rs
+++ b/moli-renderer-v8/src/native_bridge/element/geometry/provider.rs
@@ -39,6 +39,16 @@ pub(crate) fn observable_geometry_batch(
runtime: &JsContextHost,
document: DomHandle,
batch: &LayoutQueryBatch<DomHandle>,
+) -> Result<LayoutAnswers<DomHandle>, LayoutError> {
+ runtime.ensure_initial_layout()?;
+ published_geometry_batch(runtime, document, batch)
+}
+
+/// Style and observer sampling never initializes layout as a side effect.
+pub(crate) fn published_geometry_batch(
+ runtime: &JsContextHost,
+ document: DomHandle,
+ batch: &LayoutQueryBatch<DomHandle>,
) -> Result<LayoutAnswers<DomHandle>, LayoutError> {
if runtime.layout_policy().uses_real_layout() {
runtime.answer_layout_for_document(document, batch)
@@ -200,9 +210,23 @@ pub(crate) fn observable_used_grid_tracks(
runtime: &JsContextHost,
source: DomHandle,
) -> Result<Option<LayoutResolvedGridTracks>, LayoutError> {
- match query_source(runtime, source, LayoutQuery::UsedGridTracks { source })? {
+ if !runtime.dom_host().is_connected(source) {
+ return Ok(None);
+ }
+ let Some(document) = runtime.layout_document_for_source(source) else {
+ return Ok(None);
+ };
+ let answers = match published_geometry_batch(
+ runtime,
+ document,
+ &LayoutQueryBatch::new(vec![LayoutQuery::UsedGridTracks { source }]),
+ ) {
+ Ok(answers) => answers,
+ Err(LayoutError::NoLayoutSnapshot) => return Ok(None),
+ Err(error) => return Err(error),
+ };
+ match answers.answers.into_iter().next() {
Some(LayoutQueryAnswer::UsedGridTracks(tracks)) => Ok(tracks),
- None => Ok(None),
_ => Err(provider_contract_error("used Grid tracks")),
}
}
diff --git a/moli-renderer-v8/src/script_vm.rs b/moli-renderer-v8/src/script_vm.rs
index 6199d9cd3..4050591e4 100644
--- a/moli-renderer-v8/src/script_vm.rs
+++ b/moli-renderer-v8/src/script_vm.rs
@@ -4523,6 +4523,7 @@ impl ScriptVm {
{
let host = self._context_host.borrow();
if host.layout_policy().uses_real_layout() {
+ host.ensure_initial_layout()?;
let document = host
.layout_document_for_source(handle)
.ok_or(moli_layout::LayoutError::NoLayoutSnapshot)?;
diff --git a/moli-renderer-v8/src/script_vm/element_click.rs b/moli-renderer-v8/src/script_vm/element_click.rs
index b5efe12bd..c66efcbb7 100644
--- a/moli-renderer-v8/src/script_vm/element_click.rs
+++ b/moli-renderer-v8/src/script_vm/element_click.rs
@@ -35,6 +35,7 @@ impl ScriptVm {
if !host.layout_policy().uses_real_layout() {
return Ok(ClickTarget::DomActivation);
}
+ host.ensure_initial_layout().map_err(layout_error)?;
let document = host
.layout_document_for_source(handle)
.ok_or(ClickError::StaleNode)?;
diff --git a/moli-renderer-v8/src/script_vm/tests/dom_elements/dom_surface.rs b/moli-renderer-v8/src/script_vm/tests/dom_elements/dom_surface.rs
index 35c0fc985..649e09411 100644
--- a/moli-renderer-v8/src/script_vm/tests/dom_elements/dom_surface.rs
+++ b/moli-renderer-v8/src/script_vm/tests/dom_elements/dom_surface.rs
@@ -726,25 +726,12 @@ fn iframe_input_reuses_one_top_level_snapshot_without_parent_child_ping_pong() {
)
.expect("iframe input snapshot fixture should initialize");
- assert_eq!(
- vm.eval("document.body.offsetWidth > 0")
- .expect("parent geometry should evaluate"),
- "false"
- );
let passes_before = vm.layout_pass_observability_for_test().1;
- let error = vm
- .dispatch_mouse_event_at_point(140.0, 130.0, "mousedown", 0, Some(1), 0.0, 0.0)
- .expect_err("input cannot build the missing iframe projection");
- assert_eq!(
- error.downcast_ref::<moli_layout::LayoutError>(),
- Some(&moli_layout::LayoutError::NoLayoutSnapshot)
- );
- assert_eq!(vm.layout_pass_observability_for_test().1, passes_before);
- assert_eq!(vm.pressed_mouse_buttons, 0);
- assert!(vm.pending_mouse_press.is_none());
- publish_layout_for_test(&mut vm);
+ vm.dispatch_mouse_event_at_point(140.0, 130.0, "mousemove", -1, Some(0), 0.0, 0.0)
+ .expect("cold input should publish the parent and iframe together");
let prepared = vm.layout_pass_observability_for_test().1;
assert_eq!(prepared, passes_before + 1);
+ assert_eq!(vm.eval("document.body.offsetWidth > 0").unwrap(), "true");
for _ in 0..3 {
vm.dispatch_mouse_event_at_point(140.0, 130.0, "mousemove", -1, Some(0), 0.0, 0.0)
.expect("child hover should consume the published composite snapshot");
@@ -1383,7 +1370,42 @@ fn painted_overlay_wins_over_scrollbar_and_corner_consumes_input() {
}
#[test]
-fn document_client_size_requires_published_layout() {
+fn cold_geometry_entries_share_one_layout_and_do_not_rebuild_for_missing_boxes() {
+ for query in [
+ "target.clientWidth",
+ "target.getBoundingClientRect().width",
+ "target.getClientRects()[0].width",
+ "range.getBoundingClientRect().width",
+ "document.elementFromPoint(30, 30) === target ? 100 : -1",
+ ] {
+ let mut vm = new_parsed_test_vm(
+ "https://initial-geometry.test/",
+ "<!doctype html><div id=target style='position:absolute;left:20px;top:20px;width:100px;height:80px'></div><div id=hidden style='display:none'></div>",
+ );
+ vm.eval("globalThis.range=document.createRange();range.selectNode(target)")
+ .unwrap();
+ let before = vm.layout_pass_observability_for_test().1;
+ assert_eq!(vm.eval(query).unwrap(), "100", "{query}");
+ assert_eq!(vm.layout_pass_observability_for_test().1, before + 1);
+ vm.eval("target.style.width='200px';const added=document.createElement('div');added.id='added';added.style.width='50px';document.body.appendChild(added)").unwrap();
+ assert_eq!(
+ vm.eval("JSON.stringify([target.clientWidth,hidden.clientWidth,added.clientWidth])")
+ .unwrap(),
+ "[100,0,0]"
+ );
+ assert_eq!(vm.layout_pass_observability_for_test().1, before + 1);
+ publish_layout_for_test(&mut vm);
+ assert_eq!(
+ vm.eval("JSON.stringify([target.clientWidth,hidden.clientWidth,added.clientWidth])")
+ .unwrap(),
+ "[200,0,50]"
+ );
+ assert_eq!(vm.layout_pass_observability_for_test().1, before + 2);
+ }
+}
+
+#[test]
+fn document_client_size_initializes_layout_once_and_reuses_it_until_capture() {
let mut vm = new_parsed_test_vm(
"https://document-client-viewport.test/",
"<!doctype html><style>html,body{margin:0}main{width:80px;height:900px}</style><main></main>",
@@ -1395,20 +1417,18 @@ fn document_client_size_requires_published_layout() {
document.body.clientWidth, document.querySelector('main').clientHeight,
document.querySelector('main').getBoundingClientRect().width
])"#;
- for (width, height, dpr) in [(320, 240, 1.0), (480, 360, 2.0)] {
- vm.set_viewport_surface(Some(crate::protocol_types::ViewportSurface {
- inner_width: width,
- inner_height: height,
- device_pixel_ratio: dpr,
- ..Default::default()
- }))
- .unwrap();
- assert_eq!(vm.eval(query).unwrap(), "[0,0,0,0,0,0,0]");
- assert_eq!(vm.layout_pass_observability_for_test().1, initial_passes);
- }
-
- publish_layout_for_test(&mut vm);
+ vm.set_viewport_surface(Some(crate::protocol_types::ViewportSurface {
+ inner_width: 480,
+ inner_height: 360,
+ device_pixel_ratio: 2.0,
+ ..Default::default()
+ }))
+ .unwrap();
let published = vm.eval(query).unwrap();
+ assert_eq!(
+ vm.layout_pass_observability_for_test().1,
+ initial_passes + 1
+ );
let published_metrics: serde_json::Value = serde_json::from_str(&published).unwrap();
assert_eq!(published_metrics[0], 465); // The viewport now has a scrollbar.
assert_eq!(published_metrics[1], 360);
diff --git a/moli-renderer-v8/src/script_vm/tests/dom_xhr/computed_style.rs b/moli-renderer-v8/src/script_vm/tests/dom_xhr/computed_style.rs
index 89893b108..6ee3aacac 100644
--- a/moli-renderer-v8/src/script_vm/tests/dom_xhr/computed_style.rs
+++ b/moli-renderer-v8/src/script_vm/tests/dom_xhr/computed_style.rs
@@ -5436,9 +5436,7 @@ fn nested_iframe_cached_viewport_units_follow_recursive_frame_resizes() {
let updates = vm.retained_style_system_update_count_for_document_for_test(inner_document);
let stylist = vm.retained_stylist_identity_for_document_for_test(inner_document);
- let after = vm
- .eval(
- r#"
+ let query = r#"
(() => {
const {
outerFrame,
@@ -5464,10 +5462,20 @@ fn nested_iframe_cached_viewport_units_follow_recursive_frame_resizes() {
fresh.height
].join('|');
})()
-"#,
- )
- .expect("nested held styles should observe recursive iframe resize");
- assert_eq!(after, "100|80|50|40|5px|4px|2px|5px|4px");
+"#;
+ let after = vm
+ .eval(query)
+ .expect("warm queries retain the published frame viewports");
+ assert_eq!(after, "200|160|100|80|10px|8px|4px|10px|8px");
+ assert_eq!(
+ vm.retained_style_system_update_count_for_document_for_test(inner_document),
+ updates
+ );
+ publish_layout_for_test(&mut vm);
+ let refreshed = vm
+ .eval(query)
+ .expect("explicit refresh updates recursive frame viewports");
+ assert_eq!(refreshed, "100|80|50|40|5px|4px|2px|5px|4px");
assert_eq!(
vm.retained_style_system_update_count_for_document_for_test(inner_document),
updates + 1,
diff --git a/moli-renderer-v8/src/script_vm/tests/dom_xhr/dom.rs b/moli-renderer-v8/src/script_vm/tests/dom_xhr/dom.rs
index fc743c70c..62455cc74 100644
--- a/moli-renderer-v8/src/script_vm/tests/dom_xhr/dom.rs
+++ b/moli-renderer-v8/src/script_vm/tests/dom_xhr/dom.rs
@@ -2825,7 +2825,12 @@ fn document_point_queries_retain_published_geometry_after_viewport_resize() {
completed_passes,
"changing the viewport alone must not trigger layout"
);
- assert_eq!(vm.eval(query).unwrap(), published);
+ if completed_passes == before {
+ assert_eq!(vm.eval(query).unwrap(), expected);
+ completed_passes += 1;
+ } else {
+ assert_eq!(vm.eval(query).unwrap(), published);
+ }
assert_eq!(vm.layout_pass_observability_for_test().1, completed_passes);
if completed_passes < before + expected_passes {
vm.screenshot_layout_snapshot(moli_layout::LayoutViewport::new(width, 200, 1.0))
@@ -2895,13 +2900,17 @@ fn geometry_queries_retain_published_screen_and_resolution_environment() {
passes,
"an environment update alone must not trigger layout"
);
+ if passes == before {
+ published_width = expected_width.to_string();
+ }
assert_eq!(
vm.eval("String(target.getBoundingClientRect().width)")
.unwrap(),
published_width
);
- assert_eq!(vm.layout_pass_observability_for_test().1, passes);
- if passes < before + expected_passes {
+ let after_read = passes + u64::from(passes == before);
+ assert_eq!(vm.layout_pass_observability_for_test().1, after_read);
+ if after_read < before + expected_passes {
vm.screenshot_layout_snapshot(moli_layout::LayoutViewport::new(
800, 600, dpr as f32,
))
@@ -2979,13 +2988,17 @@ fn geometry_queries_retain_published_media_environment() {
let passes = vm.layout_pass_observability_for_test().1;
vm.set_emulated_media(environment);
assert_eq!(vm.layout_pass_observability_for_test().1, passes);
+ if passes == before {
+ published_width = expected_width.to_string();
+ }
assert_eq!(
vm.eval("String(target.getBoundingClientRect().width)")
.unwrap(),
published_width
);
- assert_eq!(vm.layout_pass_observability_for_test().1, passes);
- if passes < before + expected_passes {
+ let after_read = passes + u64::from(passes == before);
+ assert_eq!(vm.layout_pass_observability_for_test().1, after_read);
+ if after_read < before + expected_passes {
vm.screenshot_layout_snapshot(moli_layout::LayoutViewport::new(800, 600, 1.0))
.unwrap()
.unwrap();
diff --git a/moli-renderer-v8/src/script_vm/tests/element_click.rs b/moli-renderer-v8/src/script_vm/tests/element_click.rs
index 3bd3af5b4..1ebfa41bc 100644
--- a/moli-renderer-v8/src/script_vm/tests/element_click.rs
+++ b/moli-renderer-v8/src/script_vm/tests/element_click.rs
@@ -2,28 +2,20 @@ use super::*;
use crate::runtime::{RendererElementClickTarget, RendererPointerEventProperties};
#[test]
-fn native_element_click_requires_explicit_layout_without_building_it() {
+fn native_element_click_initializes_layout_once() {
let mut vm = new_parsed_test_vm(
"https://click-native-geometry.test/",
"<!doctype html><button id=target style='position:absolute;left:40px;top:40px;width:120px;height:70px'>go</button>",
);
let target = vm.document_runtime.get_element_by_id("target").unwrap();
let before = vm.layout_pass_observability_for_test().1;
- let error = vm.prepare_element_click(target).unwrap_err();
- let crate::runtime::RendererElementClickError::LayoutUnavailable(message) = error else {
- panic!("expected missing-layout guidance, got {error:?}");
- };
- for command in ["Page.captureScreenshot", "Page.startScreencast"] {
- assert!(message.contains(command), "{message}");
+ for _ in 0..2 {
+ assert!(matches!(
+ vm.prepare_element_click(target).unwrap(),
+ RendererElementClickTarget::Pointer(_)
+ ));
+ assert_eq!(vm.layout_pass_observability_for_test().1, before + 1);
}
- assert!(!message.contains("Page.printToPDF"), "{message}");
- assert_eq!(vm.layout_pass_observability_for_test().1, before);
- publish_layout_for_test(&mut vm);
- assert!(matches!(
- vm.prepare_element_click(target).unwrap(),
- RendererElementClickTarget::Pointer(_)
- ));
- assert_eq!(vm.layout_pass_observability_for_test().1, before + 1);
}
#[test]
diff --git a/moli-renderer-v8/src/script_vm/tests/mouse_snapshot.rs b/moli-renderer-v8/src/script_vm/tests/mouse_snapshot.rs
index 839a21d98..0fce9dc55 100644
--- a/moli-renderer-v8/src/script_vm/tests/mouse_snapshot.rs
+++ b/moli-renderer-v8/src/script_vm/tests/mouse_snapshot.rs
@@ -17,7 +17,7 @@ fn mouse(
}
#[test]
-fn mouse_input_rejects_missing_snapshot_without_layout_or_input_state_changes() {
+fn mouse_input_initializes_layout_once_and_shares_it_with_geometry() {
let mut vm = new_parsed_test_vm(
"https://mouse-snapshot.test/",
"<!doctype html><button id=target style='position:absolute;left:20px;top:20px;width:100px;height:100px'>go</button>",
@@ -25,47 +25,35 @@ fn mouse_input_rejects_missing_snapshot_without_layout_or_input_state_changes()
vm.eval("window.events=[];for(const type of ['mousemove','mousedown','mouseup','click','wheel'])document.addEventListener(type,e=>events.push(type))").unwrap();
let before = vm.layout_pass_observability_for_test().1;
for event in ["mousemove", "mousedown", "mouseup", "wheel"] {
- let error = mouse(&mut vm, event).unwrap_err();
- assert_eq!(
- error.downcast_ref::<moli_layout::LayoutError>(),
- Some(&moli_layout::LayoutError::NoLayoutSnapshot)
- );
- assert_eq!(vm.layout_pass_observability_for_test().1, before);
- assert_eq!(vm.pressed_mouse_buttons, 0);
- assert!(vm.pending_mouse_press.is_none());
+ mouse(&mut vm, event).unwrap();
+ assert_eq!(vm.layout_pass_observability_for_test().1, before + 1);
}
- assert_eq!(vm.eval("JSON.stringify(events)").unwrap(), "[]");
+ assert_eq!(vm.pressed_mouse_buttons, 0);
+ assert_eq!(
+ vm.eval("JSON.stringify(events)").unwrap(),
+ r#"["mousemove","mousedown","mouseup","click","wheel"]"#
+ );
assert_eq!(
vm.eval("String(target.getBoundingClientRect().width)")
.unwrap(),
- "0"
+ "100"
);
- assert_eq!(vm.layout_pass_observability_for_test().1, before);
- refresh_layout_for_test(&mut vm);
- let prepared = vm.layout_pass_observability_for_test().1;
- // A rejected down must not leave a press that a subsequent up can activate.
- mouse(&mut vm, "mouseup").unwrap();
- assert_eq!(vm.eval("JSON.stringify(events)").unwrap(), r#"["mouseup"]"#);
- assert_eq!(vm.layout_pass_observability_for_test().1, prepared);
+ assert_eq!(vm.layout_pass_observability_for_test().1, before + 1);
}
#[test]
-fn mouse_input_rejects_a_snapshot_from_a_replaced_document() {
+fn mouse_input_initializes_a_replaced_document_without_reusing_old_geometry() {
let mut vm = new_parsed_test_vm(
"https://mouse-snapshot.test/",
"<!doctype html><button>old</button>",
);
refresh_layout_for_test(&mut vm);
- vm.eval("document.open();document.write('<button>new</button>');document.close()")
+ vm.eval("document.open();document.write('<button id=new style=\"position:absolute;left:20px;top:20px;width:100px;height:100px\">new</button>');document.close();document.onmousedown=e=>window.hit=e.target.id")
.unwrap();
let before = vm.layout_pass_observability_for_test().1;
- let error = mouse(&mut vm, "mousedown").unwrap_err();
- assert_eq!(
- error.downcast_ref::<moli_layout::LayoutError>(),
- Some(&moli_layout::LayoutError::NoLayoutSnapshot)
- );
- assert_eq!(vm.layout_pass_observability_for_test().1, before);
- assert_eq!(vm.pressed_mouse_buttons, 0);
+ mouse(&mut vm, "mousedown").unwrap();
+ assert_eq!(vm.eval("window.hit").unwrap(), "new");
+ assert_eq!(vm.layout_pass_observability_for_test().1, before + 1);
}
#[test]