Skip to content

armgit / moli

Public Imported from GitHub
0

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

fix(layout): publish observer and nested frame state with snapshots

ldm0272c611c921b
diff --git a/moli-cdp-smoke/moli_cdp_smoke/fixture.py b/moli-cdp-smoke/moli_cdp_smoke/fixture.py
index 53da2df67..1aa52bae4 100644
--- a/moli-cdp-smoke/moli_cdp_smoke/fixture.py
+++ b/moli-cdp-smoke/moli_cdp_smoke/fixture.py
@@ -186,6 +186,9 @@ body { height: 1200px; }
<script>
globalThis.__actionWindowWheelLog = [];
globalThis.__actionWindowIoLog = [];
+addEventListener("scroll", () => {
+ fetch("/action-window-witness/entered?source=deadline");
+}, { once: true });
addEventListener("wheel", event => {
__actionWindowWheelLog.push("event:" + event.deltaY);
Promise.resolve().then(() => {
@@ -196,9 +199,6 @@ globalThis.__actionWindowObserver = new IntersectionObserver(entries => {
const entry = entries.find(candidate => candidate.target.id === "target");
if (!entry) return;
__actionWindowIoLog.push(entry.isIntersecting);
- if (__actionWindowIoLog.length === 2 && entry.isIntersecting) {
- fetch("/action-window-witness/entered?source=deadline");
- }
});
__actionWindowObserver.observe(document.getElementById("target"));
</script>
diff --git a/moli-cdp-smoke/moli_cdp_smoke/groups/action_window.py b/moli-cdp-smoke/moli_cdp_smoke/groups/action_window.py
index 7072d339b..90d92d092 100644
--- a/moli-cdp-smoke/moli_cdp_smoke/groups/action_window.py
+++ b/moli-cdp-smoke/moli_cdp_smoke/groups/action_window.py
@@ -237,9 +237,10 @@ async def _wait_for_witness(
)
-async def _wait_for_initial_intersection(
+async def _wait_for_intersections(
client: RawCdpClient,
session_id: str,
+ expected: list[bool],
) -> None:
deadline = asyncio.get_running_loop().time() + 2.0
while asyncio.get_running_loop().time() < deadline:
@@ -248,10 +249,10 @@ async def _wait_for_initial_intersection(
session_id,
"JSON.stringify(__actionWindowIoLog)",
)
- if state == [False]:
+ if state == expected:
return
await asyncio.sleep(0.025)
- raise SmokeError("initial IntersectionObserver state was not published")
+ raise SmokeError(f"IntersectionObserver state: expected {expected!r}, got {state!r}")
async def _run_deadline_contract(
@@ -262,7 +263,7 @@ async def _run_deadline_contract(
) -> None:
await _reset_witness(fixture)
await _navigate(client, session_id, f"{fixture}/action-window-deadline")
- await _wait_for_initial_intersection(client, session_id)
+ await _wait_for_intersections(client, session_id, [False])
opened_at = asyncio.get_running_loop().time()
for index, delta_y in enumerate((100, -100, 100)):
@@ -305,23 +306,26 @@ async def _run_deadline_contract(
"microtask:-100",
"microtask:100",
],
- "ioLog": [False, True],
+ "ioLog": [False],
},
"fixed action-window batch state",
)
+ await _capture_png(client, session_id)
+ await _wait_for_intersections(client, session_id, [False, True])
record_contract(
results,
"raw_cdp_action_window_fixed_deadline_batch",
contract=(
"wheel acknowledgements remain delayed until one fixed deadline, then preserve "
- "event order and commit IntersectionObserver work once"
+ "event order; IntersectionObserver keeps the old geometry until explicit paint"
),
source="Moli on-demand rendering policy, mirrored by renderer and action-window Rust tests",
commands=[
"Input.dispatchMouseEvent(mouseWheel) x3",
"Runtime.evaluate",
+ "Page.captureScreenshot",
],
- observed={"elapsedSeconds": round(elapsed, 3), **state},
+ observed={"elapsedSeconds": round(elapsed, 3), **state, "ioAfterPaint": [False, True]},
)
@@ -363,6 +367,9 @@ async def _run_overflow_container_contract(
raise SmokeError(
f"overflow-container wheel batch applied before its deadline: {elapsed:.3f}s"
)
+ # Keep the deadline witness independent of CDP barriers. Only publish
+ # the new scroll geometry after the batch has released on its own.
+ await _capture_png(client, session_id)
state = await _evaluate_json(
client,
session_id,
@@ -392,6 +399,7 @@ async def _run_overflow_container_contract(
commands=[
"Input.dispatchMouseEvent(mouseWheel deltaY)",
"Input.dispatchMouseEvent(mouseWheel deltaX)",
+ "Page.captureScreenshot",
"Runtime.evaluate",
],
observed={"elapsedSeconds": round(elapsed, 3), **state},
@@ -476,6 +484,7 @@ async def _run_replacement_contract(
results: list[dict[str, Any]],
) -> None:
await _navigate(client, session_id, f"{fixture}/action-window-replacement")
+ await _capture_png(client, session_id)
for delta_y in (10, 20, 30):
await _dispatch_wheel(client, session_id, delta_y)
await asyncio.sleep(1.1)
diff --git a/moli-cdp-smoke/moli_cdp_smoke/groups/classic_scrollbar.py b/moli-cdp-smoke/moli_cdp_smoke/groups/classic_scrollbar.py
index 79dd08b8a..235e16b18 100644
--- a/moli-cdp-smoke/moli_cdp_smoke/groups/classic_scrollbar.py
+++ b/moli-cdp-smoke/moli_cdp_smoke/groups/classic_scrollbar.py
@@ -135,6 +135,16 @@ async def run_classic_scrollbar_group(state: SmokeState) -> None:
await mouse("mouseMoved", 90, 90, pressed=True)
await mouse("mouseReleased", 90, 90, pressed=False)
+ # Scroll input changes live offsets; ordinary geometry keeps the frozen
+ # values until an explicit visual publication.
+ if is_moli:
+ assert_equal(
+ await page.evaluate("() => [scroller.scrollLeft, scroller.scrollTop]"),
+ [0, 0],
+ "scroll input retains the published geometry",
+ )
+ _checkpoint("initial/publish-drag-state")
+ await page.screenshot()
_checkpoint("initial/read-drag-state")
state_after_drag = await page.evaluate(
"""() => ({
@@ -157,14 +167,17 @@ async def run_classic_scrollbar_group(state: SmokeState) -> None:
before_controls = float(state_after_drag["top"])
await mouse("mousePressed", 190, 5, pressed=True)
await mouse("mouseReleased", 190, 5, pressed=False)
+ await page.screenshot()
_checkpoint("initial/read-back-button-state")
after_back = float(await page.evaluate("() => scroller.scrollTop"))
await mouse("mousePressed", 190, 80, pressed=True)
await mouse("mouseReleased", 190, 80, pressed=False)
+ await page.screenshot()
_checkpoint("initial/read-forward-button-state")
after_forward = float(await page.evaluate("() => scroller.scrollTop"))
await mouse("mousePressed", 190, 60, pressed=True)
await mouse("mouseReleased", 190, 60, pressed=False)
+ await page.screenshot()
_checkpoint("initial/read-track-state")
after_track = float(await page.evaluate("() => scroller.scrollTop"))
control_scroll = [before_controls, after_back, after_forward, after_track]
@@ -323,6 +336,7 @@ async def _run_multi_scroller_drag_workflow(state: SmokeState, is_moli: bool) ->
await mouse("mousePressed", 225, 75, pressed=True)
await mouse("mouseMoved", 515, 115, pressed=True)
await mouse("mouseReleased", 515, 115, pressed=False)
+ await page.screenshot()
_checkpoint("multi-scroller/read-captured-drag-state")
first_drag = await page.evaluate(
"""() => [
@@ -362,6 +376,7 @@ async def _run_multi_scroller_drag_workflow(state: SmokeState, is_moli: bool) ->
document.getElementById("inner").scrollTop = 0;
}"""
)
+ await page.screenshot()
await mouse("mousePressed", 225, 25, pressed=True)
await mouse("mouseMoved", 700, 45, pressed=True)
await mouse("mouseReleased", 700, 45, pressed=False)
@@ -369,6 +384,7 @@ async def _run_multi_scroller_drag_workflow(state: SmokeState, is_moli: bool) ->
await mouse("mouseMoved", 295, 125, pressed=True)
await mouse("mouseReleased", 295, 125, pressed=False)
+ await page.screenshot()
_checkpoint("multi-scroller/read-final-drag-state")
state_after = await page.evaluate(
"""() => ({
@@ -702,6 +718,7 @@ async def _run_closed_popover_overflow_workflow(state: SmokeState, is_moli: bool
assert_equal(closed, ["none", 0, 785, 785], "closed popover stays out of root overflow")
_checkpoint("popover/show")
await page.evaluate("() => tip.showPopover()")
+ await page.screenshot()
_checkpoint("popover/read-open-geometry")
opened = await metrics()
assert_equal(
@@ -711,6 +728,7 @@ async def _run_closed_popover_overflow_workflow(state: SmokeState, is_moli: bool
)
_checkpoint("popover/hide")
await page.evaluate("() => tip.hidePopover()")
+ await page.screenshot()
_checkpoint("popover/read-reclosed-geometry")
reclosed = await metrics()
assert_equal(reclosed, closed, "closing popover removes its root overflow contribution")
@@ -769,6 +787,7 @@ async def _run_painted_surface_workflow(state: SmokeState, is_moli: bool) -> Non
return [scroller.clientWidth, scroller.clientHeight, overlay.getBoundingClientRect().x];
}"""
)
+ await page.screenshot()
async def mouse(event_type: str, x: int, y: int, *, pressed: bool) -> None:
_checkpoint(f"painted-surface/input-{event_type}-{x}-{y}")
@@ -813,9 +832,7 @@ async def _run_painted_surface_workflow(state: SmokeState, is_moli: bool) -> Non
return scroller.getBoundingClientRect().width;
}"""
)
- # Moli intentionally caps rendering at 50 ms. A screenshot is an explicit
- # render trigger, so the second input probes the new painted state instead
- # of the still-valid throttled snapshot from the first click.
+ # Publish the scene after hiding the overlay so input uses the new surface.
_checkpoint("painted-surface/render-after-mutation")
await page.screenshot()
# The lower-right 15x15 intersection is painted UA chrome. Moli exposes
@@ -1028,14 +1045,15 @@ async def _run_viewport_policy_and_numeric_gutter_workflow(
hidden_script = await page.evaluate("() => { scrollTo(0, 100); return scrollY; }")
assert_equal(hidden_script, 100, "body hidden retains script viewport scrolling")
- _checkpoint("viewport-policy/set-auto-and-read-width")
- auto_width = await page.evaluate(
+ _checkpoint("viewport-policy/set-auto")
+ await page.evaluate(
"""() => {
document.body.style.overflow = "auto";
scrollTo(0, 0);
- return document.documentElement.clientWidth;
}"""
)
+ await page.screenshot()
+ auto_width = await page.evaluate("() => document.documentElement.clientWidth")
assert_equal(auto_width, 785, "body auto exposes the viewport scrollbar")
_checkpoint("viewport-policy/wheel-auto")
await wheel(80)
@@ -1045,15 +1063,15 @@ async def _run_viewport_policy_and_numeric_gutter_workflow(
auto_wheel = await page.evaluate("() => scrollY")
assert_equal(auto_wheel, 80, "body auto permits user viewport scrolling")
- _checkpoint("viewport-policy/set-clip-and-read-width")
- clip_width = await page.evaluate(
+ _checkpoint("viewport-policy/set-clip")
+ await page.evaluate(
"""() => {
document.body.style.overflow = "clip";
- void document.documentElement.clientWidth;
scrollTo(0, 100);
- return document.documentElement.clientWidth;
}"""
)
+ await page.screenshot()
+ clip_width = await page.evaluate("() => document.documentElement.clientWidth")
assert_equal(clip_width, 800, "body clip maps to hidden at the viewport")
_checkpoint("viewport-policy/wheel-clip")
await wheel(80)
diff --git a/moli-cdp-smoke/moli_cdp_smoke/groups/dom_input.py b/moli-cdp-smoke/moli_cdp_smoke/groups/dom_input.py
index cc8d14009..909d3a7a6 100644
--- a/moli-cdp-smoke/moli_cdp_smoke/groups/dom_input.py
+++ b/moli-cdp-smoke/moli_cdp_smoke/groups/dom_input.py
@@ -365,11 +365,13 @@ async def run_locator_input_workflows(state: SmokeState) -> None:
{"target": True, "ancestor": True, "childDisplay": "block"},
"locator hover persists in Stylo and exposes the dropdown",
)
+ # Hover updates live style; publish the dropdown's geometry before input.
+ await page.screenshot()
await page.locator("#hover-child").click(timeout=1_000)
assert_equal(
await page.evaluate("() => window.__hoverChildClicked === true"),
True,
- "hover dropdown child is clickable without waiting for a screencast frame",
+ "hover dropdown child is clickable in the newly published snapshot",
)
await page.locator("#check").evaluate("input => input.checked = true")
@@ -1175,6 +1177,7 @@ async def run_cdp_input_navigation_replacement_workflows(state: SmokeState) -> N
""",
wait_until="domcontentloaded",
)
+ await page.screenshot()
async with page.expect_navigation(
url=mouse_destination,
wait_until="domcontentloaded",
@@ -1267,6 +1270,7 @@ async def run_mouse_event_workflows(state: SmokeState) -> None:
if missing:
raise SmokeError(f"missing mouse events {missing!r}: {log!r}")
+ await page.screenshot()
await reset()
await page.mouse.click(50, 60)
click_events = await events()
@@ -2102,6 +2106,7 @@ async def run_touch_input_workflows(state: SmokeState) -> None:
},
),
]
+ await page.screenshot()
for method, params in valid_commands:
await cdp.send(method, params)
diff --git a/moli-cdp-smoke/moli_cdp_smoke/groups/iframe_input.py b/moli-cdp-smoke/moli_cdp_smoke/groups/iframe_input.py
index a119806c6..ba49853d0 100644
--- a/moli-cdp-smoke/moli_cdp_smoke/groups/iframe_input.py
+++ b/moli-cdp-smoke/moli_cdp_smoke/groups/iframe_input.py
@@ -83,6 +83,9 @@ async def run_iframe_input_group(state: SmokeState) -> None:
wait_until="domcontentloaded",
)
+ # Publish the full frame tree; a parent rect alone need not include child
+ # hit-test surfaces, and coordinate input never builds missing geometry.
+ await page.screenshot()
geometry = await page.evaluate(
"""() => {
const frame = document.getElementById("input-frame");
@@ -157,6 +160,8 @@ async def run_iframe_input_group(state: SmokeState) -> None:
# Child point (560, 240) lies in the nested overflow element.
await mouse("mouseWheel", 536.8, 307.2, delta_y=120)
+ # The screenshot flushes pending wheel work and publishes its scroll offsets.
+ await page.screenshot()
async def wheel_applied() -> bool:
return bool(
@@ -232,14 +237,15 @@ async def run_iframe_input_group(state: SmokeState) -> None:
}"""
)
- async def frame_repositioned() -> bool:
- top = await page.evaluate(
+ await page.screenshot()
+ _assert_close(
+ await page.evaluate(
"""() => document.getElementById("input-frame")
.getBoundingClientRect().top"""
- )
- return isinstance(top, (int, float)) and abs(float(top) - 400.0) < 0.15
-
- await wait_until(frame_repositioned, "partially hidden iframe layout", timeout_ms=3_000)
+ ),
+ 400.0,
+ "partially hidden iframe layout",
+ )
await mouse("mouseMoved", 287.2, 470.2)
await mouse("mousePressed", 287.2, 470.2, button="left", buttons=1)
scroll_after_press = await page.evaluate("() => window.scrollY")
@@ -376,6 +382,7 @@ async def _run_nested_iframe_input_workflow(state: SmokeState) -> None:
parentScroller.scrollTo(50, 40);
}"""
)
+ await page.screenshot()
geometry = await page.evaluate(
"""() => {
@@ -503,6 +510,7 @@ async def _run_nested_iframe_input_workflow(state: SmokeState) -> None:
# Nested client point (20, 35) lies in the innermost overflow content.
await mouse("mouseWheel", 136.875, 115.0, delta_x=25, delta_y=30)
+ await page.screenshot()
async def nested_wheel_applied() -> bool:
return bool(
@@ -597,22 +605,7 @@ async def _run_nested_iframe_input_workflow(state: SmokeState) -> None:
await mouse("mousePressed", 148.875, 120.625, button="left", buttons=1)
await mouse("mouseReleased", 148.875, 120.625, button="left", buttons=0)
- async def nested_scrollbar_applied() -> bool:
- return bool(
- await page.evaluate(
- """() => {
- const outer = document.getElementById("outer-frame");
- const frame = outer.contentDocument.getElementById("nested-frame");
- return frame.contentDocument.getElementById("nested-scroll").scrollTop === 70;
- }"""
- )
- )
-
- await wait_until(
- nested_scrollbar_applied,
- "nested iframe scrollbar control",
- timeout_ms=3_000,
- )
+ await page.screenshot()
scrollbar_probe = await page.evaluate(
"""() => {
const outer = document.getElementById("outer-frame");
@@ -624,6 +617,7 @@ async def _run_nested_iframe_input_workflow(state: SmokeState) -> None:
}"""
)
scrollbar_top = float(scrollbar_probe["top"])
+ assert_equal(scrollbar_top, 70, "nested iframe scrollbar control")
assert_equal(
scrollbar_probe["eventCount"],
events_before_scrollbar,
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 e002ef8c1..1b7932fd1 100644
--- a/moli-renderer-v8/src/native_bridge/context_host/layout.rs
+++ b/moli-renderer-v8/src/native_bridge/context_host/layout.rs
@@ -291,19 +291,23 @@ impl JsContextHost {
let frame_viewports = self
.child_browsing_context_handles_in_document_order()
.into_iter()
- .filter(|frame| self.dom_host().owner_document_handle(*frame) == Some(document))
- .map(|frame| {
- let viewport = pass
- .tree
- .local_content_box_for_source(frame)
- .map(|content| {
- LayoutViewport::new(
- css_viewport_dimension(f64::from(content.width)),
- css_viewport_dimension(f64::from(content.height)),
- pass_viewport.device_pixel_ratio,
- )
- });
- (frame, viewport)
+ .filter_map(|frame| {
+ let owner = self.dom_host().owner_document_handle(frame)?;
+ let root = self
+ .dom_host()
+ .dom()
+ .document_element_handle_for_document(owner)?;
+ // A fresh paint publishes nested frame trees too. Publish each
+ // frame's used content viewport from that same projection.
+ let tree = pass.tree.tree_for_root(root)?;
+ let viewport = tree.local_content_box_for_source(frame).map(|content| {
+ LayoutViewport::new(
+ css_viewport_dimension(f64::from(content.width)),
+ css_viewport_dimension(f64::from(content.height)),
+ pass_viewport.device_pixel_ratio,
+ )
+ });
+ Some((frame, viewport))
})
.collect::<Vec<_>>();
let tree = pass.into_tree();
diff --git a/moli-renderer-v8/src/native_bridge/element.rs b/moli-renderer-v8/src/native_bridge/element.rs
index 7204540f7..90d0e256f 100644
--- a/moli-renderer-v8/src/native_bridge/element.rs
+++ b/moli-renderer-v8/src/native_bridge/element.rs
@@ -393,7 +393,7 @@ pub use geometry::ClientRect;
#[cfg(test)]
pub(crate) use geometry::observable_scrollbar_hit_test;
pub(crate) use geometry::{
- InputSurfaceHit, apply_scroll_observable_effects, observable_caret_position,
+ GeometryRead, InputSurfaceHit, apply_scroll_observable_effects, observable_caret_position,
observable_deep_hit_test, observable_event_offset, observable_geometry_batch,
observable_hit_test, observable_hit_test_all, observable_input_hit_test,
observable_scroll_adjusted_client_rect, observable_sources_with_fragments,
diff --git a/moli-renderer-v8/src/native_bridge/element/geometry/scroll.rs b/moli-renderer-v8/src/native_bridge/element/geometry/scroll.rs
index 01c521310..72f77d17e 100644
--- a/moli-renderer-v8/src/native_bridge/element/geometry/scroll.rs
+++ b/moli-renderer-v8/src/native_bridge/element/geometry/scroll.rs
@@ -159,7 +159,11 @@ pub(crate) fn apply_scroll_observable_effects(
}
queue_revealed_lazy_media_loads(scope, runtime_ptr);
unsafe { &*runtime_ptr }.invalidate_layout_after_interaction_state_change();
- crate::observer_runtime::queue_intersection_checks(scope, runtime_ptr);
+ crate::observer_runtime::queue_intersection_checks(
+ scope,
+ runtime_ptr,
+ moli_layout::LayoutFlushReason::ObserverDelivery.into(),
+ );
if effects
.iter()
.any(|effects| effects.queue_document_events())
diff --git a/moli-renderer-v8/src/observer_runtime/dom_access.rs b/moli-renderer-v8/src/observer_runtime/dom_access.rs
index fa40e7eec..eccf56f4a 100644
--- a/moli-renderer-v8/src/observer_runtime/dom_access.rs
+++ b/moli-renderer-v8/src/observer_runtime/dom_access.rs
@@ -1,5 +1,6 @@
use std::ptr::NonNull;
+use crate::native_bridge::element::GeometryRead;
use crate::{
dom::native::{DomHost, DomMutationEffects, NativeNodeId},
native_bridge::{JsContextHost, RuntimeObservableContextToken, WindowExecutionContextOwner},
@@ -473,13 +474,14 @@ pub(super) fn take_intersection_records<'s>(
pub(crate) fn queue_intersection_checks(
scope: &mut v8::PinScope<'_, '_>,
host_ptr: *mut JsContextHost,
+ read: GeometryRead,
) {
let mut access = ObserverHostAccess::new(host_ptr);
let Some(batch) = access.store(ObserverStore::take_intersection_check_batch) else {
return;
};
let Ok(completed) = access.read(|runtime| {
- intersection::compute_intersection_check_batch(runtime, runtime.dom_host(), batch)
+ intersection::compute_intersection_check_batch(runtime, runtime.dom_host(), batch, read)
}) else {
return;
};
@@ -499,9 +501,14 @@ fn queue_intersection_checks_with_dom(
else {
return;
};
- let Ok(completed) = access
- .read(|runtime| intersection::compute_intersection_check_batch(runtime, dom_host, batch))
- else {
+ let Ok(completed) = access.read(|runtime| {
+ intersection::compute_intersection_check_batch(
+ runtime,
+ dom_host,
+ batch,
+ GeometryRead::Demand(moli_layout::LayoutFlushReason::ObserverDelivery),
+ )
+ }) else {
return;
};
let queued_any = access.store(|store| store.apply_intersection_check_batch(completed));
@@ -516,7 +523,11 @@ pub(super) fn flush_intersection_checks(
) {
let mut access = ObserverHostAccess::new(host_ptr);
access.store(|store| store.begin_task(ObserverTask::IntersectionCheck));
- queue_intersection_checks(scope, host_ptr);
+ queue_intersection_checks(
+ scope,
+ host_ptr,
+ GeometryRead::Demand(moli_layout::LayoutFlushReason::ObserverDelivery),
+ );
}
pub(super) fn flush_intersection_observers(
diff --git a/moli-renderer-v8/src/observer_runtime/intersection.rs b/moli-renderer-v8/src/observer_runtime/intersection.rs
index fcfeb4080..6647a3abf 100644
--- a/moli-renderer-v8/src/observer_runtime/intersection.rs
+++ b/moli-renderer-v8/src/observer_runtime/intersection.rs
@@ -4,7 +4,7 @@ use std::{collections::HashMap, mem};
use crate::{
dom::native::{DomHost, NativeNodeId},
- native_bridge::JsContextHost,
+ native_bridge::{JsContextHost, element::GeometryRead},
};
use super::{
@@ -92,6 +92,7 @@ pub(super) fn compute_intersection_check_batch(
runtime: &JsContextHost,
dom_host: &DomHost,
batch: IntersectionCheckBatch,
+ read: GeometryRead,
) -> Result<CompletedIntersectionCheckBatch, moli_layout::LayoutError> {
if !runtime.layout_policy().uses_real_layout() {
return Ok(compute_mock_intersection_check_batch(
@@ -136,13 +137,27 @@ pub(super) fn compute_intersection_check_batch(
}
})
.collect();
- let answers = crate::native_bridge::element::observable_geometry_batch(
- runtime,
- document,
- moli_layout::LayoutFlushReason::ObserverDelivery,
- &moli_layout::LayoutQueryBatch::new(queries),
- )?;
- for (index, answer) in indices.into_iter().zip(answers.answers) {
+ let queries = moli_layout::LayoutQueryBatch::new(queries);
+ let answers = match read {
+ GeometryRead::Demand(reason) => {
+ crate::native_bridge::element::observable_geometry_batch(
+ runtime, document, reason, &queries,
+ )?
+ .answers
+ }
+ // Publication checks consume the completed projection, including
+ // absent/hidden frames; they must never start another layout pass.
+ GeometryRead::Snapshot => runtime
+ .with_latest_layout_tree_for_document(document, |tree| {
+ queries
+ .queries
+ .iter()
+ .map(|query| tree.answer_query(query))
+ .collect()
+ })
+ .unwrap_or_default(),
+ };
+ for (index, answer) in indices.into_iter().zip(answers) {
let moli_layout::LayoutQueryAnswer::IntersectionGeometry(geometry) = answer else {
return Err(moli_layout::LayoutError::source_contract(
"IntersectionObserver geometry",
diff --git a/moli-renderer-v8/src/script_vm.rs b/moli-renderer-v8/src/script_vm.rs
index dc8befa0f..f257e7f26 100644
--- a/moli-renderer-v8/src/script_vm.rs
+++ b/moli-renderer-v8/src/script_vm.rs
@@ -2551,6 +2551,11 @@ impl ScriptVm {
self.start_css_images_discovered_by_layout(css_images);
if matches!(&result, Ok(Some(_)))
&& let Err(error) = self.with_default_context_scope(|scope, runtime_ptr| {
+ crate::observer_runtime::queue_intersection_checks(
+ scope,
+ runtime_ptr,
+ crate::native_bridge::element::GeometryRead::Snapshot,
+ );
crate::native_bridge::element::queue_revealed_lazy_image_loads(
scope,
runtime_ptr,
@@ -2563,7 +2568,7 @@ impl ScriptVm {
// this body-only operation. Keep a failed admission non-fatal to
// the completed frame; the next refresh retries from its newer
// sampled geometry.
- tracing::warn!(?error, "failed to admit lazy images after layout refresh");
+ tracing::warn!(?error, "failed to queue post-layout observable work");
}
result
}
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 1836820eb..dcf3b65d1 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
@@ -382,26 +382,75 @@ fn intersection_checks_after_scroll_reuse_geometry_until_fresh_paint() {
"[false]"
);
- vm.eval("window.scrollTo(0, 400)")
- .expect("window scroll should evaluate");
- assert_eq!(
- vm.eval("JSON.stringify(window.__intersectionStates)")
- .expect("scroll should retain the published intersection geometry"),
- "[false]"
- );
+ let mut previous = "[false]";
+ for (scroll_y, reason, expected) in [
+ (
+ 400,
+ moli_layout::LayoutFlushReason::Screenshot,
+ "[false,true]",
+ ),
+ (
+ 0,
+ moli_layout::LayoutFlushReason::Screencast,
+ "[false,true,false]",
+ ),
+ ] {
+ let passes_before = vm.layout_pass_observability_for_test().1;
+ vm.eval(&format!("window.scrollTo(0, {scroll_y})"))
+ .expect("window scroll should evaluate");
+ assert_eq!(
+ vm.eval("JSON.stringify(window.__intersectionStates)")
+ .expect("scroll should retain the published intersection geometry"),
+ previous
+ );
+ assert_eq!(vm.layout_pass_observability_for_test().1, passes_before);
+ vm.paint_layout_snapshot(moli_layout::PaintViewport::new(800, 600, 1.0), reason)
+ .expect("fresh paint publishes the scrolled geometry")
+ .expect("document layout");
+ vm.eval("void 0")
+ .expect("complete the turn and deliver queued observers");
+ assert_eq!(
+ vm.eval("JSON.stringify(window.__intersectionStates)")
+ .expect("publication should queue observer delivery without another mutation"),
+ expected
+ );
+ assert_eq!(vm.layout_pass_observability_for_test().1, passes_before + 1);
+ previous = expected;
+ }
+}
+
+#[test]
+fn fresh_paint_publishes_nested_iframe_content_viewports() {
+ let mut vm = new_storage_test_vm("https://nested-frame-publication.test/");
+ vm.eval(
+ r#"
+ document.open();
+ document.write('<!doctype html><iframe id="outer" style="width:240px;height:180px"></iframe>');
+ document.close();
+ const outer = document.getElementById('outer');
+ const child = outer.contentDocument;
+ child.open();
+ child.write('<!doctype html><iframe id="inner" style="box-sizing:border-box;width:100px;height:80px;border:2px solid;padding:3px"></iframe>');
+ child.close();
+ "#,
+ ).expect("nested frame fixture");
+
+ let passes_before = vm.layout_pass_observability_for_test().1;
vm.screenshot_layout_snapshot(moli_layout::PaintViewport::new(800, 600, 1.0))
- .expect("fresh paint publishes the scrolled geometry")
+ .expect("paint nested frames")
.expect("document layout");
- vm.with_default_context_scope_and_checkpoint_for_test(|scope, runtime_ptr| {
- crate::observer_runtime::queue_intersection_checks(scope, runtime_ptr);
- Ok(())
- })
- .expect("check intersections against the newly published geometry");
assert_eq!(
- vm.eval("JSON.stringify(window.__intersectionStates)")
- .expect("scrolled intersection state should flush"),
- "[false,true]"
+ vm.eval(
+ r#"JSON.stringify([
+ outer.contentWindow.innerWidth, outer.contentWindow.innerHeight,
+ child.getElementById('inner').contentWindow.innerWidth,
+ child.getElementById('inner').contentWindow.innerHeight
+ ])"#
+ )
+ .expect("read published frame viewports"),
+ "[240,180,90,70]"
);
+ assert_eq!(vm.layout_pass_observability_for_test().1, passes_before + 1);
}
#[test]