Best headless browser for AI agents. Lite, Fast, High-Compatibility. Built in Rust
Rust ai-agentsai-toolsbrowserbrowser-automationcloud-browserheadlessheadless-browserkitesurfplaywrightpuppeteerrustservoweb-crawlerweb-crawlingweb-scraperweb-scraping
refactor(layout): publish layout only through explicit visual output
ldm0179241deddee
diff --git a/moli-cdp-smoke/moli_cdp_smoke/groups/action_window.py b/moli-cdp-smoke/moli_cdp_smoke/groups/action_window.pyindex 90d92d092..3feee4285 100644--- a/moli-cdp-smoke/moli_cdp_smoke/groups/action_window.py+++ b/moli-cdp-smoke/moli_cdp_smoke/groups/action_window.py@@ -263,6 +263,7 @@ async def _run_deadline_contract() -> None:await _reset_witness(fixture)await _navigate(client, session_id, f"{fixture}/action-window-deadline")+ await _capture_png(client, session_id)await _wait_for_intersections(client, session_id, [False])opened_at = asyncio.get_running_loop().time()@@ -337,6 +338,7 @@ async def _run_overflow_container_contract() -> None:await _reset_witness(fixture)await _navigate(client, session_id, f"{fixture}/action-window-overflow")+ await _capture_png(client, session_id)initial = await _evaluate_json(client,session_id,diff --git a/moli-cdp-smoke/moli_cdp_smoke/groups/agent_episode.py b/moli-cdp-smoke/moli_cdp_smoke/groups/agent_episode.pyindex 870d1e28d..f8390e0de 100644--- a/moli-cdp-smoke/moli_cdp_smoke/groups/agent_episode.py+++ b/moli-cdp-smoke/moli_cdp_smoke/groups/agent_episode.py@@ -80,6 +80,7 @@ async def run_agent_episode_group(source_url = f"{fixture}/agent-episode-smoke"await _navigate_and_wait(client, transcript, session_id, source_url)+ await _command(client, transcript, "Page.captureScreenshot", session_id=session_id)initial = await _observe(client, transcript, session_id)assert_equal(initial["url"], source_url, "agent episode initial URL")assert_equal(len(initial["elements"]), 2, "agent episode initial control count")diff --git a/moli-cdp-smoke/moli_cdp_smoke/groups/chromium_cdp.py b/moli-cdp-smoke/moli_cdp_smoke/groups/chromium_cdp.pyindex 27365c1c4..430a7b473 100644--- a/moli-cdp-smoke/moli_cdp_smoke/groups/chromium_cdp.py+++ b/moli-cdp-smoke/moli_cdp_smoke/groups/chromium_cdp.py@@ -10,7 +10,7 @@ from uuid import UUIDfrom . import SmokeStatefrom ..assertions import SmokeError, assert_equal, wait_untilfrom ..fixture import FixtureServer-from ..helpers import attach_cdp_event_collector, run_worker_command+from ..helpers import capture_layout, attach_cdp_event_collector, run_worker_commandasync def run_chromium_cdp_group(state: SmokeState) -> None:@@ -648,6 +648,7 @@ async def _verify_chromium_cookie_blocked_reason_sample(state: SmokeState) -> Noasync def _verify_chromium_fetch_continuation_extra_info_sample(state: SmokeState) -> None:fixture = state.fixtureawait state.page.goto(f"{fixture}/chromium-cdp-lifecycle-page")+observed_methods = ["Fetch.requestPaused","Fetch.authRequired",@@ -894,6 +895,7 @@ async def _verify_chromium_fetch_cancel_auth_response_stage_sample(state: SmokeState,) -> None:await state.page.goto(f"{state.fixture}/chromium-cdp-lifecycle-page")+url = f"{state.fixture}/api-auth?realm=chromium-fetch-cancel-response-stage"methods = ["Fetch.requestPaused",@@ -1006,6 +1008,7 @@ async def _verify_chromium_fetch_cancel_auth_response_stage_sample(async def _verify_chromium_worker_cancel_auth_response_sample(state: SmokeState) -> None:await state.page.goto(f"{state.fixture}/plain")+methods = ["Fetch.requestPaused","Fetch.authRequired",@@ -1145,6 +1148,7 @@ async def _verify_chromium_worker_auth_extra_info_sample(state: SmokeState) -> Nfixture.start()origin = fixture.urlawait state.page.goto(f"{origin}/plain")+realm = f"chromium-worker-{kind}-extra-info"relative_url = f"/api-auth?realm={realm}"url = f"{origin}{relative_url}"@@ -1303,6 +1307,7 @@ async def _verify_chromium_worker_auth_extra_info_sample(state: SmokeState) -> Nawait verify("fetch")await verify("xhr")await state.page.goto(f"{state.fixture}/plain")+state.record("chromium_worker_auth_extra_info_sample")@@ -1312,6 +1317,7 @@ async def _verify_chromium_navigation_cancel_auth_response_sample(page = state.pagecdp = state.cdpawait page.goto(f"{state.fixture}/plain")+url = f"{state.fixture}/api-auth?realm=chromium-navigation-cancel"methods = ["Fetch.requestPaused",@@ -2170,6 +2176,7 @@ async def _verify_chromium_child_frame_multi_session_fanout_sample(try:await page.goto(f"{state.fixture}/plain?child-frame-session-fanout", wait_until="load")+page_only = await state.context.new_cdp_session(page)lifecycle = await state.context.new_cdp_session(page)page_only_events = attach_cdp_event_collector(page_only, methods)@@ -2416,6 +2423,7 @@ async def _verify_chromium_page_fragment_navigation_sample(state: SmokeState) ->async def _verify_chromium_page_layout_metrics_sample(state: SmokeState) -> None:await _navigate_with_cdp_until_dom_ready(state, f"{state.fixture}/chromium-cdp-layout-page")+ await capture_layout(state.page)initial = await state.cdp.send("Page.getLayoutMetrics")content = initial.get("cssContentSize") or {}viewport = initial.get("cssLayoutViewport") or {}@@ -3066,6 +3074,7 @@ async def _verify_chromium_input_session_state_sample(state: SmokeState) -> Nonetry:await page.goto(f"{state.fixture}/plain?chromium-input-session-state")+await install_input_fixture()primary = await state.context.new_cdp_session(page)peer = await state.context.new_cdp_session(page)@@ -3106,6 +3115,7 @@ async def _verify_chromium_input_session_state_sample(state: SmokeState) -> None)await page.goto(f"{state.fixture}/plain?chromium-input-session-navigation")+await install_input_fixture()await dispatch_key(primary, "n")assert_equal(@@ -3139,6 +3149,7 @@ async def _verify_chromium_input_session_state_sample(state: SmokeState) -> Noneasync def _verify_chromium_log_domain_sample(state: SmokeState) -> None:page = await state.context.new_page()await page.goto(f"{state.fixture}/plain?chromium-log-domain")+primary = await state.context.new_cdp_session(page)peer = await state.context.new_cdp_session(page)controls = await state.context.new_cdp_session(page)@@ -3364,6 +3375,7 @@ async def _verify_chromium_audits_domain_sample(state: SmokeState) -> None:late = Nonetry:await page.goto(f"{state.fixture}/chromium-audits-quirks-page")+primary = await state.context.new_cdp_session(page)peer = await state.context.new_cdp_session(page)primary_events = attach_cdp_event_collector(primary, ["Audits.issueAdded"])@@ -3433,6 +3445,7 @@ async def _verify_chromium_audits_domain_sample(state: SmokeState) -> None:assert_equal(await peer.send("Audits.disable"), {}, "peer Audits.disable result")await page.goto(f"{state.fixture}/chromium-audits-csp-page")+primary_csp_start = len(primary_events)peer_disabled_count = len(peer_events)evaluate = await primary.send(@@ -3511,6 +3524,7 @@ async def _verify_chromium_audits_domain_sample(state: SmokeState) -> None:)await page.goto(f"{state.fixture}/plain?chromium-audits-storage-reset")+late = await state.context.new_cdp_session(page)late_events = attach_cdp_event_collector(late, ["Audits.issueAdded"])assert_equal(await late.send("Audits.enable"), {}, "late Audits.enable result")@@ -4801,6 +4815,7 @@ async def _verify_chromium_css_computed_style_breadth_sample(state: SmokeState)# only Moli's four size values change; both are stable after getBoxModel.size_names = ("width", "height", "inline-size", "block-size")initial_sizes = {name: values[name] for name in size_names}+ await capture_layout(state.page)await state.cdp.send("DOM.getBoxModel", {"nodeId": target["nodeId"]})sampled_names, sampled_values = await read_computed_style()assert_equal(sampled_names, names, "sampled CDP computed style names")@@ -4880,6 +4895,7 @@ async def _verify_sampled_computed_sizes(state: SmokeState) -> None:f'<!doctype html><style>html,body{{margin:0}}</style>'f'<{tag} id="sampled-size-target" style="{style}"></{tag}>')+await state.page.evaluate("globalThis.heldSizeStyle = getComputedStyle(document.getElementById('sampled-size-target'))")@@ -5161,6 +5177,7 @@ async def _verify_chromium_dom_debugger_event_listeners_sample(state: SmokeStatepeer = Nonetry:await page.goto(f"{state.fixture}/plain?dom-debugger-listeners")+primary = await state.context.new_cdp_session(page)peer = await state.context.new_cdp_session(page)evaluated = await primary.send(@@ -5477,6 +5494,7 @@ async def _verify_chromium_dom_debugger_event_listener_breakpoint_sample(peer = Nonetry:await page.goto(f"{state.fixture}/plain?dom-debugger-event-breakpoint")+owner = await state.context.new_cdp_session(page)peer = await state.context.new_cdp_session(page)owner_events = attach_cdp_event_collector(owner, ["Debugger.paused"])@@ -5636,6 +5654,7 @@ async def _verify_chromium_dom_debugger_event_listener_breakpoint_sample({"eventName": "click"},)await page.goto(f"{state.fixture}/plain?dom-debugger-event-breakpoint-after-navigation")+navigation_dispatch = asyncio.create_task(peer.send("Runtime.evaluate",@@ -5716,6 +5735,7 @@ async def _verify_chromium_dom_debugger_dom_breakpoint_sample(pause_promise_task: asyncio.Task[Any] | None = Nonetry:await page.goto(f"{state.fixture}/plain?dom-debugger-dom-breakpoint")+await page.evaluate("""document.body.innerHTML = `@@ -6517,6 +6537,7 @@ async def _verify_chromium_dom_debugger_dom_breakpoint_sample(await page.goto(f"{state.fixture}/plain?dom-debugger-dom-breakpoint-after-navigation")+navigation_result = await asyncio.wait_for(peer.send("Runtime.evaluate",@@ -6592,6 +6613,7 @@ async def _verify_chromium_dom_debugger_parser_mutation_no_pause_sample(set_content_task: asyncio.Task[Any] | None = Nonetry:await page.goto(f"{state.fixture}/plain?dom-debugger-parser-mutation")+session = await state.context.new_cdp_session(page)pauses = attach_cdp_event_collector(session, ["Debugger.paused"])await session.send("DOM.enable")@@ -6650,6 +6672,7 @@ async def _verify_chromium_dom_debugger_xhr_breakpoint_sample(pending_tasks: list[asyncio.Task[Any]] = []try:await page.goto(f"{state.fixture}/plain?dom-debugger-xhr-breakpoint")+owner = await state.context.new_cdp_session(page)peer = await state.context.new_cdp_session(page)owner_events = attach_cdp_event_collector(owner, ["Debugger.paused"])@@ -6842,6 +6865,7 @@ async def _verify_chromium_dom_debugger_xhr_breakpoint_sample()await page.goto(f"{state.fixture}/semantic-frames?dom-debugger-xhr-navigation")+child = next((framediff --git a/moli-cdp-smoke/moli_cdp_smoke/groups/classic_scrollbar.py b/moli-cdp-smoke/moli_cdp_smoke/groups/classic_scrollbar.pyindex 235e16b18..9c46de2c7 100644--- a/moli-cdp-smoke/moli_cdp_smoke/groups/classic_scrollbar.py+++ b/moli-cdp-smoke/moli_cdp_smoke/groups/classic_scrollbar.py@@ -3,6 +3,7 @@ from __future__ import annotationsimport sysfrom . import SmokeState+from ..helpers import capture_layoutfrom ..assertions import SmokeError, assert_equalfrom ..png_image import decode_pngfrom ..raw_cdp import discover_websocket_url@@ -70,6 +71,7 @@ async def run_classic_scrollbar_group(state: SmokeState) -> None:""",wait_until="domcontentloaded",)+ await capture_layout(page)_checkpoint("initial/read-geometry")metrics = await page.evaluate("""() => [@@ -100,7 +102,7 @@ async def run_classic_scrollbar_group(state: SmokeState) -> None:)_checkpoint("initial/capture-screenshot")- image = decode_png(await page.screenshot())+ image = decode_png(await capture_layout(page))assert_equal((image.width, image.height),(800, 700),@@ -144,7 +146,7 @@ async def run_classic_scrollbar_group(state: SmokeState) -> None:"scroll input retains the published geometry",)_checkpoint("initial/publish-drag-state")- await page.screenshot()+ await capture_layout(page)_checkpoint("initial/read-drag-state")state_after_drag = await page.evaluate("""() => ({@@ -167,17 +169,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()+ await capture_layout(page)_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()+ await capture_layout(page)_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()+ await capture_layout(page)_checkpoint("initial/read-track-state")after_track = float(await page.evaluate("() => scroller.scrollTop"))control_scroll = [before_controls, after_back, after_forward, after_track]@@ -286,6 +288,7 @@ async def _run_multi_scroller_drag_workflow(state: SmokeState, is_moli: bool) ->""",wait_until="domcontentloaded",)+ await capture_layout(page)_checkpoint("multi-scroller/read-geometry")metrics = await page.evaluate("""() => {@@ -336,7 +339,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()+ await capture_layout(page)_checkpoint("multi-scroller/read-captured-drag-state")first_drag = await page.evaluate("""() => [@@ -376,7 +379,7 @@ async def _run_multi_scroller_drag_workflow(state: SmokeState, is_moli: bool) ->document.getElementById("inner").scrollTop = 0;}""")- await page.screenshot()+ await capture_layout(page)await mouse("mousePressed", 225, 25, pressed=True)await mouse("mouseMoved", 700, 45, pressed=True)await mouse("mouseReleased", 700, 45, pressed=False)@@ -384,7 +387,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()+ await capture_layout(page)_checkpoint("multi-scroller/read-final-drag-state")state_after = await page.evaluate("""() => ({@@ -460,6 +463,7 @@ async def _run_root_scrollbar_workflow(state: SmokeState, is_moli: bool) -> None""",wait_until="domcontentloaded",)+ await capture_layout(page)_checkpoint("root/read-overflow-geometry")metrics = await page.evaluate("""() => ({@@ -486,7 +490,7 @@ async def _run_root_scrollbar_workflow(state: SmokeState, is_moli: bool) -> Noneraise SmokeError(f"root scrollbar fixture did not overflow: {metrics!r}")_checkpoint("root/capture-overflow-screenshot")- image = decode_png(await page.screenshot())+ image = decode_png(await capture_layout(page))right = metrics["innerWidth"] - 5bottom = metrics["innerHeight"] - 5assert_equal(image.pixel(right, 30), (255, 0, 0, 255), "root vertical thumb paint")@@ -557,6 +561,7 @@ async def _run_root_scrollbar_workflow(state: SmokeState, is_moli: bool) -> None""",wait_until="domcontentloaded",)+ await capture_layout(page)_checkpoint("root/read-containing-block-geometry")containing_block = await page.evaluate("""() => {@@ -594,6 +599,7 @@ async def _run_root_scrollbar_workflow(state: SmokeState, is_moli: bool) -> None""",wait_until="domcontentloaded",)+ await capture_layout(page)async def stable_metrics() -> list[float]:return await page.evaluate(@@ -630,6 +636,7 @@ async def _run_root_scrollbar_workflow(state: SmokeState, is_moli: bool) -> None""",wait_until="domcontentloaded",)+ await capture_layout(page)_checkpoint("root/read-stable-overflow-geometry")stable_overflow = await stable_metrics()assert_equal(@@ -654,8 +661,9 @@ async def _run_root_scrollbar_workflow(state: SmokeState, is_moli: bool) -> None""",wait_until="domcontentloaded",)+ await capture_layout(page)_checkpoint("root/capture-rtl-screenshot")- rtl_image = decode_png(await page.screenshot())+ rtl_image = decode_png(await capture_layout(page))assert_equal(rtl_image.pixel(795, 30),(255, 0, 0, 255),@@ -702,6 +710,7 @@ async def _run_closed_popover_overflow_workflow(state: SmokeState, is_moli: bool""",wait_until="domcontentloaded",)+ await capture_layout(page)async def metrics() -> list[float | str]:return await page.evaluate(@@ -718,7 +727,7 @@ async def _run_closed_popover_overflow_workflow(state: SmokeState, is_moli: boolassert_equal(closed, ["none", 0, 785, 785], "closed popover stays out of root overflow")_checkpoint("popover/show")await page.evaluate("() => tip.showPopover()")- await page.screenshot()+ await capture_layout(page)_checkpoint("popover/read-open-geometry")opened = await metrics()assert_equal(@@ -728,7 +737,7 @@ async def _run_closed_popover_overflow_workflow(state: SmokeState, is_moli: bool)_checkpoint("popover/hide")await page.evaluate("() => tip.hidePopover()")- await page.screenshot()+ await capture_layout(page)_checkpoint("popover/read-reclosed-geometry")reclosed = await metrics()assert_equal(reclosed, closed, "closing popover removes its root overflow contribution")@@ -780,6 +789,7 @@ async def _run_painted_surface_workflow(state: SmokeState, is_moli: bool) -> Non""",wait_until="domcontentloaded",)+ await capture_layout(page)_checkpoint("painted-surface/prepare-overlap")await page.evaluate("""() => {@@ -787,7 +797,7 @@ async def _run_painted_surface_workflow(state: SmokeState, is_moli: bool) -> Nonreturn [scroller.clientWidth, scroller.clientHeight, overlay.getBoundingClientRect().x];}""")- await page.screenshot()+ await capture_layout(page)async def mouse(event_type: str, x: int, y: int, *, pressed: bool) -> None:_checkpoint(f"painted-surface/input-{event_type}-{x}-{y}")@@ -834,7 +844,7 @@ async def _run_painted_surface_workflow(state: SmokeState, is_moli: bool) -> Non)# Publish the scene after hiding the overlay so input uses the new surface._checkpoint("painted-surface/render-after-mutation")- await page.screenshot()+ await capture_layout(page)# The lower-right 15x15 intersection is painted UA chrome. Moli exposes# it as a consume-only control surface rather than a DOM target.await mouse("mousePressed", 210, 110, pressed=True)@@ -891,6 +901,7 @@ async def _run_viewport_policy_and_numeric_gutter_workflow(""",wait_until="domcontentloaded",)+ await capture_layout(page)_checkpoint("viewport-policy/read-both-edges-geometry")both_edges = await page.evaluate("""() => ["block", "flex", "grid", "overflow"].map(id => {@@ -965,6 +976,7 @@ async def _run_viewport_policy_and_numeric_gutter_workflow(""",wait_until="domcontentloaded",)+ await capture_layout(page)_checkpoint("viewport-policy/read-edge-insets-geometry")resolved_edge_insets = await page.evaluate("""() => [@@ -1009,6 +1021,7 @@ async def _run_viewport_policy_and_numeric_gutter_workflow(""",wait_until="domcontentloaded",)+ await capture_layout(page)async def wheel(delta_y: int) -> None:await cdp.send(@@ -1052,7 +1065,7 @@ async def _run_viewport_policy_and_numeric_gutter_workflow(scrollTo(0, 0);}""")- await page.screenshot()+ await capture_layout(page)auto_width = await page.evaluate("() => document.documentElement.clientWidth")assert_equal(auto_width, 785, "body auto exposes the viewport scrollbar")_checkpoint("viewport-policy/wheel-auto")@@ -1070,7 +1083,7 @@ async def _run_viewport_policy_and_numeric_gutter_workflow(scrollTo(0, 100);}""")- await page.screenshot()+ await capture_layout(page)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")@@ -1092,6 +1105,7 @@ async def _run_viewport_policy_and_numeric_gutter_workflow(""",wait_until="domcontentloaded",)+ await capture_layout(page)async def root_gutter_metrics() -> list[float]:return await page.evaluate(@@ -1113,7 +1127,7 @@ async def _run_viewport_policy_and_numeric_gutter_workflow("() => { document.documentElement.style.scrollbarGutter = 'stable both-edges'; }")_checkpoint("viewport-policy/render-root-both-edges")- await page.screenshot()+ await capture_layout(page)_checkpoint("viewport-policy/read-root-both-edges-geometry")both_edge_root = await root_gutter_metrics()assert_equal(@@ -1133,6 +1147,7 @@ async def _run_viewport_policy_and_numeric_gutter_workflow(""",wait_until="domcontentloaded",)+ await capture_layout(page)_checkpoint("viewport-policy/read-display-contents-width")display_contents_width = await page.evaluate("() => document.documentElement.getBoundingClientRect().width"@@ -1145,7 +1160,7 @@ async def _run_viewport_policy_and_numeric_gutter_workflow(_checkpoint("viewport-policy/restore-principal-body")await page.evaluate("() => { document.body.style.display = 'block'; }")_checkpoint("viewport-policy/render-principal-body")- await page.screenshot()+ await capture_layout(page)_checkpoint("viewport-policy/read-principal-body-width")principal_body_width = await page.evaluate("() => document.documentElement.getBoundingClientRect().width"diff --git a/moli-cdp-smoke/moli_cdp_smoke/groups/core.py b/moli-cdp-smoke/moli_cdp_smoke/groups/core.pyindex 3f4f6e3ec..0e0c869b1 100644--- a/moli-cdp-smoke/moli_cdp_smoke/groups/core.py+++ b/moli-cdp-smoke/moli_cdp_smoke/groups/core.py@@ -6,7 +6,7 @@ from playwright.async_api import TimeoutError as PlaywrightTimeoutErrorfrom . import SmokeStatefrom ..assertions import SmokeError, assert_equal, wait_until-from ..helpers import attach_cdp_event_collector+from ..helpers import capture_layout, attach_cdp_event_collectordef _assert_websocket_event_constraints(events: list[str], label: str) -> None:@@ -86,7 +86,7 @@ async def run_core_group(state: SmokeState) -> None:# OnDemand layout intentionally reuses its latest sampled geometry across# DOM/style mutations. Reach the fixture's final DOM-only state before the# first explicit refresh so this smoke does not require snapshot invalidation.- await page.screenshot()+ await capture_layout(page)await page.locator("#visible").wait_for(state="visible", timeout=5_000)assert_equal(await page.text_content("#visible", timeout=5_000), "visible ready", "locator visible text")await page.wait_for_selector("#hide-me", state="hidden", timeout=5_000)diff --git a/moli-cdp-smoke/moli_cdp_smoke/groups/dom_hit_test.py b/moli-cdp-smoke/moli_cdp_smoke/groups/dom_hit_test.pyindex 64de701e6..e75af40be 100644--- a/moli-cdp-smoke/moli_cdp_smoke/groups/dom_hit_test.py+++ b/moli-cdp-smoke/moli_cdp_smoke/groups/dom_hit_test.py@@ -110,6 +110,7 @@ async def run_dom_hit_test_group(if navigation.get("errorText"):raise SmokeError(f"Page.navigate failed: {navigation!r}")await _wait_for_load(client, session_id, seen)+ await _success(client, "Page.captureScreenshot", session_id=session_id)command_id = await client.send("DOM.getNodeForLocation",diff --git a/moli-cdp-smoke/moli_cdp_smoke/groups/dom_input.py b/moli-cdp-smoke/moli_cdp_smoke/groups/dom_input.pyindex 909d3a7a6..45ae22afa 100644--- a/moli-cdp-smoke/moli_cdp_smoke/groups/dom_input.py+++ b/moli-cdp-smoke/moli_cdp_smoke/groups/dom_input.py@@ -8,6 +8,7 @@ import urllib.parsefrom playwright.async_api import Error as PlaywrightError, expectfrom . import SmokeState+from ..helpers import capture_layoutfrom ..assertions import SmokeError, assert_equal, wait_untilfrom ..progress import await_with_progress@@ -18,12 +19,14 @@ async def run_dom_input_group(state: SmokeState) -> None:temp_dir = state.temp_dirawait page.set_content('<main id="set-content">set content ok</main>')+ await capture_layout(page)assert_equal(await page.text_content("#set-content"), "set content ok", "setContent text")state.record("set_content_static_dom")await page.set_content('<main id="set-content-inline">inline content ok</main><script>window.__moliSetContentInlineRan = (window.__moliSetContentInlineRan || 0) + 1;</script>')+ await capture_layout(page)assert_equal(await page.text_content("#set-content-inline"), "inline content ok", "setContent inline text")assert_equal(await page.evaluate("() => window.__moliSetContentInlineRan"), 1, "setContent inline script ran")state.record("set_content_inline_script")@@ -44,6 +47,7 @@ async def run_dom_input_group(state: SmokeState) -> None:</script>""")+ await capture_layout(page)await page.set_input_files("#upload", str(upload_file))uploaded = await page.evaluate("""() => {@@ -91,6 +95,7 @@ async def run_dom_input_group(state: SmokeState) -> None:state.record("set_input_files")await page.set_content('<input id="chooser" type="file" multiple>')+ await capture_layout(page)surface = await page.locator("#chooser").evaluate("""input => [input instanceof HTMLInputElement,@@ -131,6 +136,7 @@ async def run_dom_input_group(state: SmokeState) -> None:""",wait_until="domcontentloaded",)+ await capture_layout(page)async with page.expect_file_chooser(timeout=10_000) as scripted_chooser_info:await page.locator("#open-chooser").evaluate("button => button.click()")scripted_chooser = await scripted_chooser_info.value@@ -144,6 +150,7 @@ async def run_dom_input_group(state: SmokeState) -> None:state.record("file_chooser_show_picker")await page.set_content(f'<a id="go" href="{fixture}/plain">go</a>')+ await capture_layout(page)assert_equal(await page.get_attribute("#go", "href"), f"{fixture}/plain", "link navigation href")await _navigate_until_dom_ready(state, f"{fixture}/plain")assert_equal(await page.text_content("main"), "plain ok", "click navigation target text")@@ -151,6 +158,7 @@ async def run_dom_input_group(state: SmokeState) -> None:quoted_email = "agent'[email protected]"await _navigate_until_dom_ready(state, f"{fixture}/auth-email")+ await capture_layout(page)await page.fill("#email", quoted_email)await _navigate_until_dom_ready(state, f"{fixture}/auth-password?email={urllib.parse.quote(quoted_email)}")assert_equal(@@ -324,6 +332,7 @@ async def run_locator_input_workflows(state: SmokeState) -> None:});}""")+ await capture_layout(page)await page.locator("#text").fill("alpha")await page.locator("#text").press("End")@@ -366,7 +375,7 @@ async def run_locator_input_workflows(state: SmokeState) -> None:"locator hover persists in Stylo and exposes the dropdown",)# Hover updates live style; publish the dropdown's geometry before input.- await page.screenshot()+ await capture_layout(page)await page.locator("#hover-child").click(timeout=1_000)assert_equal(await page.evaluate("() => window.__hoverChildClicked === true"),@@ -423,6 +432,7 @@ ye </div>""",wait_until="domcontentloaded",)+ await capture_layout(page)assert_equal(await page.get_by_test_id("Hello").text_content(), "Hello world", "Playwright get_by_test_id text")assert_equal(@@ -569,6 +579,7 @@ async def run_role_selector_state_workflows(state: SmokeState) -> None:""",wait_until="domcontentloaded",)+ await capture_layout(page)await page.evaluate("() => { document.getElementById('check-mixed').indeterminate = true; }")async def ids(locator) -> list[str]:@@ -709,6 +720,7 @@ async def run_playwright_expect_matcher_workflows(state: SmokeState) -> None:""",wait_until="domcontentloaded",)+ await capture_layout(page)await expect(page.locator("#node")).to_have_text("Text content")await expect(page.locator("#node")).to_contain_text("ext cont")@@ -737,6 +749,7 @@ async def run_playwright_expect_matcher_workflows(state: SmokeState) -> None:""",wait_until="domcontentloaded",)+ await capture_layout(page)await expect(page.locator("#eventual li")).to_have_count(2, timeout=5_000)await expect(page.locator("#eventual li")).to_have_text(["One", "Two"])@@ -769,6 +782,7 @@ async def run_locator_composition_workflows(state: SmokeState) -> None:""",wait_until="domcontentloaded",)+ await capture_layout(page)assert_equal(await page.locator(".box >> p").count(), 4, "Playwright locator chained selector count")assert_equal(await page.locator(".box").locator("p").count(), 4, "Playwright locator.locator count")@@ -855,10 +869,12 @@ async def run_keyboard_editing_workflows(state: SmokeState) -> None:page = state.pageawait page.set_content("<input id='plain' type='text'>")+ await capture_layout(page)await page.type("#plain", "hello")assert_equal(await page.eval_on_selector("#plain", "input => input.value"), "hello", "Playwright page.type basic")await page.set_content("<input id='prefilled' type='text' value='hello'>")+ await capture_layout(page)await page.type("#prefilled", "world")assert_equal(await page.eval_on_selector("#prefilled", "input => input.value"),@@ -867,6 +883,7 @@ async def run_keyboard_editing_workflows(state: SmokeState) -> None:)await page.set_content("<input id='reset' type='text' value='hello'><div id='other' tabindex='2'>other</div>")+ await capture_layout(page)await page.eval_on_selector("#reset","""input => {@@ -883,6 +900,7 @@ async def run_keyboard_editing_workflows(state: SmokeState) -> None:)await page.set_content("<input id='focused' type='text' value='hello'>")+ await capture_layout(page)await page.eval_on_selector("#focused","""input => {@@ -899,6 +917,7 @@ async def run_keyboard_editing_workflows(state: SmokeState) -> None:)await page.set_content("<input id='number' type='number' value='2'>")+ await capture_layout(page)await page.type("#number", "13")assert_equal(await page.eval_on_selector("#number", "input => input.value"),@@ -919,6 +938,7 @@ async def run_keyboard_editing_workflows(state: SmokeState) -> None:""",wait_until="domcontentloaded",)+ await capture_layout(page)await page.type("#cancel", "Hello World!")assert_equal(await page.eval_on_selector("#cancel", "textarea => textarea.value"),@@ -939,6 +959,7 @@ async def run_keyboard_editing_workflows(state: SmokeState) -> None:""",wait_until="domcontentloaded",)+ await capture_layout(page)await page.focus("#guarded")await page.eval_on_selector("#guarded",@@ -964,6 +985,7 @@ async def run_keyboard_editing_workflows(state: SmokeState) -> None:""",wait_until="domcontentloaded",)+ await capture_layout(page)await page.focus("#repeat")await page.keyboard.down("a")await page.keyboard.press("a")@@ -1063,6 +1085,7 @@ async def run_cdp_control_key_name_workflow(state: SmokeState) -> None:session = Nonetry:await page.goto(f"{state.fixture}/plain?cdp-control-key-name")+ await capture_layout(page)await page.evaluate("""() => {document.body.innerHTML = '<input id="control-key">';@@ -1081,6 +1104,7 @@ async def run_cdp_control_key_name_workflow(state: SmokeState) -> None:}}""")+ await capture_layout(page)session = await state.context.new_cdp_session(page)# Rod encodes Enter as a carriage-return CDP key string. Chromium@@ -1133,6 +1157,7 @@ async def run_cdp_input_navigation_replacement_workflows(state: SmokeState) -> N""",wait_until="domcontentloaded",)+ await capture_layout(page)await page.focus("#navigation-field")async with page.expect_navigation(url=key_destination,@@ -1177,7 +1202,8 @@ async def run_cdp_input_navigation_replacement_workflows(state: SmokeState) -> N""",wait_until="domcontentloaded",)- await page.screenshot()+ await capture_layout(page)+ await capture_layout(page)async with page.expect_navigation(url=mouse_destination,wait_until="domcontentloaded",@@ -1254,6 +1280,7 @@ async def run_mouse_event_workflows(state: SmokeState) -> None:""",wait_until="domcontentloaded",)+ await capture_layout(page)async def events() -> list[dict[str, object]]:return await page.evaluate("() => window.__mouseEvents")@@ -1270,7 +1297,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 capture_layout(page)await reset()await page.mouse.click(50, 60)click_events = await events()@@ -1365,6 +1392,7 @@ async def run_fill_input_type_workflows(state: SmokeState) -> None:""",wait_until="domcontentloaded",)+ await capture_layout(page)await page.fill("#field", "some value")assert_equal(await page.locator("#field").input_value(), "some value", "Playwright page.fill input")await page.fill("#area", "line one\nline two")@@ -1384,6 +1412,7 @@ async def run_fill_input_type_workflows(state: SmokeState) -> None:raise SmokeError(f"Playwright locator.clear should dispatch composed input for text input: {clear_events}")await page.set_content('<input id="typed">', wait_until="domcontentloaded")+ await capture_layout(page)for input_type in ["password", "search", "tel", "text", "url", "invalid-type"]:await page.locator("#typed").evaluate("""(input, inputType) => {@@ -1403,6 +1432,7 @@ async def run_fill_input_type_workflows(state: SmokeState) -> None:await page.set_content(f'<input id="unsupported" type="{input_type}" style="width:32px;height:24px">')+ await capture_layout(page)error = await _expect_playwright_error(page.fill("#unsupported", ""))if f'Input of type "{input_type}" cannot be filled' not in error:raise SmokeError(f"Playwright page.fill unsupported {input_type} error mismatch: {error}")@@ -1419,6 +1449,7 @@ async def run_fill_input_type_workflows(state: SmokeState) -> None:]for input_type, fill_value, expected in value_cases:await page.set_content(f'<input id="typed" type="{input_type}" min="0" max="100" value="">')+ await capture_layout(page)await page.fill("#typed", fill_value)assert_equal(await page.locator("#typed").input_value(),@@ -1437,6 +1468,7 @@ async def run_fill_input_type_workflows(state: SmokeState) -> None:]for input_type, fill_value, expected_error in invalid_cases:await page.set_content(f'<input id="typed" type="{input_type}">')+ await capture_layout(page)error = await _expect_playwright_error(page.fill("#typed", fill_value))if expected_error not in error:raise SmokeError(f"Playwright page.fill invalid {input_type} error mismatch: {error}")@@ -1466,6 +1498,7 @@ async def run_fill_input_type_workflows(state: SmokeState) -> None:shadow_fill_fixture.replace("__INPUT_TYPE__", input_type),wait_until="domcontentloaded",)+ await capture_layout(page)await page.locator("input").fill(fill_value)assert_equal(await page.evaluate("() => window.__shadowFillEvents"),@@ -1484,12 +1517,14 @@ async def run_fill_input_type_workflows(state: SmokeState) -> None:""",wait_until="domcontentloaded",)+ await capture_layout(page)await page.fill("#delayed-disabled", "enabled", timeout=5_000)await page.fill("#delayed-readonly", "editable", timeout=5_000)assert_equal(await page.locator("#delayed-disabled").input_value(), "enabled", "Playwright page.fill waits for enabled")assert_equal(await page.locator("#delayed-readonly").input_value(), "editable", "Playwright page.fill waits for editable")await page.set_content("<select><option>value1</option></select>")+ await capture_layout(page)error = await _expect_playwright_error(page.fill("select", ""))if "Element is not an <input>, <textarea> or [contenteditable] element" not in error:raise SmokeError(f"Playwright page.fill non-fillable error mismatch: {error}")@@ -1501,6 +1536,7 @@ async def run_check_input_workflows(state: SmokeState) -> None:page = state.pageawait page.set_content("<input id='checkbox' type='checkbox'>", wait_until="domcontentloaded")+ await capture_layout(page)assert_equal(await page.locator("input").is_checked(), False, "Playwright is_checked reads unchecked checkbox")await page.check("input", timeout=1_000)assert_equal(await page.locator("input").is_checked(), True, "Playwright is_checked reads checked checkbox")@@ -1508,15 +1544,18 @@ async def run_check_input_workflows(state: SmokeState) -> None:assert_equal(await page.locator("input").is_checked(), False, "Playwright page.uncheck toggles checkbox")await page.set_content("<div>Check me</div>", wait_until="domcontentloaded")+ await capture_layout(page)check_error = await _expect_playwright_error(page.check("div"))if "Not a checkbox or radio button" not in check_error:raise SmokeError(f"Playwright page.check non-checkbox error mismatch: {check_error}")await page.set_content("<div role='button'>Check me</div>", wait_until="domcontentloaded")+ await capture_layout(page)role_button_error = await _expect_playwright_error(page.check("div"))if "Not a checkbox or radio button" not in role_button_error:raise SmokeError(f"Playwright page.check role=button error mismatch: {role_button_error}")await page.set_content("<input id='trial' type='checkbox'>", wait_until="domcontentloaded")+ await capture_layout(page)await page.check("#trial", trial=True, timeout=1_000)assert_equal(await page.locator("#trial").is_checked(), False, "Playwright page.check trial does not check")await page.locator("#trial").evaluate("input => input.checked = true")@@ -1524,6 +1563,7 @@ async def run_check_input_workflows(state: SmokeState) -> None:assert_equal(await page.locator("#trial").is_checked(), True, "Playwright page.uncheck trial does not uncheck")await page.set_content("<input id='set-checked' type='checkbox'>", wait_until="domcontentloaded")+ await capture_layout(page)await page.set_checked("#set-checked", True, timeout=1_000)assert_equal(await page.locator("#set-checked").is_checked(), True, "Playwright page.set_checked toggles")@@ -1569,6 +1609,7 @@ async def run_select_option_workflows(state: SmokeState) -> None:""",wait_until="domcontentloaded",)+ await capture_layout(page)async def reset_select() -> None:await page.evaluate("() => window.__resetSelectEvents()")@@ -1698,6 +1739,7 @@ async def run_selector_eval_and_handle_conversion_workflows(state: SmokeState) -<div class="list">hello</div><div class="list">beautiful</div><div class="list">world!</div>""")+ await capture_layout(page)assert_equal(await page.eval_on_selector("css=section", "element => element.id"),"testAttribute",@@ -1789,6 +1831,7 @@ async def run_dom_handle_workflows(state: SmokeState) -> None:</main>""",)+ await capture_layout(page)evaluated = await page.locator("#handle-target").evaluate("node => `${node.tagName}:${node.dataset.kind}:${node.querySelectorAll('.item').length}`")@@ -1889,6 +1932,7 @@ async def _wait_for_child_frame(page) -> object:async def _goto_iframe_for_playwright_frame_model(page, url: str) -> object:try:await page.goto(url, wait_until="domcontentloaded", timeout=10_000)+ await capture_layout(page)except PlaywrightError as error:if "Timeout" not in str(error):raise@@ -1936,18 +1980,30 @@ async def run_element_handle_state_workflows(state: SmokeState) -> None:</script>""")+ await capture_layout(page)visible_later = await page.query_selector("#visible-later")hide_later = await page.query_selector("#hide-later")enable_later = await page.query_selector("#enable-later span")editable_later = await page.query_selector("#editable-later")if visible_later is None or hide_later is None or enable_later is None or editable_later is None:raise SmokeError("missing element-handle state fixture")- await visible_later.wait_for_element_state("visible", timeout=5_000)- await hide_later.wait_for_element_state("hidden", timeout=5_000)- await enable_later.wait_for_element_state("enabled", timeout=5_000)- await editable_later.wait_for_element_state("editable", timeout=5_000)+ async def publish_timer_changes() -> None:+ await page.wait_for_function(+ """() => document.getElementById('visible-later').style.display === 'block'+ && document.getElementById('hide-later').style.display === 'none'"""+ )+ await capture_layout(page)++ await asyncio.gather(+ visible_later.wait_for_element_state("visible", timeout=5_000),+ hide_later.wait_for_element_state("hidden", timeout=5_000),+ enable_later.wait_for_element_state("enabled", timeout=5_000),+ editable_later.wait_for_element_state("editable", timeout=5_000),+ publish_timer_changes(),+ )await page.set_content("<div id='timeout-state' style='display:none'>never visible</div>")+ await capture_layout(page)timeout_handle = await page.query_selector("#timeout-state")if timeout_handle is None:raise SmokeError("missing element-handle timeout fixture")@@ -1956,6 +2012,7 @@ async def run_element_handle_state_workflows(state: SmokeState) -> None:raise SmokeError(f"unexpected element handle state timeout error: {timeout_error}")await page.set_content("<button id='detach-state' disabled>Target</button>")+ await capture_layout(page)detach_handle = await page.query_selector("#detach-state")if detach_handle is None:raise SmokeError("missing element-handle detach fixture")@@ -1966,6 +2023,7 @@ async def run_element_handle_state_workflows(state: SmokeState) -> None:raise SmokeError(f"unexpected element handle detached state error: {detach_error}")await page.set_content("<div id='detach-hidden'>detach hidden</div>")+ await capture_layout(page)hidden_handle = await page.query_selector("#detach-hidden")if hidden_handle is None:raise SmokeError("missing element-handle detached-hidden fixture")@@ -1997,6 +2055,7 @@ async def run_touch_input_workflows(state: SmokeState) -> None:<div id="tap-target" draggable="true" style="position:absolute;left:0;top:0;width:120px;height:80px">tap</div>""",)+ await capture_layout(page)for method in ["Input.dispatchMouseEvent",@@ -2106,7 +2165,7 @@ async def run_touch_input_workflows(state: SmokeState) -> None:},),]- await page.screenshot()+ await capture_layout(page)for method, params in valid_commands:await cdp.send(method, params)diff --git a/moli-cdp-smoke/moli_cdp_smoke/groups/emulation_storage.py b/moli-cdp-smoke/moli_cdp_smoke/groups/emulation_storage.pyindex 32a218276..a7f5d26f5 100644--- a/moli-cdp-smoke/moli_cdp_smoke/groups/emulation_storage.py+++ b/moli-cdp-smoke/moli_cdp_smoke/groups/emulation_storage.py@@ -6,6 +6,7 @@ import urllib.parseimport urllib.requestfrom typing import Any, Awaitable+from ..helpers import capture_layoutfrom ..assertions import SmokeError, assert_equal, record, record_contractfrom ..png_image import decode_png@@ -28,6 +29,7 @@ async def run_playwright_screenshot_clip_surface(try:page = await context.new_page()await page.goto(f"{fixture}/plain", wait_until="load", timeout=10_000)+ await capture_layout(page)initial = decode_png(await page.screenshot())assert_equal((initial.width, initial.height),@@ -36,6 +38,7 @@ async def run_playwright_screenshot_clip_surface()await page.set_viewport_size({"width": 320, "height": 240})+ await capture_layout(page)resized = decode_png(await page.screenshot())assert_equal((resized.width, resized.height),diff --git a/moli-cdp-smoke/moli_cdp_smoke/groups/iframe_input.py b/moli-cdp-smoke/moli_cdp_smoke/groups/iframe_input.pyindex ba49853d0..c51de3ae9 100644--- a/moli-cdp-smoke/moli_cdp_smoke/groups/iframe_input.py+++ b/moli-cdp-smoke/moli_cdp_smoke/groups/iframe_input.py@@ -1,6 +1,7 @@from __future__ import annotationsfrom . import SmokeState+from ..helpers import capture_layoutfrom ..assertions import SmokeError, assert_equal, wait_untilfrom ..raw_cdp import discover_websocket_url@@ -82,10 +83,11 @@ async def run_iframe_input_group(state: SmokeState) -> None:""",wait_until="domcontentloaded",)+ await capture_layout(page)# 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()+ await capture_layout(page)geometry = await page.evaluate("""() => {const frame = document.getElementById("input-frame");@@ -161,7 +163,7 @@ 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()+ await capture_layout(page)async def wheel_applied() -> bool:return bool(@@ -237,7 +239,7 @@ async def run_iframe_input_group(state: SmokeState) -> None:}""")- await page.screenshot()+ await capture_layout(page)_assert_close(await page.evaluate("""() => document.getElementById("input-frame")@@ -334,6 +336,7 @@ async def _run_nested_iframe_input_workflow(state: SmokeState) -> None:""",wait_until="domcontentloaded",)+ await capture_layout(page)await page.evaluate("""() => {const parentScroller = document.getElementById("parent-scroller");@@ -382,7 +385,7 @@ async def _run_nested_iframe_input_workflow(state: SmokeState) -> None:parentScroller.scrollTo(50, 40);}""")- await page.screenshot()+ await capture_layout(page)geometry = await page.evaluate("""() => {@@ -510,7 +513,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()+ await capture_layout(page)async def nested_wheel_applied() -> bool:return bool(@@ -605,7 +608,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)- await page.screenshot()+ await capture_layout(page)scrollbar_probe = await page.evaluate("""() => {const outer = document.getElementById("outer-frame");diff --git a/moli-cdp-smoke/moli_cdp_smoke/groups/inspector_routing.py b/moli-cdp-smoke/moli_cdp_smoke/groups/inspector_routing.pyindex 0822f7b34..4ba0900e6 100644--- a/moli-cdp-smoke/moli_cdp_smoke/groups/inspector_routing.py+++ b/moli-cdp-smoke/moli_cdp_smoke/groups/inspector_routing.py@@ -1376,6 +1376,11 @@ async def _nested_non_v8_main_receiver_matrix(if not isinstance(frame_id, str) or not frame_id:raise SmokeError(f"Page.getFrameTree returned no top frame id: {initial_tree}")+ capture_id = await client.send("Page.captureScreenshot", session_id=page.attached_session_id)+ capture, _ = await client.recv_until_id(capture_id, timeout=5)+ if "error" in capture:+ raise SmokeError(f"prepare paused geometry fixture: {capture}")+paused_evaluate_id = await client.send("Runtime.evaluate",{"expression": "debugger; 84", "returnByValue": True},diff --git a/moli-cdp-smoke/moli_cdp_smoke/groups/multi_page.py b/moli-cdp-smoke/moli_cdp_smoke/groups/multi_page.pyindex ef804046b..82b327e6d 100644--- a/moli-cdp-smoke/moli_cdp_smoke/groups/multi_page.py+++ b/moli-cdp-smoke/moli_cdp_smoke/groups/multi_page.py@@ -9,6 +9,7 @@ from typing import Anyfrom playwright.async_api import Error as PlaywrightErrorfrom playwright.async_api import TimeoutError as PlaywrightTimeoutError+from ..helpers import capture_layoutfrom ..assertions import SmokeError, assert_equal, record, wait_untilfrom ..helpers import attach_cdp_event_collector, run_worker_commandfrom .multi_page_chromium_contracts import multi_page_chromium_contract_cases@@ -918,6 +919,7 @@ async def _background_tasks_workers_and_screenshots()))+ await asyncio.gather(*(capture_layout(page) for page in pages))screenshots = await asyncio.gather(*(page.screenshot() for page in pages))if any(not screenshot.startswith(b"\x89PNG\r\n\x1a\n") for screenshot in screenshots):raise SmokeError("concurrent page screenshot returned a non-PNG payload")diff --git a/moli-cdp-smoke/moli_cdp_smoke/groups/target_semantics.py b/moli-cdp-smoke/moli_cdp_smoke/groups/target_semantics.pyindex 1bec5d37a..6f881cdfe 100644--- a/moli-cdp-smoke/moli_cdp_smoke/groups/target_semantics.py+++ b/moli-cdp-smoke/moli_cdp_smoke/groups/target_semantics.py@@ -116,6 +116,7 @@ def _raw_semantic_contracts() -> tuple[RawSemanticContract, ...]:"Target.createTarget","Target.attachToTarget x2","Runtime.evaluate",+ "Page.captureScreenshot","Input.dispatchMouseEvent x2","Target.getTargetInfo",],@@ -1441,7 +1442,7 @@ async def _middle_click_background_popup(await wait_until(source_document_loaded, "middle-click source document complete")stage = "install middle-click anchor"- fixture_result, _ = await _raw_command(+ await _raw_command(client,"Runtime.evaluate",{@@ -1458,13 +1459,23 @@ async def _middle_click_background_popup("window.__middleAuxclickEvents.push(`${event.type}:${event.button}:${event.isTrusted}`);""});""document.body.append(anchor);"- "return anchor.getBoundingClientRect().toJSON();""})()"),"returnByValue": True,},session_id=source_session_id,)+ stage = "publish middle-click fixture"+ await _raw_command(client, "Page.captureScreenshot", {}, session_id=source_session_id)+ fixture_result, _ = await _raw_command(+ client,+ "Runtime.evaluate",+ {+ "expression": "document.querySelector('a').getBoundingClientRect().toJSON()",+ "returnByValue": True,+ },+ session_id=source_session_id,+ )fixture_rect = fixture_result["result"].get("value")_require(isinstance(fixture_rect, dict), "middle-click anchor has no layout rect")diff --git a/moli-cdp-smoke/moli_cdp_smoke/helpers.py b/moli-cdp-smoke/moli_cdp_smoke/helpers.pyindex cab3f111c..de06ae2ce 100644--- a/moli-cdp-smoke/moli_cdp_smoke/helpers.py+++ b/moli-cdp-smoke/moli_cdp_smoke/helpers.py@@ -1,8 +1,19 @@from __future__ import annotations+import base64from typing import Any+async def capture_layout(page: Any) -> bytes:+ """Publish fixture layout with CDP, without Playwright's geometry preflight."""+ client = await page.context.new_cdp_session(page)+ try:+ result = await client.send("Page.captureScreenshot", {"format": "png"})+ return base64.b64decode(result["data"], validate=True)+ finally:+ await client.detach()++def attach_cdp_event_collector(client: Any, methods: list[str]) -> list[dict[str, Any]]:events: list[dict[str, Any]] = []for method in methods:diff --git a/moli-cdp-smoke/moli_cdp_smoke/puppeteer_smoke.mjs b/moli-cdp-smoke/moli_cdp_smoke/puppeteer_smoke.mjsindex 08d1bd261..7f11b2499 100644--- a/moli-cdp-smoke/moli_cdp_smoke/puppeteer_smoke.mjs+++ b/moli-cdp-smoke/moli_cdp_smoke/puppeteer_smoke.mjs@@ -444,6 +444,9 @@ async function main() {);record('puppeteer_dom_selector_activation_workflow', domInteractionResult);+ const layoutClient = await page.createCDPSession();+ await layoutClient.send('Page.captureScreenshot');+ await layoutClient.detach();const nameHandle = await withTimeout('page.$(#name)', page.$('#name'));if (!nameHandle) {throw new Error('Puppeteer ElementHandle lookup for #name returned null');@@ -814,6 +817,9 @@ async function main() {globalThis.__puppeteerPositionClickCount += 1;});}));+ const positionLayout = await page.createCDPSession();+ await positionLayout.send('Page.captureScreenshot');+ await positionLayout.detach();let positionClickError = null;try {await withTimeout('page.click(position boundary)', page.click('#position-click'));diff --git a/moli-core/src/runtime/tests.rs b/moli-core/src/runtime/tests.rsindex c54876938..c4cab5e13 100644--- a/moli-core/src/runtime/tests.rs+++ b/moli-core/src/runtime/tests.rs@@ -4950,6 +4950,10 @@ async fn renderer_owner_created_page_runs_input_query_commands() -> Result<()> {.await?;let mut page = materialize_page_created_reply(&renderer_owner, reply)?;+ let capture = page.start_capture_screenshot()?;+ let captured = capture.wait().await?;+ page.finish_capture_screenshot(captured)?;+let input_backend_node_id = query_selector_node_from_live_document(&mut page, "#field").await?.expect("input node should exist")@@ -5046,6 +5050,10 @@ async fn renderer_owner_created_page_reports_real_client_rect_for_positioned_nod.await?;let mut page = materialize_page_created_reply(&renderer_owner, reply)?;+ let capture = page.start_capture_screenshot()?;+ let captured = capture.wait().await?;+ page.finish_capture_screenshot(captured)?;+let target_backend_node_id = query_selector_node_from_live_document(&mut page, "#target").await?.expect("target div should exist")diff --git a/moli-core/tests/dom_bridge.rs b/moli-core/tests/dom_bridge.rsindex d928314fc..e42c21ded 100644--- a/moli-core/tests/dom_bridge.rs+++ b/moli-core/tests/dom_bridge.rs@@ -191,6 +191,12 @@ async fn range_internal_algorithms_ignore_page_tampered_methods() -> Result<()>.fetch(&server.url("/compat/range-internal-algorithms-ignore-page-tampered-methods")).await?;+ let capture = page.start_capture_screenshot()?;+ let captured = capture.wait().await?;+ page.finish_capture_screenshot(captured)?;+ page.evaluate_runtime_expression_async("runGeometryProbe()")+ .await?;+assert!(page.serialize_html_async().awaitdiff --git a/moli-core/tests/fixtures/runtime/intersection_observer_root_geometry.html b/moli-core/tests/fixtures/runtime/intersection_observer_root_geometry.htmlindex 857848ef6..e94d83a24 100644--- a/moli-core/tests/fixtures/runtime/intersection_observer_root_geometry.html+++ b/moli-core/tests/fixtures/runtime/intersection_observer_root_geometry.html@@ -5,6 +5,7 @@<body><div id="root" style="position: relative; width: 100px; height: 40px; overflow: hidden;"><div id="target" style="width: 30px; height: 20px; margin-left: 90px;"></div></div><script>+globalThis.runGeometryProbe = () => {const root = document.getElementById("root");const target = document.getElementById("target");const rootRect = root.getBoundingClientRect();@@ -65,6 +66,7 @@marginObserver.disconnect();}, 0);});- </script>+ };+</script></body></html>diff --git a/moli-core/tests/fixtures/runtime/range_internal_algorithms_ignore_page_tampered_methods.html b/moli-core/tests/fixtures/runtime/range_internal_algorithms_ignore_page_tampered_methods.htmlindex 10dfc477a..6eaced287 100644--- a/moli-core/tests/fixtures/runtime/range_internal_algorithms_ignore_page_tampered_methods.html+++ b/moli-core/tests/fixtures/runtime/range_internal_algorithms_ignore_page_tampered_methods.html@@ -184,6 +184,7 @@body.setAttribute("data-context-error", String(error));}+ globalThis.runGeometryProbe = () => {try {const range = document.createRange();range.selectNodeContents(geometryTarget);@@ -196,6 +197,7 @@} catch (error) {body.setAttribute("data-geometry-error", String(error));}+ };</script></body></html>diff --git a/moli-core/tests/fixtures/runtime/secondary_webapis.html b/moli-core/tests/fixtures/runtime/secondary_webapis.htmlindex 8250d974a..64107346b 100644--- a/moli-core/tests/fixtures/runtime/secondary_webapis.html+++ b/moli-core/tests/fixtures/runtime/secondary_webapis.html@@ -23,6 +23,7 @@><div id="target" style="width: 37px; height: 19px;"></div><script>+globalThis.runGeometryProbe = () => {const file = new File(["abc"], "note.txt", {type: "text/plain",lastModified: 123,@@ -74,6 +75,7 @@ const observer = new ResizeObserver((entries, instance) => {observer.disconnect();});observer.observe(target);+};</script></body></html>diff --git a/moli-core/tests/web_apis.rs b/moli-core/tests/web_apis.rsindex bee25241a..e67c74ad9 100644--- a/moli-core/tests/web_apis.rs+++ b/moli-core/tests/web_apis.rs@@ -1441,10 +1441,16 @@ async fn secondary_webapis_cover_file_file_list_and_resize_observer_basics() ->let server = FixtureServer::spawn().await?;let browser = Browser::new(AppConfig::default().with_layout_policy(LayoutPolicy::OnDemand))?;- let page = browser+ let mut page = browser.fetch(&server.url("/compat/secondary-webapis")).await?;+ let capture = page.start_capture_screenshot()?;+ let captured = capture.wait().await?;+ page.finish_capture_screenshot(captured)?;+ page.evaluate_runtime_expression_async("runGeometryProbe()")+ .await?;+assert!(page.serialize_html_async().await@@ -5823,6 +5829,10 @@ async fn root_client_metrics_track_window_surface_profile() -> Result<()> {let mut page = browser.fetch(&server.url("/static")).await?;+ let capture = page.start_capture_screenshot()?;+ let captured = capture.wait().await?;+ page.finish_capture_screenshot(captured)?;+let value = page.evaluate_runtime_expression_async(r#"JSON.stringify({@@ -5990,6 +6000,12 @@ async fn intersection_observer_root_geometry_reflects_root_and_target_rects() ->let mut page = browser.fetch(&server.url("/compat/intersection-observer-root-geometry")).await?;+ let capture = page.start_capture_screenshot()?;+ let captured = capture.wait().await?;+ page.finish_capture_screenshot(captured)?;+ page.evaluate_runtime_expression_async("runGeometryProbe()")+ .await?;+browser.wait_for_script_truthy(&mut page,diff --git a/moli-layout/src/error.rs b/moli-layout/src/error.rsindex b33e6e6d2..930088c5e 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 {- /// Coordinate input consumes a published snapshot and cannot create one.+ /// Geometry and input consume published layout and cannot create it.#[error(- "coordinate input requires an existing layout snapshot; request geometry or a screenshot first"+ "no published layout is available for the current document; call Page.captureScreenshot or Page.printToPDF, or start Page.startScreencast and wait for a frame, then retry. Geometry queries and input do not create layout")]NoLayoutSnapshot,/// A geometry consumer forced layout before the Document had an element root.diff --git a/moli-layout/src/layout_tree/hit_test.rs b/moli-layout/src/layout_tree/hit_test.rsindex aca3f12bf..56230bd1d 100644--- a/moli-layout/src/layout_tree/hit_test.rs+++ b/moli-layout/src/layout_tree/hit_test.rs@@ -610,7 +610,6 @@ mod tests {}).collect(),Vec::new(),- true,);let mut query = PointClipQuery::new(&tree, LayoutPoint::new(25.0, 25.0));assert!(query.results.is_empty());diff --git a/moli-layout/src/layout_tree/pass_result.rs b/moli-layout/src/layout_tree/pass_result.rsindex 0cbe9b7c2..44c8deced 100644--- a/moli-layout/src/layout_tree/pass_result.rs+++ b/moli-layout/src/layout_tree/pass_result.rs@@ -24,11 +24,8 @@ pub struct LayoutCssImageReference<N> {pub enum LayoutFlushReason {Screenshot,Screencast,+ Print,SynchronousGeometry,- CdpGeometry,- ObserverDelivery,- HitTest,- Paint,Test,}diff --git a/moli-layout/src/layout_tree/query.rs b/moli-layout/src/layout_tree/query.rsindex 143cb68da..a9edb597a 100644--- a/moli-layout/src/layout_tree/query.rs+++ b/moli-layout/src/layout_tree/query.rs@@ -10,7 +10,7 @@ use super::{LayoutBoxModel, LayoutFragmentId, LayoutOutputBoxId, LayoutPoint, LayoutQuad,LayoutResolvedGridTracks, LayoutSize, LayoutViewport,},- pass_result::{LayoutFlushReason, LayoutPassMetrics},+ pass_result::LayoutPassMetrics,tree::FrozenLayoutTree,};@@ -188,13 +188,10 @@ pub trait GeometryProvider {/// Answers a batch from the provider's latest layout state.///- /// The provider decides whether this requires a fresh pass or can reuse an- /// already-owned tree; callers must not assume that one call equals one- /// layout computation.+ /// Reading never computes layout. Real-layout providers require a tree+ /// published by a screenshot, screencast frame, or PDF output.fn answer(&mut self,- reason: LayoutFlushReason,- viewport: LayoutViewport,queries: &LayoutQueryBatch<Self::NodeId>,) -> Result<LayoutAnswers<Self::NodeId>, LayoutError>;}diff --git a/moli-layout/src/layout_tree/source_query.rs b/moli-layout/src/layout_tree/source_query.rsindex 7db002011..b81384bd0 100644--- a/moli-layout/src/layout_tree/source_query.rs+++ b/moli-layout/src/layout_tree/source_query.rs@@ -838,7 +838,6 @@ mod tests {identity_space(None),Vec::new(),Vec::new(),- true,);let output = LayoutNodeOutput {principal_box: Some(box_id),diff --git a/moli-layout/src/layout_tree/tree.rs b/moli-layout/src/layout_tree/tree.rsindex e8276c3d8..3dfa5e002 100644--- a/moli-layout/src/layout_tree/tree.rs+++ b/moli-layout/src/layout_tree/tree.rs@@ -111,7 +111,6 @@ whereviewport_coordinate_space: FrozenCoordinateSpace,pub clip_chain: Vec<LayoutClipNode>,embedded_frames: Vec<FrozenEmbeddedFrame<N>>,- embedded_frames_complete: bool,}impl<N> FrozenLayoutTree<N>@@ -246,13 +245,6 @@ where.map(|frame| frame.tree.as_ref())}- /// Whether every live child frame encountered by this pass was projected.- /// Hit-test demands require this bit before reusing a tree produced by a- /// geometry-only pass.- pub const fn embedded_frames_complete(&self) -> bool {- self.embedded_frames_complete- }-pub fn embedded_frames(&self) -> impl ExactSizeIterator<Item = &FrozenEmbeddedFrame<N>> {self.embedded_frames.iter()}@@ -274,7 +266,6 @@ whereviewport_coordinate_space: FrozenCoordinateSpace,clip_chain: Vec<LayoutClipNode>,embedded_frames: Vec<FrozenEmbeddedFrame<N>>,- embedded_frames_complete: bool,) -> Self {Self {source_root,@@ -288,7 +279,6 @@ whereviewport_coordinate_space,clip_chain,embedded_frames,- embedded_frames_complete,}}}diff --git a/moli-layout/src/pass.rs b/moli-layout/src/pass.rsindex ebeb6fb0a..e519c2eac 100644--- a/moli-layout/src/pass.rs+++ b/moli-layout/src/pass.rs@@ -116,13 +116,6 @@ impl LayoutPassRequest {self.paint_capture.is_some()}- /// Whether this demand needs a complete embedded-frame input projection.- /// Paint always composes child frames, while coordinate input needs their- /// source-bearing geometry without retaining independent child snapshots.- pub const fn requests_embedded_frames(self) -> bool {- self.requests_paint() || matches!(self.reason, LayoutFlushReason::HitTest)- }-/// Whether paint snapshots for this demand should include CSS backgrounds./// Layout-only demands return `true` so recursive renderers retain their/// normal paint defaults when no capture policy exists.@@ -237,7 +230,7 @@ wherelet numeric_layout_elapsed = phase_started.elapsed();let phase_started = Instant::now();let mut embedded_frames = HashMap::new();- if request.requests_embedded_frames() {+ 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| {@@ -283,7 +276,6 @@ wherestarted,request.paint_capture,embedded_frames,- request.requests_embedded_frames(),crate::projection::LayoutPassPhaseMetrics {box_tree_elapsed,list_marker_elapsed,diff --git a/moli-layout/src/projection.rs b/moli-layout/src/projection.rsindex ded04acbe..bd6275c6e 100644--- a/moli-layout/src/projection.rs+++ b/moli-layout/src/projection.rs@@ -40,7 +40,6 @@ pub(crate) fn finish_layout_pass<N>(started: Instant,paint_capture: Option<PaintCaptureRequest>,mut embedded_frames: HashMap<LayoutBoxId, (N, crate::EmbeddedFrameSnapshot<N>)>,- embedded_frames_complete: bool,phase_metrics: LayoutPassPhaseMetrics,) -> Result<LayoutPassResult<N>, LayoutError>where@@ -135,12 +134,7 @@ wheretree: Box::new(snapshot.tree),}).collect();- let tree = projection.into_frozen_tree(- source_root,- content_size,- embedded_frames,- embedded_frames_complete,- );+ let tree = projection.into_frozen_tree(source_root, content_size, embedded_frames);Ok(LayoutPassResult::new(tree,diagnostics,@@ -916,7 +910,6 @@ wheresource_root: N,content_size: LayoutSize,embedded_frames: Vec<crate::FrozenEmbeddedFrame<N>>,- embedded_frames_complete: bool,) -> FrozenLayoutTree<N> {let root_box = LayoutOutputBoxId::from_index(self.world.root.index());let mut coordinate_spaces = self@@ -991,7 +984,6 @@ whereviewport_coordinate_space,self.clip_chain,embedded_frames,- embedded_frames_complete,)}}diff --git a/moli-page-types/src/layout.rs b/moli-page-types/src/layout.rsindex 84f73c573..8e9301933 100644--- a/moli-page-types/src/layout.rs+++ b/moli-page-types/src/layout.rs@@ -6,7 +6,8 @@ pub enum LayoutPolicy {/// such as renderer screenshots that require a real layout backend.#[default]Mock,- /// Build layout only for an operation that observes geometry or paint.+ /// Only screenshot, screencast, and PDF output build and publish layout.+ /// Geometry queries and input read the last published layout, if any.OnDemand,}diff --git a/moli-protocol-server/src/protocol_server/tests/bidi.rs b/moli-protocol-server/src/protocol_server/tests/bidi.rsindex feed31254..2a8b41627 100644--- a/moli-protocol-server/src/protocol_server/tests/bidi.rs+++ b/moli-protocol-server/src/protocol_server/tests/bidi.rs@@ -6850,13 +6850,13 @@ async fn websocket_bidi_bound_devtools_command_executes_target_commands() {.await.expect("send browsingContext.captureScreenshot");let screenshot = recv_ws_json(&mut socket).await;- assert_eq!(screenshot["type"], json!("error"));- assert_eq!(screenshot["id"], json!(20_u64));- assert_eq!(screenshot["error"], json!("unsupported operation"));- assert_eq!(- screenshot["message"],- json!("Page.captureScreenshot is not supported: renderer screenshots are not implemented.")- );+ assert_eq!(screenshot["type"], "success", "{screenshot:?}");+ let bytes = BASE64_STANDARD+ .decode(screenshot["result"]["data"].as_str().expect("PNG data"))+ .expect("valid base64");+ assert!(bytes.starts_with(b"\x89PNG\r\n\x1a\n"));+ assert_eq!(u32::from_be_bytes(bytes[16..20].try_into().unwrap()), 40);+ assert_eq!(u32::from_be_bytes(bytes[20..24].try_into().unwrap()), 20);socket.send(WsMessage::Text(@@ -10786,7 +10786,7 @@ async fn websocket_bidi_iframe_context_print_and_capture_screenshot() {}#[tokio::test]-async fn websocket_bidi_capture_screenshot_reports_unsupported_without_placeholder_payload() {+async fn websocket_bidi_page_and_box_screenshot_publish_real_png() {// Ported from Chromium/WPT// webdriver/tests/bidi/browsing_context/capture_screenshot/capture_screenshot.py and// webdriver/tests/bidi/browsing_context/capture_screenshot/clip.py.@@ -10834,12 +10834,14 @@ async fn websocket_bidi_capture_screenshot_reports_unsupported_without_placehold}),).await;- assert_eq!(full["type"], json!("error"));- assert_eq!(full["error"], json!("unsupported operation"));- assert_eq!(- full["message"],- json!("Page.captureScreenshot is not supported: renderer screenshots are not implemented.")- );+ assert_eq!(full["type"], "success", "{full:?}");+ let bytes = BASE64_STANDARD+ .decode(full["result"]["data"].as_str().expect("PNG data"))+ .expect("valid base64");+ assert!(bytes.starts_with(b"\x89PNG\r\n\x1a\n"));++ assert_eq!(u32::from_be_bytes(bytes[16..20].try_into().unwrap()), 180);+ assert_eq!(u32::from_be_bytes(bytes[20..24].try_into().unwrap()), 120);let clip = send_bidi_command(&mut socket,@@ -10857,12 +10859,13 @@ async fn websocket_bidi_capture_screenshot_reports_unsupported_without_placehold}),).await;- assert_eq!(clip["type"], json!("error"));- assert_eq!(clip["error"], json!("unsupported operation"));- assert_eq!(- clip["message"],- json!("Page.captureScreenshot is not supported: renderer screenshots are not implemented.")- );+ assert_eq!(clip["type"], "success", "{clip:?}");+ let bytes = BASE64_STANDARD+ .decode(clip["result"]["data"].as_str().expect("PNG data"))+ .expect("valid base64");+ assert!(bytes.starts_with(b"\x89PNG\r\n\x1a\n"));+ assert_eq!(u32::from_be_bytes(bytes[16..20].try_into().unwrap()), 50);+ assert_eq!(u32::from_be_bytes(bytes[20..24].try_into().unwrap()), 26);let navigate_element = send_bidi_command(&mut socket,@@ -17724,8 +17727,7 @@ async fn websocket_bidi_print_invalid_parameters_match_wpt_error_shape() {async fn websocket_bidi_capture_screenshot_invalid_parameters_and_unsupported_boundary() {// Ported from Chromium/WPT// webdriver/tests/bidi/browsing_context/capture_screenshot/invalid.py.- // Unknown element clips would be `no such node` once real screenshots exist, but the- // current product boundary is to fail all valid screenshot requests as unsupported.+ // Element clips remain unsupported; page and box captures use the renderer.let (cdp_addr, protocol_server) = spawn_test_protocol_server().await;let (mut socket, context_id) = bidi_session_with_context(cdp_addr).await;let mut id = 100_u64;@@ -18989,6 +18991,14 @@ async fn websocket_bidi_input_perform_and_release_actions_use_shared_input() {).await;assert_eq!(navigate["type"], json!("success"));+ let captured = send_bidi_command_response(+ &mut socket,+ 90,+ "browsingContext.captureScreenshot",+ json!({"context": context_id.clone()}),+ )+ .await;+ assert_eq!(captured["type"], "success");let type_a = send_bidi_command_response(&mut socket,@@ -19508,6 +19518,14 @@ async fn websocket_bidi_input_element_origin_uses_real_geometry() {).await;assert_eq!(navigate["type"], json!("success"));+ let captured = send_bidi_command_response(+ &mut socket,+ 90,+ "browsingContext.captureScreenshot",+ json!({"context": context_id.clone()}),+ )+ .await;+ assert_eq!(captured["type"], "success");let button = send_bidi_command_response(&mut socket,diff --git a/moli-protocol-server/src/protocol_server/tests/cdp_dynamic_page.rs b/moli-protocol-server/src/protocol_server/tests/cdp_dynamic_page.rsindex 3b9bb5d8e..e3fb687f0 100644--- a/moli-protocol-server/src/protocol_server/tests/cdp_dynamic_page.rs+++ b/moli-protocol-server/src/protocol_server/tests/cdp_dynamic_page.rs@@ -407,7 +407,12 @@ async fn websocket_cdp_mouse_wheel_scrolls_page_and_honors_prevent_default() {}),).await;- let marker_before = response_by_id(&installed, 1)["result"]["result"]["value"]+ assert!(response_by_id(&installed, 1).get("result").is_some());+ let captured = send_cdp_command(&mut page, 90, "Page.captureScreenshot", None, json!({})).await;+ assert!(response_by_id(&captured, 90).get("result").is_some());+ let measured = send_cdp_command(&mut page, 91, "Runtime.evaluate", None,+ json!({"expression": "document.getElementById('marker').getBoundingClientRect().top", "returnByValue": true})).await;+ let marker_before = response_by_id(&measured, 91)["result"]["result"]["value"].as_f64().expect("initial marker top");diff --git a/moli-protocol-server/src/protocol_server/tests/classic.rs b/moli-protocol-server/src/protocol_server/tests/classic.rsindex 98517588a..50f602f52 100644--- a/moli-protocol-server/src/protocol_server/tests/classic.rs+++ b/moli-protocol-server/src/protocol_server/tests/classic.rs@@ -3,6 +3,19 @@ use axum::http::{HeaderMap, header};use base64::engine::general_purpose::STANDARD as BASE64_STANDARD;use serde_json::{Map, Value};+async fn classic_capture_layout(app: Router, session_id: &str) {+ let captured = classic_request_json(+ app,+ Method::GET,+ &format!("/session/{session_id}/screenshot"),+ )+ .await;+ assert!(+ captured["value"].is_string(),+ "fixture screenshot: {captured}"+ );+}+#[tokio::test]async fn webdriver_classic_status_session_and_delete_routes_use_value_envelope() {let app = build_router(test_state());@@ -329,6 +342,7 @@ async fn webdriver_classic_download_files_match_selenium_remote_extension() {json!({ "url": page_url }),).await;+ classic_capture_layout(app.clone(), session_id).await;assert_eq!(navigated["value"], Value::Null);let link_id = classic_find_css_element_id(app.clone(), session_id, "#dl").await;let clicked = classic_request_json(@@ -1176,6 +1190,7 @@ async fn webdriver_classic_element_reference_owner_rejects_forged_and_stales_aftjson!({ "url": first_url }),).await;+ classic_capture_layout(app.clone(), session_id).await;let element_id = classic_find_css_element_id(app.clone(), session_id, "#target").await;assert!(@@ -5299,6 +5314,7 @@ async fn webdriver_classic_element_user_prompt_behavior_matches_chromium_wpt() {.await,json!({ "value": null }));+ classic_capture_layout(app.clone(), session_id).await;let foo_id = classic_find_css_element_id(app.clone(), session_id, "#foo").await;let text_id = classic_find_css_element_id(app.clone(), session_id, "#text").await;@@ -5624,6 +5640,7 @@ async fn webdriver_classic_get_element_rect_cases_ported_from_chromium_wpt() {}),).await;+ classic_capture_layout(app.clone(), session_id).await;assert_eq!(navigated, json!({ "value": null }));let element_id = classic_find_css_element_id(app.clone(), session_id, "#target").await;@@ -6056,6 +6073,7 @@ async fn webdriver_classic_get_element_property_cases_ported_from_chromium_wpt()).await;assert_eq!(seeded, json!({ "value": "seeded" }));+ classic_capture_layout(app.clone(), session_id).await;for (property, expected) in [("__string", json!("foobar")),@@ -6973,6 +6991,7 @@ async fn webdriver_classic_shadow_root_link_text_edges_ported_from_chromium_wpt(json!({ "url": classic_data_url(&html) }),).await;+ classic_capture_layout(app.clone(), session_id).await;assert_eq!(navigated, json!({ "value": null }));let host_id = classic_find_css_element_id(app.clone(), session_id, "#host").await;@@ -7354,7 +7373,7 @@ async fn webdriver_classic_shadow_root_owner_context_errors_ported_from_chromium}#[tokio::test]-async fn webdriver_classic_screenshot_reports_unsupported_without_placeholder_payload() {+async fn webdriver_classic_page_screenshot_publishes_layout_and_element_clip_remains_unsupported() {// Ported from Selenium py/test/selenium/webdriver/common/takes_screenshots_tests.py:// test_get_screenshot_as_base64, test_get_screenshot_as_png and// test_get_element_screenshot.@@ -7385,15 +7404,13 @@ async fn webdriver_classic_screenshot_reports_unsupported_without_placeholder_pa&format!("/session/{session_id}/screenshot"),).await;- assert_eq!(page_status, StatusCode::METHOD_NOT_ALLOWED);- assert_eq!(- page_screenshot["value"]["error"],- json!("unsupported operation")- );- assert_eq!(- page_screenshot["value"]["message"],- json!("Page.captureScreenshot is not supported: renderer screenshots are not implemented.")- );+ assert_eq!(page_status, StatusCode::OK);+ let bytes = BASE64_STANDARD+ .decode(page_screenshot["value"].as_str().expect("PNG base64"))+ .expect("valid base64");+ assert!(bytes.starts_with(b"\x89PNG\r\n\x1a\n"));+ assert!(u32::from_be_bytes(bytes[16..20].try_into().unwrap()) > 0);+ assert!(u32::from_be_bytes(bytes[20..24].try_into().unwrap()) > 0);let element = classic_request_json_with_body(app.clone(),@@ -7582,6 +7599,7 @@ async fn webdriver_classic_displayed_cases_ported_from_selenium() {}),).await;+ classic_capture_layout(app.clone(), session_id).await;assert_eq!(navigated, json!({ "value": null }));for (selector, expected) in [@@ -8297,6 +8315,7 @@ async fn webdriver_classic_url_routes_execute_through_devtools_runtime() {json!({ "url": first_url }),).await;+ classic_capture_layout(app.clone(), session_id).await;assert_eq!(first_navigated, json!({ "value": null }));let navigated = classic_request_json_with_body(@@ -8306,6 +8325,7 @@ async fn webdriver_classic_url_routes_execute_through_devtools_runtime() {json!({ "url": navigate_url }),).await;+ classic_capture_layout(app.clone(), session_id).await;assert_eq!(navigated, json!({ "value": null }));let current_url = classic_request_json(@@ -10616,6 +10636,7 @@ async fn webdriver_classic_click_inside_frame_observes_removed_current_frame() {json!({ "url": page_url }),).await;+ classic_capture_layout(app.clone(), session_id).await;assert_eq!(navigated, json!({ "value": null }));let switched =@@ -11151,6 +11172,9 @@ async fn webdriver_classic_click_respects_dom_first_and_real_layout_policies() {app.clone(), Method::POST, &format!("/session/{session_id}/url"),json!({"url": "data:text/html,<button id='target'>go</button><script>window.events=[];for(const type of ['pointerdown','mousedown','mouseup','click'])target.addEventListener(type,e=>events.push(e.type));</script>"}),).await;+ if policy.uses_real_layout() {+ classic_capture_layout(app.clone(), session_id).await;+ }assert_eq!(navigated, json!({"value": null}));let element_id = classic_find_css_element_id(app.clone(), session_id, "#target").await;let clicked = classic_request_json(@@ -11176,6 +11200,9 @@ async fn webdriver_classic_click_respects_dom_first_and_real_layout_policies() {app.clone(), Method::POST, &format!("/session/{session_id}/url"),json!({"url": "data:text/html,<input id='origin'><input id='target'><script>document.getElementById('origin').focus();</script>"}),).await;+ if policy.uses_real_layout() {+ classic_capture_layout(app.clone(), session_id).await;+ }let target = classic_find_css_element_id(app.clone(), session_id, "#target").await;assert_eq!(classic_request_json(@@ -11240,6 +11267,25 @@ async fn webdriver_classic_element_click_uses_shared_dom_geometry_and_input() {.as_str().expect("element reference id");+ let (cold_status, cold) = classic_request_status_and_json(+ app.clone(),+ Method::POST,+ &format!("/session/{session_id}/element/{element_id}/click"),+ )+ .await;+ assert_eq!(cold_status, StatusCode::INTERNAL_SERVER_ERROR);+ for command in [+ "Page.captureScreenshot",+ "Page.printToPDF",+ "Page.startScreencast",+ ] {+ assert!(+ cold["value"]["message"].as_str().unwrap().contains(command),+ "{cold}"+ );+ }+ classic_capture_layout(app.clone(), session_id).await;+let clicked = classic_request_json(app.clone(),Method::POST,@@ -11372,8 +11418,21 @@ async fn webdriver_classic_click_pointer_focus_and_interactability_controls() {json!({"url":format!("data:text/html,{html}")}),).await;+ classic_capture_layout(app.clone(), session_id).await;assert_eq!(navigated, json!({"value":null}), "{name}");let element_id = classic_find_css_element_id(app.clone(), session_id, "#target").await;+ if name == "scroll" {+ let (status, blocked) = classic_request_status_and_json(+ app.clone(),+ Method::POST,+ &format!("/session/{session_id}/element/{element_id}/click"),+ )+ .await;+ assert_eq!(status, StatusCode::BAD_REQUEST, "{blocked}");+ assert_eq!(blocked["value"]["error"], "element not interactable");+ // Click preparation scrolled live state; explicitly publish the new position.+ classic_capture_layout(app.clone(), session_id).await;+ }let (status, clicked) = classic_request_status_and_json(app.clone(),Method::POST,@@ -11407,6 +11466,7 @@ async fn webdriver_classic_click_pointer_focus_and_interactability_controls() {&format!("/session/{session_id}/url"), json!({"url":"data:text/html,<input id='origin'><input id='target'><script>document.getElementById('origin').focus();</script>"})).await;+ classic_capture_layout(app.clone(), session_id).await;let synthetic = classic_request_json_with_body(app.clone(), Method::POST,&format!("/session/{session_id}/execute/sync"), json!({"script":"let events=[];for(const type of ['pointerdown','mousedown','focus','mouseup','click'])target.addEventListener(type,e=>events.push([e.type,e.isTrusted]));target.click();return [document.activeElement.id,events];", "args":[]@@ -11431,6 +11491,7 @@ async fn webdriver_classic_click_uses_top_level_pointer_coordinates_inside_offsejson!({"url":format!("data:text/html,{html}")}),).await;+ classic_capture_layout(app.clone(), session_id).await;assert_eq!(classic_request_json_with_body(app.clone(),@@ -11646,6 +11707,7 @@ async fn webdriver_classic_click_mousedown_navigation_does_not_activate_successojson!({"url":source}),).await;+ classic_capture_layout(app.clone(), session_id).await;let element_id = classic_find_css_element_id(app.clone(), session_id, "#target").await;let clicked = classic_request_json(app.clone(),@@ -11666,6 +11728,7 @@ async fn webdriver_classic_click_mousedown_navigation_does_not_activate_successo).await;assert_eq!(observed, json!({"value":0}));+ classic_capture_layout(app.clone(), session_id).await;let successor_id = classic_find_css_element_id(app.clone(), session_id, "#target").await;assert_eq!(classic_request_json(@@ -11719,6 +11782,8 @@ async fn webdriver_classic_anchor_target_blank_click_opens_window_handle() {.await;assert_eq!(navigated, json!({ "value": null }));+ classic_capture_layout(app.clone(), session_id).await;+let link_id = classic_find_css_element_id(app.clone(), session_id, "#popup").await;let clicked = classic_request_json(app.clone(),@@ -11786,6 +11851,7 @@ async fn webdriver_classic_window_open_self_click_waits_for_current_url() {).await;assert_eq!(navigated, json!({ "value": null }));+ classic_capture_layout(app.clone(), session_id).await;let handle_count = classic_request_json(app.clone(), Method::GET, &handles_path).await;let handle_count = handle_count["value"].as_array()@@ -11863,6 +11929,7 @@ async fn webdriver_classic_named_popup_reuse_navigates_existing_window() {).await;assert_eq!(navigated, json!({ "value": null }));+ classic_capture_layout(app.clone(), session_id).await;let first_button_id = classic_find_css_element_id(app.clone(), session_id, "#first").await;let clicked_first = classic_request_json(@@ -12535,6 +12602,7 @@ async fn webdriver_classic_enter_inserts_newline_and_submits_through_both_key_rojson!({"url": format!("data:text/html,{html}")}),).await;+ classic_capture_layout(app.clone(), session_id).await;assert_eq!(navigated, json!({"value": null}));let element_id =classic_find_css_element_id(app.clone(), session_id, "#field").await;@@ -12596,6 +12664,7 @@ async fn webdriver_classic_element_send_keys_uses_shared_input() {json!({ "url": url }),).await;+ classic_capture_layout(app.clone(), session_id).await;assert_eq!(navigated, json!({ "value": null }));let element = classic_request_json_with_body(@@ -12668,6 +12737,7 @@ async fn webdriver_classic_send_keys_form_control_cases_ported_from_chromium_wptjson!({ "url": page }),).await;+ classic_capture_layout(app.clone(), session_id).await;assert_eq!(navigated, json!({ "value": null }));async fn send_keys(app: Router, session_id: &str, selector: &str, text: &str) {@@ -13080,6 +13150,7 @@ async fn webdriver_classic_actions_key_source_uses_shared_input() {json!({ "url": url }),).await;+ classic_capture_layout(app.clone(), session_id).await;assert_eq!(navigated, json!({ "value": null }));let element = classic_request_json_with_body(@@ -13212,6 +13283,7 @@ async fn webdriver_classic_actions_wheel_source_dispatches_with_real_geometry()json!({ "url": url }),).await;+ classic_capture_layout(app.clone(), session_id).await;assert_eq!(navigated, json!({ "value": null }));let (actions_status, actions) = classic_request_status_and_json_with_body(@@ -13278,6 +13350,7 @@ async fn webdriver_classic_actions_touch_pointer_dispatches_with_real_geometry()json!({ "url": url }),).await;+ classic_capture_layout(app.clone(), session_id).await;assert_eq!(navigated, json!({ "value": null }));let (actions_status, actions) = classic_request_status_and_json_with_body(@@ -13348,6 +13421,7 @@ async fn webdriver_classic_actions_touch_pointer_capture_uses_real_geometry() {json!({ "url": url }),).await;+ classic_capture_layout(app.clone(), session_id).await;assert_eq!(navigated, json!({ "value": null }));let (actions_status, actions) = classic_request_status_and_json_with_body(@@ -13421,6 +13495,7 @@ async fn webdriver_classic_actions_pen_pointer_preserves_pointer_properties() {json!({ "url": url }),).await;+ classic_capture_layout(app.clone(), session_id).await;assert_eq!(navigated, json!({ "value": null }));let (actions_status, actions) = classic_request_status_and_json_with_body(@@ -13507,6 +13582,7 @@ async fn webdriver_classic_actions_cancelled_pointerdown_suppresses_compat_mousejson!({ "url": url }),).await;+ classic_capture_layout(app.clone(), session_id).await;assert_eq!(navigated, json!({ "value": null }));let (actions_status, actions) = classic_request_status_and_json_with_body(@@ -13584,6 +13660,7 @@ async fn webdriver_classic_actions_pointer_capture_routes_real_coordinate_input(json!({ "url": url }),).await;+ classic_capture_layout(app.clone(), session_id).await;assert_eq!(navigated, json!({ "value": null }));let (actions_status, actions) = classic_request_status_and_json_with_body(@@ -13657,6 +13734,7 @@ async fn webdriver_classic_actions_removed_capture_target_retargets_to_document(json!({ "url": url }),).await;+ classic_capture_layout(app.clone(), session_id).await;assert_eq!(navigated, json!({ "value": null }));let (actions_status, actions) = classic_request_status_and_json_with_body(@@ -13727,6 +13805,7 @@ async fn webdriver_classic_actions_active_capture_move_handles_removed_target()json!({ "url": url }),).await;+ classic_capture_layout(app.clone(), session_id).await;assert_eq!(navigated, json!({ "value": null }));let (actions_status, actions) = classic_request_status_and_json_with_body(@@ -13800,6 +13879,7 @@ async fn webdriver_classic_coordinate_actions_dispatch_after_tick_delay() {json!({ "url": url }),).await;+ classic_capture_layout(app.clone(), session_id).await;assert_eq!(navigated, json!({ "value": null }));let (actions_status, actions) = classic_request_status_and_json_with_body(@@ -13860,6 +13940,7 @@ async fn webdriver_classic_actions_element_origin_uses_real_geometry() {json!({ "url": url }),).await;+ classic_capture_layout(app.clone(), session_id).await;assert_eq!(navigated, json!({ "value": null }));let button = classic_request_json_with_body(@@ -13992,6 +14073,7 @@ async fn webdriver_classic_release_actions_clear_pressed_sources() {json!({ "url": url }),).await;+ classic_capture_layout(app.clone(), session_id).await;assert_eq!(navigated, json!({ "value": null }));let element = classic_request_json_with_body(@@ -14120,6 +14202,7 @@ async fn webdriver_classic_actions_reject_move_target_out_of_bounds() {json!({ "url": "data:text/html,<main>bounds</main>" }),).await;+ classic_capture_layout(app.clone(), session_id).await;assert_eq!(navigated, json!({ "value": null }));let (status, response) = classic_request_status_and_json_with_body(diff --git a/moli-protocol-server/src/protocol_server/webdriver_classic.rs b/moli-protocol-server/src/protocol_server/webdriver_classic.rsindex 7a6af3962..f282a7886 100644--- a/moli-protocol-server/src/protocol_server/webdriver_classic.rs+++ b/moli-protocol-server/src/protocol_server/webdriver_classic.rs@@ -11,6 +11,7 @@ use axum::{http::StatusCode,response::Response,};+use base64::{Engine as _, engine::general_purpose::STANDARD as BASE64_STANDARD};use moli_core::page::{RendererDocumentLifecycleMilestone, RendererElementClickError, RendererElementClickTarget,};@@ -2220,6 +2221,9 @@ pub(super) async fn webdriver_classic_take_screenshot(};let context = classic_top_level_context(&binding);match binding.runtime.execute(screenshot_command(&context)).await {+ Ok(DevToolsCommandResult::CaptureScreenshot(result)) => {+ classic_success_into_response(json!(BASE64_STANDARD.encode(result.bytes.as_ref())))+ }Ok(_) => classic_error_into_response(ClassicError::new(ClassicErrorCode::UnknownError,"screenshot returned an unexpected result",diff --git a/moli-protocol-server/src/protocol_server/webdriver_classic/window.rs b/moli-protocol-server/src/protocol_server/webdriver_classic/window.rsindex cb5b5ae77..34af15ed9 100644--- a/moli-protocol-server/src/protocol_server/webdriver_classic/window.rs+++ b/moli-protocol-server/src/protocol_server/webdriver_classic/window.rs@@ -3,15 +3,16 @@ use axum::{extract::{Path, State},response::Response,};-use moli_protocol::devtools_runtime::{DevToolsCommand, DevToolsCommandResult};+use moli_protocol::devtools_runtime::{+ DevToolsCommand, DevToolsCommandResult, DevToolsScriptResult,+};use moli_protocol_webdriver_classic::{ClassicDevToolsCommandContext, ClassicError, ClassicErrorCode, ClassicWindowRect,ClassicWindowState, classic_error_from_devtools_error, classic_window_rect_for_state,- classic_window_rect_from_metrics, close_window_command, layout_metrics_command,- new_window_command, new_window_type, set_window_normal_surface_state_command,- set_window_rect_command, set_window_rect_update, set_window_state_command,- set_window_surface_state_command, switch_window_command, window_handles_command,- window_handles_from_targets,+ close_window_command, execute_sync_command, new_window_command, new_window_type,+ set_window_normal_surface_state_command, set_window_rect_command, set_window_rect_update,+ set_window_state_command, set_window_surface_state_command, switch_window_command,+ window_handles_command, window_handles_from_targets,};use serde_json::json;use tracing::warn;@@ -21,6 +22,7 @@ use super::{classic_error_into_response, classic_json_body, classic_session_binding,classic_success_into_response, classic_top_level_browsing_context_binding,classic_top_level_browsing_context_binding_without_prompt_handling,+ classic_webdriver_command_exception_error,};pub(in crate::protocol_server) async fn webdriver_classic_get_window(@@ -300,14 +302,33 @@ async fn classic_current_window_rect(.window_position(&binding.session_id, &binding.target_id);let context =ClassicDevToolsCommandContext::with_target_id(&binding.session_id, &binding.target_id);- match binding- .runtime- .execute(layout_metrics_command(&context))- .await- {- Ok(DevToolsCommandResult::LayoutMetrics(metrics)) => {- Ok(classic_window_rect_from_metrics(position, metrics))- }+ // Headless window dimensions are live browser state, independent of whether+ // the page has published layout or resized since its last visual output.+ let command = execute_sync_command(+ &context,+ &json!({+ "script": "return [window.innerWidth, window.innerHeight];",+ "args": []+ }),+ )?;+ match binding.runtime.execute(command).await {+ Ok(DevToolsCommandResult::Script(result)) => match *result {+ DevToolsScriptResult::Value(value) => {+ let (width, height): (u32, u32) =+ serde_json::from_value(value.value).map_err(|error| {+ ClassicError::new(ClassicErrorCode::UnknownError, error.to_string())+ })?;+ Ok(ClassicWindowRect {+ x: position.x,+ y: position.y,+ width,+ height,+ })+ }+ DevToolsScriptResult::Exception(exception) => {+ Err(classic_webdriver_command_exception_error(exception))+ }+ },Ok(_) => Err(ClassicError::new(ClassicErrorCode::UnknownError,"window rect returned an unexpected result",diff --git a/moli-protocol-webdriver-bidi/src/commands.rs b/moli-protocol-webdriver-bidi/src/commands.rsindex 04fad4340..efd42674a 100644--- a/moli-protocol-webdriver-bidi/src/commands.rs+++ b/moli-protocol-webdriver-bidi/src/commands.rs@@ -2049,9 +2049,15 @@ fn bidi_capture_screenshot_command(Ok(DevToolsCaptureScreenshotCommand {context: context.command_context(Some(DevToolsTargetId::from(target_id))),format,- quality: None,+ quality: command+ .params+ .get("format")+ .and_then(|format| format.get("quality"))+ .and_then(Value::as_f64)+ .map(|quality| (quality * 100.0).round() as u8),clip,- capture_beyond_viewport: true,+ capture_beyond_viewport: command.params.get("origin").and_then(Value::as_str)+ == Some("document"),optimize_for_speed: false,})}diff --git a/moli-protocol-webdriver-bidi/src/responses.rs b/moli-protocol-webdriver-bidi/src/responses.rsindex f1a516ab8..612363916 100644--- a/moli-protocol-webdriver-bidi/src/responses.rs+++ b/moli-protocol-webdriver-bidi/src/responses.rs@@ -1,5 +1,6 @@use std::collections::HashSet;+use base64::{Engine as _, engine::general_purpose::STANDARD as BASE64_STANDARD};use moli_protocol::devtools_runtime::{DevToolsBrowserContextId, DevToolsCommandResult, DevToolsError, DevToolsErrorKind,DevToolsNetworkDataBytesType, DevToolsScriptResult, RuntimeConsoleEvent,@@ -57,13 +58,6 @@ pub fn bidi_response_from_devtools_result(id: u64, result: DevToolsCommandResult"DOM.getNodeForLocation results are not part of the WebDriver BiDi surface",);}- if matches!(result, DevToolsCommandResult::CaptureScreenshot(_)) {- return error_response(- Some(id),- BidiErrorCode::UnsupportedOperation,- "browsingContext.captureScreenshot is not supported by the layout POC",- );- }if let DevToolsCommandResult::SetCookies(result) = &result&& !result.success{@@ -309,12 +303,9 @@ fn bidi_result_payload_from_devtools_result(result: DevToolsCommandResult) -> Va"message": result.message,"defaultValue": result.default_prompt,}),- // The public projection rejects this variant before reaching the- // success payload mapper. Keep the arm explicit so adding CDP support- // cannot silently broaden the WebDriver BiDi surface.- DevToolsCommandResult::CaptureScreenshot(_) => unreachable!(- "capture screenshot results must be rejected before BiDi success projection"- ),+ DevToolsCommandResult::CaptureScreenshot(result) => json!({+ "data": BASE64_STANDARD.encode(result.bytes.as_ref()),+ }),}}diff --git a/moli-protocol-webdriver-bidi/src/tests.rs b/moli-protocol-webdriver-bidi/src/tests.rsindex ced7fcad4..534bd1250 100644--- a/moli-protocol-webdriver-bidi/src/tests.rs+++ b/moli-protocol-webdriver-bidi/src/tests.rs@@ -7044,7 +7044,7 @@ fn serializes_devtools_navigate_result_to_bidi_response() {}#[test]-fn rejects_cdp_screenshot_result_at_bidi_projection_boundary() {+fn projects_screenshot_bytes_as_bidi_base64_data() {let response = super::bidi_response_from_devtools_result(8,moli_protocol::devtools_runtime::DevToolsCommandResult::CaptureScreenshot(@@ -7057,9 +7057,9 @@ fn rejects_cdp_screenshot_result_at_bidi_projection_boundary() {),);- assert_eq!(response["type"], json!("error"));+ assert_eq!(response["type"], json!("success"));assert_eq!(response["id"], json!(8));- assert_eq!(response["error"], json!("unsupported operation"));+ assert_eq!(response["result"]["data"], json!("cG5n"));}#[test]@@ -11668,7 +11668,7 @@ fn maps_browsing_context_capture_screenshot_to_shared_page_command() {"params": {"context": "TARGET-1","format": {- "type": "image/png"+ "type": "image/jpeg", "quality": 0.6},"origin": "viewport","clip": {@@ -11690,7 +11690,9 @@ fn maps_browsing_context_capture_screenshot_to_shared_page_command() {else {panic!("expected CaptureScreenshot command");};- assert_eq!(command.format.as_deref(), Some("png"));+ assert_eq!(command.quality, Some(60));+ assert!(!command.capture_beyond_viewport);+ assert_eq!(command.format.as_deref(), Some("jpeg"));assert_eq!(command.contextdiff --git a/moli-protocol-webdriver-classic/src/commands/mod.rs b/moli-protocol-webdriver-classic/src/commands/mod.rsindex 694305e66..99baa7b42 100644--- a/moli-protocol-webdriver-classic/src/commands/mod.rs+++ b/moli-protocol-webdriver-classic/src/commands/mod.rs@@ -45,11 +45,10 @@ pub use window::{CLASSIC_HEADLESS_AVAILABLE_HEIGHT, CLASSIC_HEADLESS_SCREEN_HEIGHT,CLASSIC_HEADLESS_SCREEN_WIDTH, ClassicWindowPosition, ClassicWindowRect,ClassicWindowRectUpdate, ClassicWindowState, activate_window_command,- classic_window_rect_for_state, classic_window_rect_from_metrics, close_window_command,- create_initial_target_command, element_screenshot_command, layout_metrics_command,- new_window_command, new_window_type, print_page_command, screenshot_command,- set_window_normal_surface_state_command, set_window_rect_command,- set_window_rect_command_with_screen, set_window_rect_update, set_window_state_command,- set_window_surface_state_command, switch_window_command, window_handles_command,- window_handles_from_targets,+ classic_window_rect_for_state, close_window_command, create_initial_target_command,+ element_screenshot_command, layout_metrics_command, new_window_command, new_window_type,+ print_page_command, screenshot_command, set_window_normal_surface_state_command,+ set_window_rect_command, set_window_rect_command_with_screen, set_window_rect_update,+ set_window_state_command, set_window_surface_state_command, switch_window_command,+ window_handles_command, window_handles_from_targets,};diff --git a/moli-protocol-webdriver-classic/src/commands/window.rs b/moli-protocol-webdriver-classic/src/commands/window.rsindex 9bf1e6e63..92d6d7b66 100644--- a/moli-protocol-webdriver-classic/src/commands/window.rs+++ b/moli-protocol-webdriver-classic/src/commands/window.rs@@ -2,10 +2,10 @@ use moli_protocol::devtools_runtime::{DevToolsActivateTargetCommand, DevToolsCaptureScreenshotClip, DevToolsCaptureScreenshotCommand,DevToolsCloseTargetCommand, DevToolsCommand, DevToolsCreateTargetCommand,DevToolsDevicePixelRatioSetting, DevToolsGetLayoutMetricsCommand, DevToolsGetTargetsCommand,- DevToolsGetTargetsResult, DevToolsLayoutMetricsResult, DevToolsPrintToPdfCommand,- DevToolsPrintToPdfTransferMode, DevToolsRemoteHandleId, DevToolsScreenshotElementClip,- DevToolsSetViewportCommand, DevToolsSetWindowStateCommand, DevToolsTargetId,- DevToolsTargetKind, DevToolsViewportSetting, DevToolsWindowState,+ DevToolsGetTargetsResult, DevToolsPrintToPdfCommand, DevToolsPrintToPdfTransferMode,+ DevToolsRemoteHandleId, DevToolsScreenshotElementClip, DevToolsSetViewportCommand,+ DevToolsSetWindowStateCommand, DevToolsTargetId, DevToolsTargetKind, DevToolsViewportSetting,+ DevToolsWindowState,};use serde_json::{Value, json};@@ -90,18 +90,6 @@ impl ClassicWindowRect {}}-pub fn classic_window_rect_from_metrics(- position: ClassicWindowPosition,- metrics: DevToolsLayoutMetricsResult,-) -> ClassicWindowRect {- ClassicWindowRect {- x: position.x,- y: position.y,- width: metrics.layout_viewport_width,- height: metrics.layout_viewport_height,- }-}-pub fn set_window_rect_update(params: &Value) -> Result<ClassicWindowRectUpdate, ClassicError> {let Some(params) = params.as_object() else {return Err(ClassicError::new(diff --git a/moli-protocol-webdriver-classic/src/lib.rs b/moli-protocol-webdriver-classic/src/lib.rsindex 2918cfba6..fa1db815c 100644--- a/moli-protocol-webdriver-classic/src/lib.rs+++ b/moli-protocol-webdriver-classic/src/lib.rs@@ -46,11 +46,11 @@ pub use commands::{classic_element_id, classic_element_reference, classic_elements_from_locate_nodes_result,classic_elements_from_query_result, classic_error_from_devtools_error, classic_property_value,classic_rect_from_geometry, classic_shadow_root_id, classic_shadow_root_reference,- classic_text_value, classic_window_rect_for_state, classic_window_rect_from_metrics,- clear_element_command, close_window_command, create_initial_target_command,- current_url_command, delete_all_cookies_command, delete_cookie_command, describe_node_command,- describe_node_reference_command, element_click_command, element_geometry_prepare_commands,- element_screenshot_command, execute_async_command, execute_sync_command, find_element_command,+ classic_text_value, classic_window_rect_for_state, clear_element_command, close_window_command,+ create_initial_target_command, current_url_command, delete_all_cookies_command,+ delete_cookie_command, describe_node_command, describe_node_reference_command,+ element_click_command, element_geometry_prepare_commands, element_screenshot_command,+ execute_async_command, execute_sync_command, find_element_command,find_element_command_with_root, frame_id_for_element_command, get_cookies_command,get_element_attributes_command, get_element_attributes_reference_command,get_element_computed_label_command, get_element_computed_role_command,diff --git a/moli-protocol/src/conn/dispatch_tests.rs b/moli-protocol/src/conn/dispatch_tests.rsindex 562b394ce..437e5f45c 100644--- a/moli-protocol/src/conn/dispatch_tests.rs+++ b/moli-protocol/src/conn/dispatch_tests.rs@@ -5418,21 +5418,16 @@ async fn devtools_command_dispatches_coordinate_mouse_input_for_target() {execute_direct_devtools_command_through_renderer_fence_for_test(&mut ctx,- DevToolsCommand::EvaluateScript(DevToolsEvaluateScriptCommand {+ DevToolsCommand::CaptureScreenshot(DevToolsCaptureScreenshotCommand {context: DevToolsCommandContext {target_id: Some(target_id.clone()),..context.clone()},- realm_id: None,- world_name: None,- expression: "document.elementFromPoint(0, 0); true".to_owned(),- await_promise: true,- user_gesture: false,- webdriver_bidi_file_prompt_handler: None,- result_ownership: DevToolsResultOwnership::None,- preserve_remote_metadata: false,- materialize_bidi_script_result: false,- serialization_options: None,+ format: Some("png".to_owned()),+ quality: None,+ clip: None,+ capture_beyond_viewport: false,+ optimize_for_speed: false,}),).awaitdiff --git a/moli-protocol/src/domains/dom/tests/async_dispatch.rs b/moli-protocol/src/domains/dom/tests/async_dispatch.rsindex 9be75c49e..8e3622a40 100644--- a/moli-protocol/src/domains/dom/tests/async_dispatch.rs+++ b/moli-protocol/src/domains/dom/tests/async_dispatch.rs@@ -10,6 +10,7 @@ async fn async_dispatch_box_quads_and_scroll_support_object_id() {"<!doctype html><html><body><div id='box' style='position:absolute;left:3px;top:4px;width:9px;height:11px'></div></body></html>",).await;+ ctx.capture_fixture_layout(None).await;let _ = enable_runtime_and_take_execution_context_id_async(&mut ctx, 10).await;let _ = ctx.take_all();diff --git a/moli-protocol/src/domains/dom/tests/frames.rs b/moli-protocol/src/domains/dom/tests/frames.rsindex 900209bf5..28136cd33 100644--- a/moli-protocol/src/domains/dom/tests/frames.rs+++ b/moli-protocol/src/domains/dom/tests/frames.rs@@ -4032,6 +4032,7 @@ async fn protocol_neutral_child_frame_frontend_node_geometry_reads_live_renderer"<!doctype html><html><body><iframe id='child' srcdoc=\"<main id='inside-frame'>child</main>\"></iframe></body></html>",).await;+ ctx.capture_fixture_layout(None).await;let child_frame_id = child_frame_id_for_single_iframe_async(&mut ctx, 2).await;let context = DevToolsCommandContext {protocol: DevToolsProtocol::WebDriverClassic,@@ -4131,6 +4132,7 @@ async fn protocol_neutral_resolve_node_targets_child_frame_context() {"<!doctype html><html><body><main id='top' style='display:flex'>top</main><iframe id='child' srcdoc=\"<main id='inside-frame' style='display:grid'>child</main>\"></iframe></body></html>",).await;+ ctx.capture_fixture_layout(None).await;let child_frame_id = child_frame_id_for_single_iframe_async(&mut ctx, 2).await;let context = DevToolsCommandContext {protocol: DevToolsProtocol::WebDriverClassic,diff --git a/moli-protocol/src/domains/dom/tests/geometry.rs b/moli-protocol/src/domains/dom/tests/geometry.rsindex 072322f83..f672598b4 100644--- a/moli-protocol/src/domains/dom/tests/geometry.rs+++ b/moli-protocol/src/domains/dom/tests/geometry.rs@@ -191,6 +191,7 @@ async fn dom_resolve_geometry_and_mutation_target_loaded_background_owner_withou.is_some_and(|html| html.contains("data-route=\"background\"")));+ ctx.capture_fixture_layout(Some("SID-background")).await;ctx.process_async(json!({"id": 349,"sessionId": "SID-background",@@ -334,6 +335,7 @@ async fn dom_resolve_geometry_targets_inactive_loaded_owner_without_activation().await;let owned_node_id = take_query_selector_node_id(&mut ctx, 362);+ ctx.capture_fixture_layout(Some("SID-inactive")).await;ctx.process_async(json!({"id": 363,"sessionId": "SID-inactive",@@ -377,6 +379,7 @@ async fn get_box_model() {"<!doctype html><html><body><p style='position:absolute;left:10px;top:10px;width:5px;height:5px;margin:0'>box</p></body></html>",).await;+ ctx.capture_fixture_layout(None).await;ctx.process_async(json!({"id": 3, "method": "DOM.getDocument"})).await;@@ -415,6 +418,7 @@ async fn top_frame_geometry_non_element_waits_for_renderer_completion() {"<!doctype html><html><body>plain text</body></html>",).await;+ ctx.capture_fixture_layout(None).await;ctx.process_async(json!({"id": 2, "method": "DOM.getDocument"})).await;@@ -481,6 +485,7 @@ async fn geometry_and_remove_node_can_complete_through_pending_command_dispatch("<!doctype html><html><body><p id='target' style='position:absolute;left:10px;top:10px;width:5px;height:5px;margin:0'>box</p></body></html>",).await;+ ctx.capture_fixture_layout(None).await;ctx.process_async(json!({"id": 2, "method": "DOM.getDocument"})).await;@@ -724,6 +729,7 @@ async fn get_box_model_supports_backend_node_id() {"<!doctype html><html><body><p style='position:absolute;left:12px;top:8px;width:7px;height:6px;margin:0'>box</p></body></html>",).await;+ ctx.capture_fixture_layout(None).await;ctx.process_async(json!({"id": 2, "method": "DOM.getDocument"})).await;@@ -771,6 +777,7 @@ async fn get_box_model_supports_renderer_backend_node_id() {"<!doctype html><html><body><div id='box' style='position:absolute;left:3px;top:4px;width:9px;height:11px'>box</div></body></html>",).await;+ ctx.capture_fixture_layout(None).await;let _ = enable_runtime_and_take_execution_context_id_async(&mut ctx, 10).await;let _ = ctx.take_all();@@ -847,6 +854,7 @@ async fn get_box_model_supports_object_id() {"<!doctype html><html><body><div id='box' style='position:absolute;left:3px;top:4px;width:9px;height:11px'></div></body></html>",).await;+ ctx.capture_fixture_layout(None).await;let _ = enable_runtime_and_take_execution_context_id_async(&mut ctx, 10).await;let _ = ctx.take_all();@@ -873,7 +881,7 @@ async fn get_box_model_supports_object_id() {}#[tokio::test(flavor = "multi_thread")]-async fn object_id_geometry_reads_live_document_after_document_open_replacement() {+async fn object_id_geometry_reads_captured_document_after_document_open_replacement() {let mut ctx = TestContext::new();load_bc(&mut ctx, "BID-A");navigate_to_data_html_async(@@ -882,6 +890,7 @@ async fn object_id_geometry_reads_live_document_after_document_open_replacement("<!doctype html><html><body>old text node</body></html>",).await;+ ctx.capture_fixture_layout(None).await;let _ = enable_runtime_and_take_execution_context_id_async(&mut ctx, 10).await;let _ = ctx.take_all();@@ -916,6 +925,7 @@ async fn object_id_geometry_reads_live_document_after_document_open_replacement(.unwrap_or_else(|| panic!("replacement Runtime.evaluate should return objectId")).to_owned();+ ctx.capture_fixture_layout(None).await;ctx.process_async(json!({"id": 13,"method": "DOM.getBoxModel",@@ -947,6 +957,7 @@ async fn object_id_box_model_rejects_text_node_but_content_quads_accepts_it() {"<!doctype html><html><body>hello</body></html>",).await;+ ctx.capture_fixture_layout(None).await;let _ = enable_runtime_and_take_execution_context_id_async(&mut ctx, 10).await;let _ = ctx.take_all();@@ -990,6 +1001,7 @@ async fn get_box_model_rejects_non_element_nodes() {"<!doctype html><html><body>hello</body></html>",).await;+ ctx.capture_fixture_layout(None).await;ctx.process_async(json!({"id": 2, "method": "DOM.getDocument"})).await;@@ -1051,6 +1063,7 @@ async fn get_content_quads_returns_single_quad_for_element() {"<!doctype html><html><body><p style='position:absolute;left:10px;top:10px;width:5px;height:5px;margin:0'>box</p></body></html>",).await;+ ctx.capture_fixture_layout(None).await;ctx.process_async(json!({"id": 2, "method": "DOM.getDocument"})).await;@@ -1091,6 +1104,7 @@ async fn get_content_quads_supports_object_id() {"<!doctype html><html><body><div id='box' style='position:absolute;left:3px;top:4px;width:9px;height:11px'></div></body></html>",).await;+ ctx.capture_fixture_layout(None).await;let _ = enable_runtime_and_take_execution_context_id_async(&mut ctx, 10).await;let _ = ctx.take_all();@@ -1129,6 +1143,7 @@ async fn get_content_quads_supports_backend_node_id() {"<!doctype html><html><body><div id='box' style='position:absolute;left:6px;top:7px;width:8px;height:9px'></div></body></html>",).await;+ ctx.capture_fixture_layout(None).await;ctx.process_async(json!({"id": 2, "method": "DOM.getDocument"})).await;@@ -1176,6 +1191,7 @@ async fn get_content_quads_supports_renderer_backend_node_id() {"<!doctype html><html><body><div id='box' style='position:absolute;left:6px;top:7px;width:8px;height:9px'>box</div></body></html>",).await;+ ctx.capture_fixture_layout(None).await;let _ = enable_runtime_and_take_execution_context_id_async(&mut ctx, 10).await;let _ = ctx.take_all();@@ -1245,6 +1261,7 @@ async fn get_content_quads_accepts_connected_rendered_text_node() {"<!doctype html><html><body>hello</body></html>",).await;+ ctx.capture_fixture_layout(None).await;ctx.process_async(json!({"id": 2, "method": "DOM.getDocument"})).await;@@ -1305,6 +1322,7 @@ async fn get_node_for_location_uses_real_layout_hit_testing() {"<!doctype html><html><body><div id='behind' style='position:absolute;left:10px;top:10px;width:60px;height:60px'></div><button id='front' style='position:absolute;left:20px;top:20px;width:20px;height:20px'>hit</button></body></html>",).await;+ ctx.capture_fixture_layout(None).await;let expected_backend_node_id = renderer_backend_node_id_for_live_expression(&mut ctx,2,@@ -1367,6 +1385,7 @@ async fn get_node_for_location_negative_coordinates_report_no_hit() {"<!doctype html><html><body><div id='box' style='position:absolute;left:10px;top:10px;width:10px;height:10px'></div></body></html>",).await;+ ctx.capture_fixture_layout(None).await;ctx.process_async(json!({"id": 2,@@ -1395,6 +1414,7 @@ async fn scroll_into_view_if_needed_accepts_element_node() {);navigate_to_url_and_wait_for_load_async(&mut ctx, 1, url).await;+ ctx.capture_fixture_layout(None).await;ctx.process_async(json!({"id": 2, "method": "DOM.getDocument"})).await;@@ -1442,6 +1462,7 @@ async fn scroll_into_view_if_needed_accepts_document_node() {"<!doctype html><html><body><div id='box'></div></body></html>",).await;+ ctx.capture_fixture_layout(None).await;ctx.process_async(json!({"id": 2, "method": "DOM.getDocument"})).await;@@ -1468,6 +1489,7 @@ async fn scroll_into_view_if_needed_accepts_connected_rendered_text_node() {"<!doctype html><html><body>hello</body></html>",).await;+ ctx.capture_fixture_layout(None).await;ctx.process_async(json!({"id": 2, "method": "DOM.getDocument"})).await;@@ -1550,6 +1572,7 @@ async fn scroll_into_view_if_needed_supports_object_id() {);navigate_to_url_and_wait_for_load_async(&mut ctx, 1, url).await;+ ctx.capture_fixture_layout(None).await;let _ = enable_runtime_and_take_execution_context_id_async(&mut ctx, 10).await;let _ = ctx.take_all();@@ -1599,6 +1622,7 @@ async fn scroll_into_view_if_needed_uses_first_rendered_child_of_display_content"data:text/html,<!doctype html><body>{rows}<button id=contents style='display:contents'>target</button></body>");navigate_to_url_and_wait_for_load_async(&mut ctx, 30, url).await;+ ctx.capture_fixture_layout(None).await;ctx.process_async(json!({"id": 31,@@ -1641,6 +1665,7 @@ async fn scroll_into_view_if_needed_honors_stylesheet_display_and_visibility() {"data:text/html,<!doctype html><style>.contents{{display:contents}}.none{{display:none}}.invisible{{visibility:hidden}}</style><body>{rows}<button id=contents class=contents>contents text</button><div id=none class=none><span>suppressed child</span></div><button id=invisible class=invisible>invisible box</button></body>");navigate_to_url_and_wait_for_load_async(&mut ctx, 60, url).await;+ ctx.capture_fixture_layout(None).await;ctx.process_async(json!({"id": 67,@@ -1706,6 +1731,7 @@ async fn scroll_into_view_if_needed_rejects_hidden_input_like_chromium() {.as_str().expect("hidden input object id").to_owned();+ ctx.capture_fixture_layout(None).await;ctx.process_async(json!({"id": 36,"method": "DOM.scrollIntoViewIfNeeded",@@ -1747,7 +1773,7 @@ async fn scroll_into_view_if_needed_distinguishes_detached_node_from_missing_geo}#[tokio::test(flavor = "multi_thread")]-async fn scroll_into_view_if_needed_observes_live_style_change_before_scrolling() {+async fn scroll_into_view_if_needed_observes_style_change_after_explicit_capture() {let mut ctx = TestContext::new();load_bc(&mut ctx, "BID-A");navigate_to_data_html_async(@@ -1756,6 +1782,7 @@ async fn scroll_into_view_if_needed_observes_live_style_change_before_scrolling("<!doctype html><body><div id=spacer style='height:24px'></div><div id=target></div></body>",).await;+ ctx.capture_fixture_layout(None).await;ctx.process_async(json!({"id": 41,"method": "Runtime.evaluate",@@ -1768,6 +1795,7 @@ async fn scroll_into_view_if_needed_observes_live_style_change_before_scrolling(.as_str().expect("style-updated target object id").to_owned();+ ctx.capture_fixture_layout(None).await;ctx.process_async(json!({"id": 42,"method": "DOM.scrollIntoViewIfNeeded",@@ -1785,7 +1813,7 @@ async fn scroll_into_view_if_needed_observes_live_style_change_before_scrolling(take_response_by_id(&mut ctx, 43)["result"]["result"]["value"].as_f64().is_some_and(|scroll_y| scroll_y > 0.0),- "scroll geometry must observe the style mutation made immediately before the command"+ "scroll geometry must observe the explicitly captured style mutation");}@@ -1796,6 +1824,7 @@ async fn scroll_into_view_if_needed_clamps_relative_rect_to_document_scroll_ranglet rows = "<div>row</div>".repeat(60);let url = format!("data:text/html,<!doctype html><body>{rows}<div id=target></div></body>");navigate_to_url_and_wait_for_load_async(&mut ctx, 44, url).await;+ ctx.capture_fixture_layout(None).await;ctx.process_async(json!({"id": 45,"method": "Runtime.evaluate",@@ -1854,6 +1883,7 @@ async fn scroll_into_view_if_needed_supports_document_object_id() {"<!doctype html><html><body><div id='box'></div></body></html>",).await;+ ctx.capture_fixture_layout(None).await;let _ = enable_runtime_and_take_execution_context_id_async(&mut ctx, 10).await;let _ = ctx.take_all();@@ -1879,8 +1909,8 @@ async fn scroll_into_view_if_needed_supports_document_object_id() {}#[tokio::test(flavor = "multi_thread")]-async fn scroll_into_view_if_needed_object_id_reads_live_document_after_document_open_replacement()-{+async fn scroll_into_view_if_needed_object_id_reads_captured_document_after_document_open_replacement()+ {let mut ctx = TestContext::new();load_bc(&mut ctx, "BID-A");navigate_to_data_html_async(@@ -1889,6 +1919,7 @@ async fn scroll_into_view_if_needed_object_id_reads_live_document_after_document"<!doctype html><html><body>old text node</body></html>",).await;+ ctx.capture_fixture_layout(None).await;let _ = enable_runtime_and_take_execution_context_id_async(&mut ctx, 10).await;let _ = ctx.take_all();@@ -1923,6 +1954,7 @@ async fn scroll_into_view_if_needed_object_id_reads_live_document_after_document.unwrap_or_else(|| panic!("replacement Runtime.evaluate should return objectId")).to_owned();+ ctx.capture_fixture_layout(None).await;ctx.process_async(json!({"id": 13,"method": "DOM.scrollIntoViewIfNeeded",@@ -1942,6 +1974,7 @@ async fn scroll_into_view_if_needed_object_id_accepts_connected_rendered_text_no"<!doctype html><html><body>hello</body></html>",).await;+ ctx.capture_fixture_layout(None).await;let _ = enable_runtime_and_take_execution_context_id_async(&mut ctx, 10).await;let _ = ctx.take_all();@@ -1976,6 +2009,7 @@ async fn scroll_into_view_if_needed_supports_backend_node_id() {"<!doctype html><html><body><div id='box'></div></body></html>",).await;+ ctx.capture_fixture_layout(None).await;ctx.process_async(json!({"id": 2, "method": "DOM.getDocument"})).await;@@ -2025,6 +2059,7 @@ async fn scroll_into_view_if_needed_supports_renderer_backend_node_id() {"<!doctype html><html><body><div id='box'>box</div></body></html>",).await;+ ctx.capture_fixture_layout(None).await;let _ = enable_runtime_and_take_execution_context_id_async(&mut ctx, 10).await;let _ = ctx.take_all();diff --git a/moli-protocol/src/domains/dom/tests/node_ops.rs b/moli-protocol/src/domains/dom/tests/node_ops.rsindex 3277e38b7..f02fdbc68 100644--- a/moli-protocol/src/domains/dom/tests/node_ops.rs+++ b/moli-protocol/src/domains/dom/tests/node_ops.rs@@ -3623,6 +3623,7 @@ async fn get_outer_html_and_scroll_low_node_refs_use_renderer_dispatch() {"<!doctype html><html><body><section id='target' data-state='ready' style='left:1px;top:2px;width:3px;height:4px'>go</section></body></html>",).await;+ ctx.capture_fixture_layout(None).await;ctx.process_async(json!({"id": 2, "method": "DOM.getDocument"})).await;@@ -6057,6 +6058,7 @@ async fn resolve_node_with_child_default_execution_context_uses_child_document_b"<!doctype html><html><body><input value='main'><iframe srcdoc=\"<body><div id='child' style='left:3px;top:4px;width:9px;height:11px'>child-body</div></body>\"></iframe></body></html>",).await;+ ctx.capture_fixture_layout(None).await;let child_frame_id = child_frame_id_for_single_iframe_async(&mut ctx, 2).await;ctx.process_async(json!({diff --git a/moli-protocol/src/domains/emulation/tests/device_geometry.rs b/moli-protocol/src/domains/emulation/tests/device_geometry.rsindex 52b1d41f5..491e521ed 100644--- a/moli-protocol/src/domains/emulation/tests/device_geometry.rs+++ b/moli-protocol/src/domains/emulation/tests/device_geometry.rs@@ -28,7 +28,7 @@ async fn set_metrics(ctx: &mut TestContext, extra: serde_json::Value) {}#[tokio::test(flavor = "multi_thread")]-async fn device_metrics_screen_only_changes_refresh_geometry() {+async fn device_metrics_screen_changes_take_effect_after_explicit_capture() {let mut ctx = TestContext::new();load_session_page_for_pending_emulation_test(&mut ctx).await;evaluate(@@ -63,6 +63,7 @@ async fn device_metrics_screen_only_changes_refresh_geometry() {}),).await;+ ctx.capture_fixture_layout(Some("SID-1")).await;assert_eq!(evaluate(&mut ctx,diff --git a/moli-protocol/src/domains/input/tests.rs b/moli-protocol/src/domains/input/tests.rsindex 603339d0c..79f6712bb 100644--- a/moli-protocol/src/domains/input/tests.rs+++ b/moli-protocol/src/domains/input/tests.rs@@ -173,6 +173,7 @@ async fn coordinate_mouse_commands_hit_test_real_layout_and_dispatch_dom_events(</body></html>"#,).await;+ ctx.capture_fixture_layout(None).await;assert!(evaluate_bool(&mut ctx, "document.elementFromPoint(0, 0) !== null").await);let commands = [@@ -224,6 +225,7 @@ async fn coordinate_mouse_release_acknowledges_real_link_navigation() {</body></html>"#,).await;+ ctx.capture_fixture_layout(None).await;assert!(evaluate_bool(&mut ctx, "document.elementFromPoint(0, 0) !== null").await);ctx.enable_page_events_for_test(None);@@ -274,6 +276,7 @@ async fn coordinate_mouse_release_acknowledges_real_link_navigation() {async fn completed_mouse_event_does_not_restore_replaced_page_state() {let mut ctx = TestContext::new();with_loaded_document(&mut ctx, "<body>origin</body>").await;+ ctx.capture_fixture_layout(None).await;assert!(evaluate_bool(&mut ctx, "document.elementFromPoint(0, 0) !== null").await);let original_owner = ctx@@ -471,6 +474,7 @@ async fn coordinate_mouse_down_applies_chromium_focus_default_action() {</body></html>"#,).await;+ ctx.capture_fixture_layout(None).await;ctx.process_async(json!({"id": 31,@@ -513,6 +517,7 @@ async fn canceled_coordinate_mouse_down_keeps_existing_focus() {</body></html>"#,).await;+ ctx.capture_fixture_layout(None).await;ctx.process_async(json!({"id": 32,@@ -557,6 +562,7 @@ async fn touch_tap_and_drag_commands_hit_test_real_layout() {</body></html>"#,).await;+ ctx.capture_fixture_layout(None).await;let commands = [json!({@@ -1500,6 +1506,7 @@ async fn coordinate_mouse_event_completes_through_pending_renderer_dispatch() {r#"<body style='margin:0'><button style='width:80px;height:80px' onclick="window.__clicked = true">go</button></body>"#,).await;+ ctx.capture_fixture_layout(None).await;assert!(evaluate_bool(&mut ctx, "document.elementFromPoint(0, 0) !== null").await);for (id, event_type, buttons) in [(4001, "mousePressed", 1), (4002, "mouseReleased", 0)] {@@ -1789,6 +1796,7 @@ async fn coordinate_touch_commands_complete_through_pending_layout_dispatch() {</body></html>"#,).await;+ ctx.capture_fixture_layout(None).await;for (id, event_type, touch_points) in [(@@ -1890,6 +1898,7 @@ async fn coordinate_drag_event_completes_through_pending_layout_dispatch() {</body></html>"#,).await;+ ctx.capture_fixture_layout(None).await;let raw = json!({"id": 4107,diff --git a/moli-protocol/src/domains/input/tests/element_click.rs b/moli-protocol/src/domains/input/tests/element_click.rsindex 6b11e2a7a..b35be0795 100644--- a/moli-protocol/src/domains/input/tests/element_click.rs+++ b/moli-protocol/src/domains/input/tests/element_click.rs@@ -53,6 +53,7 @@ async fn fixture() -> TestContext {for(const type of ['mousemove','mousedown','mouseup','click'])document.addEventListener(type,e=>events.push([type,e.target.id]));</script></body></html>"#).await;+ ctx.capture_fixture_layout(None).await;ctx}diff --git a/moli-protocol/src/domains/input/tests/mouse_snapshot.rs b/moli-protocol/src/domains/input/tests/mouse_snapshot.rsindex 03ceeaf17..27bbd5ebd 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_mouse_requires_a_snapshot_then_consumes_geometry_and_screenshot_publications() {+async fn cdp_geometry_and_mouse_require_explicit_layout_publication() {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>@@ -27,7 +27,7 @@ async fn cdp_mouse_requires_a_snapshot_then_consumes_geometry_and_screenshot_pubresponse["error"]["message"].as_str().unwrap()- .contains("coordinate input requires an existing layout snapshot"),+ .contains("no published layout is available"),"{response}");}@@ -37,6 +37,29 @@ async fn cdp_mouse_requires_a_snapshot_then_consumes_geometry_and_screenshot_pub);let object_id = resolve_selector_object_id(&mut ctx, "#target", 710).await;+ for (method, params) in [+ ("DOM.getBoxModel", json!({"objectId": object_id})),+ ("Page.getLayoutMetrics", json!({})),+ ] {+ ctx.process_async(json!({"id":720,"method":method,"params":params}))+ .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.printToPDF",+ "Page.startScreencast",+ "wait for a frame",+ ] {+ assert!(message.contains(command), "{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());diff --git a/moli-protocol/src/domains/page.rs b/moli-protocol/src/domains/page.rsindex 46df74645..68ce479c7 100644--- a/moli-protocol/src/domains/page.rs+++ b/moli-protocol/src/domains/page.rs@@ -6151,11 +6151,11 @@ pub(crate) async fn execute_devtools_page_command_async_with_protocol_events(let (result, events) = execute_devtools_handle_javascript_dialog_command(conn, command);(result, events, None)}- DevToolsCommand::CaptureScreenshot(command) => (- execute_devtools_capture_screenshot_command(conn, command).await,- Vec::new(),- None,- ),+ DevToolsCommand::CaptureScreenshot(command) => {+ let (result, predecessor) =+ execute_devtools_capture_screenshot_command(conn, command).await;+ (result, Vec::new(), predecessor)+ }DevToolsCommand::PrintToPdf(command) => (execute_devtools_print_to_pdf_command(conn, command),Vec::new(),@@ -6424,12 +6424,112 @@ fn devtools_target_info_for_target_id(.find_map(|browser_context| browser_context.devtools_target_info(target_id))}+fn renderer_screenshot_request(+ command: &DevToolsCaptureScreenshotCommand,+ base_background_color: [u8; 4],+) -> Result<RendererCaptureScreenshotRequest, DevToolsError> {+ let format = match command.format.as_deref() {+ None | Some("png") => RendererScreenshotFormat::Png,+ Some("jpeg") => RendererScreenshotFormat::Jpeg,+ Some(_) => {+ return Err(DevToolsError::new(+ DevToolsErrorKind::InvalidArgument,+ "Invalid image format",+ ));+ }+ };+ let region = match command.clip.as_ref() {+ Some(DevToolsCaptureScreenshotClip::Box(clip)) => {+ let clip = RendererScreenshotClip {+ x: clip.x,+ y: clip.y,+ width: clip.width,+ height: clip.height,+ scale: clip.scale,+ };+ if command.capture_beyond_viewport {+ RendererScreenshotRegion::PageClip(clip)+ } else {+ RendererScreenshotRegion::ViewportClip(clip)+ }+ }+ Some(DevToolsCaptureScreenshotClip::Element(_)) => {+ return Err(devtools_capture_screenshot_error(command));+ }+ None if command.capture_beyond_viewport => RendererScreenshotRegion::FullDocument,+ None => RendererScreenshotRegion::Viewport,+ };+ Ok(RendererCaptureScreenshotRequest {+ purpose: RendererScreenshotPurpose::Screenshot,+ base_background_color,+ format,+ quality: command.quality.unwrap_or(80),+ region,+ optimize_for_speed: command.optimize_for_speed,+ max_width: None,+ max_height: None,+ })+}+async fn execute_devtools_capture_screenshot_command(conn: &mut CdpConnection,command: DevToolsCaptureScreenshotCommand,-) -> Result<DevToolsCommandResult, DevToolsError> {- validate_page_capture_target_context(conn, &command.context)?;- Err(devtools_capture_screenshot_error(&command))+) -> (+ Result<DevToolsCommandResult, DevToolsError>,+ Option<moli_core::RendererOutputFence>,+) {+ let mut predecessor = None;+ let result = async {+ validate_page_capture_target_context(conn, &command.context)?;+ // Child-context and element-clip captures retain their unsupported boundary.+ if command.context.target_id.as_ref().is_some_and(|target| {+ conn.target_session_route_for_target_id(target.as_str())+ .is_none()+ }) || !conn.layout_policy().uses_real_layout()+ {+ return Err(devtools_capture_screenshot_error(&command));+ }+ let owner = page_command_owner(conn, &command.context)?;+ let request =+ renderer_screenshot_request(&command, conn.default_background_color_for_owner(&owner))?;+ let capture_error =+ |message| DevToolsError::new(DevToolsErrorKind::UnableToCaptureScreen, message);+ let page = conn+ .loaded_page_mut_for_protocol_access_for_owner(&owner)+ .map_err(capture_error)?;+ let pending = page+ .start_capture_screenshot_with_request(request)+ .map_err(|error| capture_error(error.to_string()))?;+ let completion = pending+ .wait()+ .await+ .map_err(|error| capture_error(error.to_string()))?;+ predecessor = completion.renderer_output_predecessor();+ let page = conn+ .loaded_page_mut_for_protocol_access_for_owner(&owner)+ .map_err(capture_error)?;+ let reply = page+ .finish_capture_screenshot(completion)+ .map_err(|error| capture_error(error.to_string()))?;+ match reply {+ RendererCaptureScreenshotReply::Captured(image) => Ok(+ DevToolsCommandResult::CaptureScreenshot(DevToolsCaptureScreenshotResult {+ mime_type: image.mime_type,+ width: image.width,+ height: image.height,+ bytes: image.bytes,+ }),+ ),+ RendererCaptureScreenshotReply::LayoutDisabled => Err(capture_error(+ CAPTURE_SCREENSHOT_LAYOUT_DISABLED_MESSAGE.to_owned(),+ )),+ RendererCaptureScreenshotReply::NoDocument => {+ Err(capture_error("NoDocumentLoaded".to_owned()))+ }+ }+ }+ .await;+ (result, predecessor)}fn execute_devtools_get_javascript_dialog_command(@@ -6768,48 +6868,11 @@ fn start_devtools_capture_screenshot_command(return PageCommandTaskStep::Complete(CommandOutputPlan::error(-32000, message));}};- let format = match command.format.as_deref() {- None | Some("png") => RendererScreenshotFormat::Png,- Some("jpeg") => RendererScreenshotFormat::Jpeg,- Some(_) => {- return PageCommandTaskStep::Complete(CommandOutputPlan::error(- -32602,- "Invalid image format",- ));- }- };- let region = match command.clip.as_ref() {- Some(DevToolsCaptureScreenshotClip::Box(clip)) => {- let clip = RendererScreenshotClip {- x: clip.x,- y: clip.y,- width: clip.width,- height: clip.height,- scale: clip.scale,- };- if command.capture_beyond_viewport {- RendererScreenshotRegion::PageClip(clip)- } else {- RendererScreenshotRegion::ViewportClip(clip)- }- }- Some(DevToolsCaptureScreenshotClip::Element(_)) => {- return PageCommandTaskStep::Complete(CommandOutputPlan::from_devtools_error(- devtools_capture_screenshot_error(&command),- ));+ let request = match renderer_screenshot_request(&command, base_background_color) {+ Ok(request) => request,+ Err(error) => {+ return PageCommandTaskStep::Complete(CommandOutputPlan::from_devtools_error(error));}- None if command.capture_beyond_viewport => RendererScreenshotRegion::FullDocument,- None => RendererScreenshotRegion::Viewport,- };- let request = RendererCaptureScreenshotRequest {- purpose: RendererScreenshotPurpose::Screenshot,- base_background_color,- format,- quality: command.quality.unwrap_or(80),- region,- optimize_for_speed: command.optimize_for_speed,- max_width: None,- max_height: None,};match page.start_capture_screenshot_with_request(request) {Ok(pending) => PageCommandTaskStep::Pending(PendingPageCommandDispatch {diff --git a/moli-protocol/src/domains/page/tests/capture.rs b/moli-protocol/src/domains/page/tests/capture.rsindex b172546a8..381970da1 100644--- a/moli-protocol/src/domains/page/tests/capture.rs+++ b/moli-protocol/src/domains/page/tests/capture.rs@@ -513,16 +513,27 @@ fn mhtml_snapshot_base64_encodes_html_and_sanitizes_header_url() {assert!(!mhtml.contains(html));}#[tokio::test(flavor = "multi_thread")]-async fn print_to_pdf_returns_base64_pdf() {+async fn print_to_pdf_returns_base64_pdf_and_publishes_print_geometry() {let mut ctx = TestContext::new();install_active_screenshot_page(&mut ctx,"BID-PDF-BASE64","TID-PDF-BASE64","SID-PDF-BASE64",- "data:text/html,<style>html,body%7Bmargin%3A0%7D</style><main>pdf</main>",+ "data:text/html,<style>html,body%7Bmargin%3A0%7Dmain%7Bwidth%3A40px%7D@media print%7Bmain%7Bwidth%3A80px%7D%7D</style><main>pdf</main>",).await;+ let query = json!({+ "id": 1111,+ "method": "Runtime.evaluate",+ "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",@@ -532,6 +543,17 @@ async fn print_to_pdf_returns_base64_pdf() {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"));+ ctx.process_async(query.clone()).await;+ assert_eq!(+ take_response_by_id(&mut ctx, 1111)["result"]["result"]["value"],+ 80+ );+ 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+ );}#[tokio::test(flavor = "multi_thread")]async fn print_to_pdf_return_as_stream_reads_through_io_domain() {@@ -861,6 +883,8 @@ async fn devtools_node_screenshot_chain_uses_real_box_and_layout_metrics() {.as_u64().expect("DOM.querySelector target nodeId");+ ctx.capture_fixture_layout(Some("SID-SCREENSHOT-NODE"))+ .await;ctx.process_async(json!({"id": 123,"method": "DOM.getBoxModel",@@ -1085,6 +1109,8 @@ async fn get_layout_metrics_queries_live_renderer_for_loaded_pages() {.runtime_slot.replace_loaded_page(Some(page));+ ctx.capture_fixture_layout(Some("SID-PENDING-LAYOUT-METRICS"))+ .await;ctx.process_async(json!({"id": 125,"method": "Page.getLayoutMetrics",@@ -1139,6 +1165,7 @@ async fn get_layout_metrics_targets_loaded_background_owner_without_activation().await;ctx.expect_result(121, json!({}), Some("SID-background"));+ ctx.capture_fixture_layout(Some("SID-background")).await;ctx.process_async(json!({"id": 123,"method": "Page.getLayoutMetrics",@@ -1192,6 +1219,7 @@ async fn get_layout_metrics_targets_inactive_loaded_owner_without_activation() {.await;ctx.expect_result(121, json!({}), Some("SID-inactive"));+ ctx.capture_fixture_layout(Some("SID-inactive")).await;ctx.process_async(json!({"id": 124,"method": "Page.getLayoutMetrics",diff --git a/moli-protocol/src/domains/runtime/tests/evaluate.rs b/moli-protocol/src/domains/runtime/tests/evaluate.rsindex 06c4ec907..f36561f63 100644--- a/moli-protocol/src/domains/runtime/tests/evaluate.rs+++ b/moli-protocol/src/domains/runtime/tests/evaluate.rs@@ -3331,6 +3331,7 @@ async fn process_message_async_observes_background_timer_between_evaluates() {async fn runtime_evaluate_document_replacement_clears_timer_mutated_inline_style_state() {let mut ctx = TestContext::new();with_loaded_document_async(&mut ctx, "<html><body></body></html>").await;+ ctx.capture_fixture_layout(None).await;ctx.process_and_wait_for_response_async(json!({"id": 3_120,@@ -3351,6 +3352,7 @@ async fn runtime_evaluate_document_replacement_clears_timer_mutated_inline_stylelet mutated = take_response_by_id(&mut ctx, 3_120);assert_eq!(mutated["result"]["result"]["value"], json!("mutated"));+ ctx.capture_fixture_layout(None).await;ctx.process_async(json!({"id": 3_121,"method": "Runtime.evaluate",@@ -3403,6 +3405,7 @@ async fn runtime_evaluate_document_replacement_clears_timer_mutated_inline_styleasync fn isolated_call_function_document_replacement_clears_default_world_style_state() {let mut ctx = TestContext::new();with_loaded_document_async(&mut ctx, "<html><body></body></html>").await;+ ctx.capture_fixture_layout(None).await;ctx.conn.browser_context.as_mut()@@ -3431,6 +3434,7 @@ async fn isolated_call_function_document_replacement_clears_default_world_style_let mutated = take_response_by_id(&mut ctx, 3_132);assert_eq!(mutated["result"]["result"]["value"], json!("mutated"));+ ctx.capture_fixture_layout(None).await;ctx.process_async(json!({"id": 3_133,"method": "Runtime.evaluate",@@ -3486,6 +3490,7 @@ async fn isolated_call_function_document_replacement_clears_default_world_style_async fn playwright_utility_document_replacement_clears_default_world_style_state() {let mut ctx = TestContext::new();with_loaded_document_async(&mut ctx, "<html><body></body></html>").await;+ ctx.capture_fixture_layout(None).await;ctx.conn.browser_context.as_mut()@@ -3540,6 +3545,7 @@ async fn playwright_utility_document_replacement_clears_default_world_style_stat.await;let _ = take_response_by_id(&mut ctx, 3_144);+ ctx.capture_fixture_layout(None).await;ctx.process_async(json!({"id": 3_145,"method": "Runtime.callFunctionOn",diff --git a/moli-protocol/src/domains/target/tests/tests_cdp_chromium_imports/emulation_input_storage.rs b/moli-protocol/src/domains/target/tests/tests_cdp_chromium_imports/emulation_input_storage.rsindex a31a40dfc..ae39db8da 100644--- a/moli-protocol/src/domains/target/tests/tests_cdp_chromium_imports/emulation_input_storage.rs+++ b/moli-protocol/src/domains/target/tests/tests_cdp_chromium_imports/emulation_input_storage.rs@@ -61,6 +61,7 @@ async fn rust_cdp_chromium_import_emulation_device_metrics_affect_layout_metrics"data:text/html,<body>metrics</body>".to_owned(),).await;+ ctx.capture_fixture_layout(Some(&attached.session_id)).await;ctx.process_async(json!({"id": 117_007,"method": "Page.getLayoutMetrics",@@ -457,6 +458,7 @@ async fn rust_cdp_capability_input_dispatch_mouse_event_uses_layout_hit_testing("data:text/html,<button id='btn' onclick='window.__clicked = true' style='position:absolute;left:0;top:0;width:100px;height:100px'>go</button>".to_owned(),).await;+ ctx.capture_fixture_layout(Some(&attached.session_id)).await;let geometry = evaluate_return_by_value(&mut ctx,&attached.session_id,diff --git a/moli-protocol/src/domains/target/tests/tests_cdp_chromium_imports/page_dom.rs b/moli-protocol/src/domains/target/tests/tests_cdp_chromium_imports/page_dom.rsindex cef22a130..598201d0c 100644--- a/moli-protocol/src/domains/target/tests/tests_cdp_chromium_imports/page_dom.rs+++ b/moli-protocol/src/domains/target/tests/tests_cdp_chromium_imports/page_dom.rs@@ -382,6 +382,7 @@ async fn rust_cdp_chromium_import_dom_get_box_model_contract() {})).await;let selected = take_response_by_id(&mut ctx, 114_007);+ ctx.capture_fixture_layout(Some(&attached.session_id)).await;let node_id = selected["result"]["nodeId"].as_i64().unwrap_or_else(|| panic!("selected node id: {selected}"));diff --git a/moli-protocol/src/domains/target/tests/tests_cdp_smoke_chromium.rs b/moli-protocol/src/domains/target/tests/tests_cdp_smoke_chromium.rsindex 2626951d1..329c6fc84 100644--- a/moli-protocol/src/domains/target/tests/tests_cdp_smoke_chromium.rs+++ b/moli-protocol/src/domains/target/tests/tests_cdp_smoke_chromium.rs@@ -239,6 +239,7 @@ async fn rust_cdp_chromium_page_layout_metrics_are_populated() {).await;+ ctx.capture_fixture_layout(Some(&attached.session_id)).await;ctx.process_async(json!({"id": 74_006,"method": "Page.getLayoutMetrics",@@ -1307,6 +1308,7 @@ async fn rust_cdp_chromium_dom_get_node_for_location_contract() {.as_u64().expect("hit target backend node id");+ ctx.capture_fixture_layout(Some(&attached.session_id)).await;ctx.process_async(json!({"id": 80_009,"method": "DOM.getNodeForLocation",diff --git a/moli-protocol/src/domains/target/tests/tests_playwright_cdp.rs b/moli-protocol/src/domains/target/tests/tests_playwright_cdp.rsindex 1fee7fb8f..b544e802b 100644--- a/moli-protocol/src/domains/target/tests/tests_playwright_cdp.rs+++ b/moli-protocol/src/domains/target/tests/tests_playwright_cdp.rs@@ -5903,6 +5903,7 @@ async fn playwright_over_cdp_context_profile_surfaces_permissions_tls_and_metric"denied");+ ctx.capture_fixture_layout(Some(&session_id)).await;ctx.process_async(json!({"id": 238,"method": "Page.getLayoutMetrics",diff --git a/moli-protocol/src/domains/target/tests/tests_target_creation.rs b/moli-protocol/src/domains/target/tests/tests_target_creation.rsindex 477458e82..24fbe712a 100644--- a/moli-protocol/src/domains/target/tests/tests_target_creation.rs+++ b/moli-protocol/src/domains/target/tests/tests_target_creation.rs@@ -2121,6 +2121,7 @@ async fn anchor_left_click_activates_blank_target_to_foreground() {),).await;+ ctx.capture_fixture_layout(None).await;ctx.process_async(json!({"id": 16_090, "method": "Runtime.evaluate","params": {"expression":"document.elementFromPoint(0, 0) !== null", "returnByValue":true}@@ -2169,6 +2170,7 @@ async fn anchor_left_click_activates_popup_while_initial_navigation_waits_for_de),).await;+ ctx.capture_fixture_layout(None).await;ctx.process_async(json!({"id": 16_090, "method": "Runtime.evaluate","params": {"expression":"document.elementFromPoint(0, 0) !== null", "returnByValue":true}@@ -2264,6 +2266,7 @@ async fn anchor_platform_new_tab_click_keeps_blank_target_in_background() {),).await;+ ctx.capture_fixture_layout(None).await;ctx.process_async(json!({"id": 16_090, "method": "Runtime.evaluate","params": {"expression":"document.elementFromPoint(0, 0) !== null", "returnByValue":true}diff --git a/moli-protocol/src/testing.rs b/moli-protocol/src/testing.rsindex 07375abcb..f041ff3ac 100644--- a/moli-protocol/src/testing.rs+++ b/moli-protocol/src/testing.rs@@ -140,6 +140,20 @@ pub(crate) fn real_layout_test_connection() -> CdpConnection {}impl TestContext {+ /// Explicitly publish fixture geometry before geometry-dependent commands.+ pub(crate) async fn capture_fixture_layout(&mut self, session_id: Option<&str>) {+ let mut request = json!({"id":9_000_000,"method":"Page.captureScreenshot"});+ if let Some(session_id) = session_id {+ request["sessionId"] = json!(session_id);+ }+ self.process_async(request).await;+ let response = self.take_response_by_id(9_000_000);+ assert!(+ response["result"]["data"].is_string(),+ "fixture screenshot: {response}"+ );+ }+/// Build the default CDP test harness used by older internal unit tests.////// Historically those tests treated `Target.targetCreated` as a baselinediff --git a/moli-renderer-v8/src/context_bootstrap/range_algorithms/geometry.rs b/moli-renderer-v8/src/context_bootstrap/range_algorithms/geometry.rsindex 3aa51fed6..c602e8d8b 100644--- a/moli-renderer-v8/src/context_bootstrap/range_algorithms/geometry.rs+++ b/moli-renderer-v8/src/context_bootstrap/range_algorithms/geometry.rs@@ -122,12 +122,14 @@ fn native_range_client_rects<'s>(if queries.is_empty() {return Some(Ok(Vec::new()));}- let answers = observable_geometry_batch(+ let answers = match observable_geometry_batch(host,document,- moli_layout::LayoutFlushReason::SynchronousGeometry,&moli_layout::LayoutQueryBatch::new(queries),- );+ ) {+ Err(moli_layout::LayoutError::NoLayoutSnapshot) => return Some(Ok(Vec::new())),+ answers => answers,+ };Some(answers.and_then(|answers| {let mut rects = Vec::new();for (kind, answer) in kinds.into_iter().zip(answers.answers) {diff --git a/moli-renderer-v8/src/context_bootstrap/range_algorithms/text.rs b/moli-renderer-v8/src/context_bootstrap/range_algorithms/text.rsindex ceed15db5..5a53e3620 100644--- a/moli-renderer-v8/src/context_bootstrap/range_algorithms/text.rs+++ b/moli-renderer-v8/src/context_bootstrap/range_algorithms/text.rs@@ -62,22 +62,19 @@ pub(in crate::context_bootstrap) fn range_selection_string_contents<'s>(let mut text_sources = Vec::new();collect_selection_text_sources(runtime, root, &mut text_sources);let document = runtime.layout_document_for_source(start)?;- let rendered_text_sources = match observable_sources_with_fragments(- runtime,- document,- &text_sources,- moli_layout::LayoutFlushReason::SynchronousGeometry,- ) {- Ok(rendered) => rendered,- Err(error) => {- let message = format!("Layout failed while serializing Selection: {error}");- if let Some(message) = crate::util::v8_string(scope, &message) {- let exception = v8::Exception::error(scope, message);- scope.throw_exception(exception);+ let rendered_text_sources =+ match observable_sources_with_fragments(runtime, document, &text_sources) {+ Ok(rendered) => rendered,+ Err(moli_layout::LayoutError::NoLayoutSnapshot) => return Some(String::new()),+ Err(error) => {+ let message = format!("Layout failed while serializing Selection: {error}");+ if let Some(message) = crate::util::v8_string(scope, &message) {+ let exception = v8::Exception::error(scope, message);+ scope.throw_exception(exception);+ }+ return None;}- return None;- }- };+ };let root_state = SelectionTextState {active_modal_dialog: selection_text_active_modal_dialog(runtime, document),..Default::default()diff --git a/moli-renderer-v8/src/context_bootstrap/resize_observer_runtime.rs b/moli-renderer-v8/src/context_bootstrap/resize_observer_runtime.rsindex f2ab9e428..a8d736028 100644--- a/moli-renderer-v8/src/context_bootstrap/resize_observer_runtime.rs+++ b/moli-renderer-v8/src/context_bootstrap/resize_observer_runtime.rs@@ -438,12 +438,15 @@ fn build_resize_observer_entries<'s>(.copied().map(|source| moli_layout::LayoutQuery::ElementMetrics { source }),);- let answers = crate::native_bridge::element::observable_geometry_batch(+ let answers = match crate::native_bridge::element::observable_geometry_batch(runtime,document,- moli_layout::LayoutFlushReason::ObserverDelivery,&moli_layout::LayoutQueryBatch::new(queries),- )?;+ ) {+ Ok(answers) => answers,+ Err(moli_layout::LayoutError::NoLayoutSnapshot) => continue,+ Err(error) => return Err(error),+ };let mut answers = answers.answers.into_iter();let dpr = match answers.next() {Some(moli_layout::LayoutQueryAnswer::DocumentMetrics(metrics)) => {diff --git a/moli-renderer-v8/src/document_runtime/mutation_commands/tree/removal.rs b/moli-renderer-v8/src/document_runtime/mutation_commands/tree/removal.rsindex a61135bcf..5f4f5c678 100644--- a/moli-renderer-v8/src/document_runtime/mutation_commands/tree/removal.rs+++ b/moli-renderer-v8/src/document_runtime/mutation_commands/tree/removal.rs@@ -240,11 +240,7 @@ impl DocumentRuntime {return None;}let rect = match crate::native_bridge::element::observable_scroll_adjusted_client_rect(- runtime,- child,- scroll_x,- scroll_y,- moli_layout::LayoutFlushReason::SynchronousGeometry,+ runtime, child, scroll_x, scroll_y,) {Ok(rect) => rect,Err(error) => {@@ -289,11 +285,7 @@ impl DocumentRuntime {continue;}let rect = match crate::native_bridge::element::observable_scroll_adjusted_client_rect(- runtime,- root,- scroll_x,- scroll_y,- moli_layout::LayoutFlushReason::SynchronousGeometry,+ runtime, root, scroll_x, scroll_y,) {Ok(rect) => rect,Err(error) => {diff --git a/moli-renderer-v8/src/native_bridge/context_host/core.rs b/moli-renderer-v8/src/native_bridge/context_host/core.rsindex f9d2322f5..6fa074614 100644--- a/moli-renderer-v8/src/native_bridge/context_host/core.rs+++ b/moli-renderer-v8/src/native_bridge/context_host/core.rs@@ -208,8 +208,6 @@ impl JsContextHost {layout_snapshot_cache_misses: Cell::new(0),layout_snapshot_cache_publishes: Cell::new(0),style_viewport_generation: Cell::new(0),- #[cfg(test)]- force_fresh_layout_reads_for_test: false,root_document_lifecycle: None,output_journal: None,page_context_resources_closed: false,diff --git a/moli-renderer-v8/src/native_bridge/context_host/layout.rs b/moli-renderer-v8/src/native_bridge/context_host/layout.rsindex 1b7932fd1..1e0b5fbc0 100644--- a/moli-renderer-v8/src/native_bridge/context_host/layout.rs+++ b/moli-renderer-v8/src/native_bridge/context_host/layout.rs@@ -1,12 +1,10 @@use moli_browser_profile::DEFAULT_WINDOW_SURFACE_PROFILE;use moli_layout::{- FrozenLayoutTree, GeometryProvider, LayoutAnswers, LayoutError, LayoutFlushReason,- LayoutPassRequest, LayoutPassResult, LayoutQuery, LayoutQueryAnswer, LayoutQueryBatch,- LayoutViewport,+ FrozenLayoutTree, GeometryProvider, LayoutAnswers, LayoutError, LayoutPassRequest,+ LayoutPassResult, LayoutQuery, LayoutQueryAnswer, LayoutQueryBatch, LayoutViewport,};use super::JsContextHost;-use super::layout_snapshot::LayoutEnvironment;use super::layout_state::InferredFrameStyleViewportCacheKey;use crate::{css_resource_urls::{CompletedStylesheetWebFont, StylesheetLoadBlockingResource},@@ -222,7 +220,6 @@ impl JsContextHost {return Ok(None);};let pass_viewport = request.viewport;- let environment = self.layout_environment();let _active = ActiveLayoutPass::enter(&self.layout_pass_active)?;let mut pass = {let mut state = self.document_layout_state.borrow_mut();@@ -313,7 +310,7 @@ impl JsContextHost {let tree = pass.into_tree();let frame_viewports_changed = {let mut state = self.document_layout_state.borrow_mut();- state.publish_latest_layout(document, tree, environment);+ state.publish_latest_layout(document, tree);state.update_frame_viewports(frame_viewports)};if frame_viewports_changed {@@ -329,52 +326,24 @@ impl JsContextHost {pub(crate) fn answer_layout_for_document(&self,document: DomHandle,- reason: LayoutFlushReason,queries: &LayoutQueryBatch<DomHandle>,) -> Result<LayoutAnswers<DomHandle>, LayoutError> {- let viewport = self.layout_viewport_for_document(document);- self.answer_layout_at_viewport(document, reason, viewport, queries)- }-- pub(crate) fn can_answer_layout_from_snapshot(- &self,- document: DomHandle,- reason: LayoutFlushReason,- viewport: LayoutViewport,- ) -> bool {- self.with_reusable_layout_tree_for_document(document, reason, viewport, |_| ())- .is_some()- }-- fn layout_environment(&self) -> LayoutEnvironment {- LayoutEnvironment {- viewport: self.style_viewport(),- media: StyloStyleEnvironment::from_emulated_media(self.emulated_media()),- }- }-- fn with_reusable_layout_tree_for_document<T>(- &self,- document: DomHandle,- reason: LayoutFlushReason,- viewport: LayoutViewport,- inspect: impl FnOnce(&FrozenLayoutTree<DomHandle>) -> T,- ) -> Option<T> {- #[cfg(test)]- if self.force_fresh_layout_reads_for_test {- return None;- }- if !self- .document_layout_state- .borrow()- .latest_layout_matches_environment(self.layout_environment())- {- return None;+ let answers = self+ .with_latest_layout_tree_for_document(document, |tree| {+ self.last_layout_pass_metrics.get().map(|metrics| {+ self.answer_layout_queries(tree, metrics, tree.viewport, queries)+ })+ })+ .flatten();+ if let Some(answers) = answers {+ self.layout_snapshot_cache_hits+ .set(self.layout_snapshot_cache_hits.get().saturating_add(1));+ Ok(answers)+ } else {+ self.layout_snapshot_cache_misses+ .set(self.layout_snapshot_cache_misses.get().saturating_add(1));+ Err(LayoutError::NoLayoutSnapshot)}- self.with_latest_layout_tree_for_document(document, |tree| {- layout_tree_satisfies_request(tree, reason, viewport).then(|| inspect(tree))- })- .flatten()}/// Inspects the member tree for one exact Document in the single latest@@ -397,64 +366,10 @@ impl JsContextHost {state.latest_layout(document).or_else(|| root.and_then(|root| state.latest_layout_for_root(root)))+ .filter(|tree| Some(tree.source_root()) == root).map(inspect)}- /// Ensures one exact-viewport tree exists without manufacturing a geometry- /// query. Hit-test demands additionally require the complete embedded-frame- /// projection owned by that same frozen tree.- pub(crate) fn ensure_layout_at_viewport(- &self,- document: DomHandle,- reason: LayoutFlushReason,- viewport: LayoutViewport,- ) -> Result<(), LayoutError> {- if self.can_answer_layout_from_snapshot(document, reason, viewport) {- self.layout_snapshot_cache_hits- .set(self.layout_snapshot_cache_hits.get().saturating_add(1));- return Ok(());- }-- self.layout_snapshot_cache_misses- .set(self.layout_snapshot_cache_misses.get().saturating_add(1));- self.with_fresh_layout_pass_for_document(- document,- LayoutPassRequest::new(viewport, reason),- |_| Ok(()),- )?- .ok_or(LayoutError::NoLayoutRoot)- }-- pub(crate) fn answer_layout_at_viewport(- &self,- document: DomHandle,- reason: LayoutFlushReason,- viewport: LayoutViewport,- queries: &LayoutQueryBatch<DomHandle>,- ) -> Result<LayoutAnswers<DomHandle>, LayoutError> {- let cached = self- .with_reusable_layout_tree_for_document(document, reason, viewport, |tree| {- self.last_layout_pass_metrics- .get()- .map(|metrics| self.answer_layout_queries(tree, metrics, viewport, queries))- })- .flatten();- if let Some(answers) = cached {- self.layout_snapshot_cache_hits- .set(self.layout_snapshot_cache_hits.get().saturating_add(1));- return Ok(answers);- }-- self.layout_snapshot_cache_misses- .set(self.layout_snapshot_cache_misses.get().saturating_add(1));- self.with_fresh_layout_pass_for_document(- document,- LayoutPassRequest::new(viewport, reason),- |pass| Ok(self.answer_layout_queries(&pass.tree, pass.metrics, viewport, queries)),- )?- .ok_or(LayoutError::NoLayoutRoot)- }-fn answer_layout_queries(&self,tree: &FrozenLayoutTree<DomHandle>,@@ -467,8 +382,8 @@ impl JsContextHost {.iter().map(|query| match query {LayoutQuery::DocumentMetrics => {- // The viewport comes from the current request; cached- // geometry is reusable only for that same viewport.+ // Geometry and its coordinate environment come from the+ // same published frame, even after live viewport changes.LayoutQueryAnswer::DocumentMetrics(moli_layout::LayoutDocumentMetrics {viewport,viewport_scroll: tree.viewport_scroll,@@ -481,8 +396,7 @@ impl JsContextHost {|candidate| self.offset_parent_candidate_is_exposed(*source, candidate),),),- // Layout preparation still runs, but an out-of-viewport point- // needs no fragment walk.+ // An out-of-viewport point needs no fragment walk.LayoutQuery::HitTest { point, .. } if !viewport.contains(*point) => {LayoutQueryAnswer::HitTest(None)}@@ -541,7 +455,7 @@ impl JsContextHost {pub(crate) fn invalidate_layout_after_interaction_state_change(&self) {self.clear_layout_rect_cache();// Interactions dirty future visual publication, while ordinary geometry- // and input keep consuming the latest compatible frozen snapshot.+ // and input keep consuming the last published frozen snapshot.self.document_layout_state.borrow_mut().mark_visual_state_dirty();@@ -565,12 +479,6 @@ impl JsContextHost {.publish_web_font_resource_generation(generation);}- #[cfg(test)]- pub(crate) fn force_fresh_layout_reads_for_test(&mut self) {- self.force_fresh_layout_reads_for_test = true;- self.document_layout_state.get_mut().clear_latest_layout();- }-pub(crate) fn retain_document_web_font_slots<'a>(&self,resources: impl IntoIterator<Item = &'a StylesheetLoadBlockingResource>,@@ -632,28 +540,15 @@ impl JsContextHost {}}-fn layout_tree_satisfies_request(- tree: &FrozenLayoutTree<DomHandle>,- reason: LayoutFlushReason,- viewport: LayoutViewport,-) -> bool {- // A changed viewport can change reflow, viewport units, and clipping in- // either direction. Rebuild on the next geometry demand, not on resize.- tree.viewport == viewport- && (!matches!(reason, LayoutFlushReason::HitTest) || tree.embedded_frames_complete())-}-impl GeometryProvider for JsContextHost {type NodeId = DomHandle;fn answer(&mut self,- reason: LayoutFlushReason,- viewport: LayoutViewport,queries: &LayoutQueryBatch<Self::NodeId>,) -> Result<LayoutAnswers<Self::NodeId>, LayoutError> {let document = self.document_handle();- self.answer_layout_at_viewport(document, reason, viewport, queries)+ self.answer_layout_for_document(document, queries)}}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.rsindex 972d445fd..07796eda5 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@@ -1,22 +1,10 @@use moli_layout::FrozenLayoutTree;-use crate::{- document_runtime::DomHandle,- style_engine::{StyleViewport, StyloStyleEnvironment},-};--/// Ambient browser style inputs shared by the snapshot's Document trees.-/// DOM and stylesheet mutations deliberately remain outside this identity.-#[derive(Clone, Copy, Debug, PartialEq)]-pub(super) struct LayoutEnvironment {- pub(super) viewport: StyleViewport,- pub(super) media: StyloStyleEnvironment,-}+use crate::document_runtime::DomHandle;struct LatestFrozenLayout {document: DomHandle,tree: Box<FrozenLayoutTree<DomHandle>>,- environment: LayoutEnvironment,}/// Single-slot storage for the latest successful frozen layout tree.@@ -24,8 +12,7 @@ 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. The captured browser environment lets geometry demands check reuse-/// without discarding the sample used by snapshot-only CSSOM readers.+/// policy. Only explicit visual output replaces this published layout.#[derive(Default)]pub(super) struct LatestLayoutTreeCache {latest: Option<LatestFrozenLayout>,@@ -43,22 +30,10 @@ impl LatestLayoutTreeCache {self.latest.as_ref()?.tree.tree_for_root(root)}- pub(super) fn matches_environment(&self, environment: LayoutEnvironment) -> bool {- self.latest- .as_ref()- .is_some_and(|snapshot| snapshot.environment == environment)- }-- pub(super) fn publish(- &mut self,- document: DomHandle,- tree: FrozenLayoutTree<DomHandle>,- environment: LayoutEnvironment,- ) {+ pub(super) fn publish(&mut self, document: DomHandle, tree: FrozenLayoutTree<DomHandle>) {self.latest = Some(LatestFrozenLayout {document,tree: Box::new(tree),- environment,});}diff --git a/moli-renderer-v8/src/native_bridge/context_host/layout_state.rs b/moli-renderer-v8/src/native_bridge/context_host/layout_state.rsindex 5e3e90f7b..574eebcd2 100644--- a/moli-renderer-v8/src/native_bridge/context_host/layout_state.rs+++ b/moli-renderer-v8/src/native_bridge/context_host/layout_state.rs@@ -2,7 +2,7 @@ use std::collections::HashMap;use moli_layout::{DocumentLayoutServices, FrozenLayoutTree, LayoutViewport};-use super::layout_snapshot::{LatestLayoutTreeCache, LayoutEnvironment};+use super::layout_snapshot::LatestLayoutTreeCache;use crate::{css_resource_urls::{CompletedStylesheetWebFont, StylesheetLoadBlockingResource},document_runtime::DomHandle,@@ -132,13 +132,8 @@ impl DocumentLayoutState {&mut self,document: DomHandle,tree: FrozenLayoutTree<DomHandle>,- environment: LayoutEnvironment,) {- self.latest_layout.publish(document, tree, environment);- }-- pub(super) fn latest_layout_matches_environment(&self, environment: LayoutEnvironment) -> bool {- self.latest_layout.matches_environment(environment)+ self.latest_layout.publish(document, tree);}pub(super) fn clear_latest_layout(&mut self) {diff --git a/moli-renderer-v8/src/native_bridge/context_host/mod.rs b/moli-renderer-v8/src/native_bridge/context_host/mod.rsindex 67268a09b..5c2ca44fd 100644--- a/moli-renderer-v8/src/native_bridge/context_host/mod.rs+++ b/moli-renderer-v8/src/native_bridge/context_host/mod.rs@@ -813,8 +813,6 @@ pub(crate) struct JsContextHost {layout_snapshot_cache_misses: Cell<u64>,layout_snapshot_cache_publishes: Cell<u64>,style_viewport_generation: Cell<u64>,- #[cfg(test)]- force_fresh_layout_reads_for_test: bool,root_document_lifecycle: Option<RendererDocumentLifecycleJournalHandle>,output_journal: Option<crate::runtime::RendererTurnOutputJournal>,page_context_resources_closed: bool,diff --git a/moli-renderer-v8/src/native_bridge/current_input.rs b/moli-renderer-v8/src/native_bridge/current_input.rsindex 519f48e55..bd94daed6 100644--- a/moli-renderer-v8/src/native_bridge/current_input.rs+++ b/moli-renderer-v8/src/native_bridge/current_input.rs@@ -61,13 +61,6 @@ impl CurrentInputEvent {}}- pub(crate) fn is_mouse(self) -> bool {- matches!(- self.kind,- CurrentInputEventKind::Mouse | CurrentInputEventKind::MouseUp { .. }- )- }-pub(crate) fn keyboard(key: &str, modifiers: u8) -> Self {Self {kind: if key.eq_ignore_ascii_case("enter") {diff --git a/moli-renderer-v8/src/native_bridge/document/hit_test.rs b/moli-renderer-v8/src/native_bridge/document/hit_test.rsindex 8dc622c25..cf0a1c18b 100644--- a/moli-renderer-v8/src/native_bridge/document/hit_test.rs+++ b/moli-renderer-v8/src/native_bridge/document/hit_test.rs@@ -531,13 +531,16 @@ fn element_at_point(// A single-point query intentionally keeps a foremost text hit and maps// it to its web-exposed parent element. This is observably different from// the penetrating-list filtering performed by `elements_at_point`.- let (metrics, hit) = observable_hit_test(+ let (metrics, hit) = match observable_hit_test(runtime,document,moli_layout::LayoutPoint::new(x as f32, y as f32),false,- moli_layout::LayoutFlushReason::HitTest,- )?;+ ) {+ Ok(answer) => answer,+ Err(moli_layout::LayoutError::NoLayoutSnapshot) => return Ok(None),+ Err(error) => return Err(error),+ };if !point_is_inside_viewport(metrics, x, y) {return Ok(None);}@@ -553,13 +556,16 @@ fn elements_at_point(x: f64,y: f64,) -> Result<Vec<DomHandle>, moli_layout::LayoutError> {- let (metrics, hits) = observable_hit_test_all(+ let (metrics, hits) = match observable_hit_test_all(runtime,document,moli_layout::LayoutPoint::new(x as f32, y as f32),false,- moli_layout::LayoutFlushReason::HitTest,- )?;+ ) {+ Ok(answer) => answer,+ Err(moli_layout::LayoutError::NoLayoutSnapshot) => return Ok(Vec::new()),+ Err(error) => return Err(error),+ };if !point_is_inside_viewport(metrics, x, y) {return Ok(Vec::new());}@@ -699,7 +705,6 @@ pub(in crate::native_bridge) fn node_document_caret_position_from_point_callbackruntime,handle,moli_layout::LayoutPoint::new(parsed.x as f32, parsed.y as f32),- moli_layout::LayoutFlushReason::HitTest,) {Ok(Some(position)) => {let (node, offset, rect) =@@ -719,7 +724,7 @@ pub(in crate::native_bridge) fn node_document_caret_position_from_point_callbackrv.set_null();}}- Ok(None) => rv.set_null(),+ Ok(None) | Err(moli_layout::LayoutError::NoLayoutSnapshot) => rv.set_null(),Err(error) => {throw_hit_test_layout_error(scope, error);rv.set_null();diff --git a/moli-renderer-v8/src/native_bridge/element.rs b/moli-renderer-v8/src/native_bridge/element.rsindex 90d0e256f..be45ce4e8 100644--- a/moli-renderer-v8/src/native_bridge/element.rs+++ b/moli-renderer-v8/src/native_bridge/element.rs@@ -393,13 +393,13 @@ pub use geometry::ClientRect;#[cfg(test)]pub(crate) use geometry::observable_scrollbar_hit_test;pub(crate) use geometry::{- 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,- perform_scrollbar_scroll_default_action, perform_wheel_scroll_default_action,- queue_scroll_observable_effects, scroll_node_into_view_at_center,- scroll_node_into_view_at_start, snapshot_input_surface_hit_test,+ InputSurfaceHit, apply_scroll_observable_effects, input_surface_hit_test,+ 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, perform_scrollbar_scroll_default_action,+ perform_wheel_scroll_default_action, queue_scroll_observable_effects,+ scroll_node_into_view_at_center, scroll_node_into_view_at_start,};pub(super) use geometry::{node_client_height_getter_function, node_client_left_getter_function,diff --git a/moli-renderer-v8/src/native_bridge/element/activation/default_action.rs b/moli-renderer-v8/src/native_bridge/element/activation/default_action.rsindex 15bb97b83..799adec42 100644--- a/moli-renderer-v8/src/native_bridge/element/activation/default_action.rs+++ b/moli-renderer-v8/src/native_bridge/element/activation/default_action.rs@@ -1701,11 +1701,7 @@ fn image_submitter_coordinate(client_x: f64,client_y: f64,) -> Result<(u32, u32), moli_layout::LayoutError> {- let rect = super::super::geometry::read_bounding_client_rect(- runtime,- handle,- super::super::geometry::GeometryRead::for_default_action(runtime),- )?;+ let rect = super::super::geometry::read_bounding_client_rect(runtime, handle)?;Ok((image_submitter_coordinate_component(client_x - rect.left, rect.width),image_submitter_coordinate_component(client_y - rect.top, rect.height),diff --git a/moli-renderer-v8/src/native_bridge/element/content.rs b/moli-renderer-v8/src/native_bridge/element/content.rsindex 5c92b7762..15fceba82 100644--- a/moli-renderer-v8/src/native_bridge/element/content.rs+++ b/moli-renderer-v8/src/native_bridge/element/content.rs@@ -802,12 +802,13 @@ fn node_inner_text(}let sources = inner_text_source_handles(runtime, handle);let rendered_text_sources = if let Some(document) = runtime.layout_document_for_source(handle) {- observable_sources_with_fragments(- runtime,- document,- &sources,- moli_layout::LayoutFlushReason::SynchronousGeometry,- )?+ match observable_sources_with_fragments(runtime, document, &sources) {+ Ok(sources) => sources,+ Err(moli_layout::LayoutError::NoLayoutSnapshot) => {+ return Ok(node.text_content(runtime.dom_host().dom()));+ }+ Err(error) => return Err(error),+ }} else {HashSet::new()};diff --git a/moli-renderer-v8/src/native_bridge/element/focus.rs b/moli-renderer-v8/src/native_bridge/element/focus.rsindex dd30888ab..9a4a646c2 100644--- a/moli-renderer-v8/src/native_bridge/element/focus.rs+++ b/moli-renderer-v8/src/native_bridge/element/focus.rs@@ -6,7 +6,7 @@ use super::super::{use super::forms::{dispatch_text_control_event, form_control_is_effectively_disabled, text_control_value,};-use super::geometry::{GeometryRead, read_element_metrics, scroll_node_into_view_if_needed};+use super::geometry::{read_element_metrics, scroll_node_into_view_if_needed};use super::styles::{StyleMode, style_property_value};use super::{construct_click_event, construct_focus_event, construct_interest_event,@@ -74,14 +74,6 @@ fn contenteditable_state_from_attr(value: &str) -> Option<bool> {}pub(super) fn is_focusable(runtime: &JsContextHost, handle: DomHandle) -> bool {- is_focusable_with_geometry(runtime, handle, GeometryRead::for_default_action(runtime))-}--fn is_focusable_with_geometry(- runtime: &JsContextHost,- handle: DomHandle,- geometry: GeometryRead,-) -> bool {let Some(element) = runtime.dom_host().node(handle).and_then(Node::as_element) else {return false;};@@ -98,7 +90,7 @@ fn is_focusable_with_geometry("body" | "input" | "button" | "select" | "textarea" | "a" | "iframe" | "frame") || element.has_attribute("tabindex")|| contenteditable_editing_host(runtime, handle) == Some(handle)- || element_is_scrollable_with_geometry(runtime, handle, geometry)+ || element_is_scrollable(runtime, handle)}fn overflow_makes_scroll_container(value: &str) -> bool {@@ -109,14 +101,6 @@ fn overflow_makes_scroll_container(value: &str) -> bool {}fn element_is_scrollable(runtime: &JsContextHost, handle: DomHandle) -> bool {- element_is_scrollable_with_geometry(runtime, handle, GeometryRead::for_default_action(runtime))-}--fn element_is_scrollable_with_geometry(- runtime: &JsContextHost,- handle: DomHandle,- geometry: GeometryRead,-) -> bool {let scrolls_x = overflow_makes_scroll_container(&style_property_value(runtime,handle,@@ -132,7 +116,7 @@ fn element_is_scrollable_with_geometry(if !scrolls_x && !scrolls_y {return false;}- match read_element_metrics(runtime, handle, geometry) {+ match read_element_metrics(runtime, handle) {Ok(Some(metrics)) => {metrics.is_scroll_container&& (scrolls_x && metrics.maximum_scroll_offset.x > metrics.minimum_scroll_offset.x@@ -176,7 +160,6 @@ fn first_delegates_focus_descendant(runtime: &JsContextHost,root: DomHandle,autofocus_only: bool,- geometry: GeometryRead,) -> Option<DomHandle> {let mut stack = runtime.dom_host().child_handles(root).collect::<Vec<_>>();stack.reverse();@@ -186,14 +169,14 @@ fn first_delegates_focus_descendant(.node(handle).and_then(Node::as_element).is_some_and(|element| element.has_attribute("autofocus"));- if (!autofocus_only || autofocus) && is_focusable_with_geometry(runtime, handle, geometry) {+ if (!autofocus_only || autofocus) && is_focusable(runtime, handle) {return Some(handle);}if let Some(shadow_root) = runtime.dom_host().shadow_root_handle(handle)&& runtime.dom_host().shadow_root_delegates_focus(shadow_root) == Some(true)&& let Some(target) =- first_delegates_focus_descendant(runtime, shadow_root, autofocus_only, geometry)+ first_delegates_focus_descendant(runtime, shadow_root, autofocus_only){return Some(target);}@@ -205,24 +188,12 @@ fn first_delegates_focus_descendant(None}-fn first_delegates_focus_target(- runtime: &JsContextHost,- root: DomHandle,- geometry: GeometryRead,-) -> Option<DomHandle> {- first_delegates_focus_descendant(runtime, root, true, geometry)- .or_else(|| first_delegates_focus_descendant(runtime, root, false, geometry))+fn first_delegates_focus_target(runtime: &JsContextHost, root: DomHandle) -> Option<DomHandle> {+ first_delegates_focus_descendant(runtime, root, true)+ .or_else(|| first_delegates_focus_descendant(runtime, root, false))}fn delegated_focus_target(runtime: &JsContextHost, handle: DomHandle) -> Option<DomHandle> {- delegated_focus_target_with_geometry(runtime, handle, GeometryRead::for_default_action(runtime))-}--fn delegated_focus_target_with_geometry(- runtime: &JsContextHost,- handle: DomHandle,- geometry: GeometryRead,-) -> Option<DomHandle> {let root = runtime.dom_host().shadow_root_handle(handle)?;if runtime.dom_host().shadow_root_delegates_focus(root) != Some(true) {return None;@@ -232,7 +203,7 @@ fn delegated_focus_target_with_geometry({return Some(active);}- first_delegates_focus_target(runtime, root, geometry)+ first_delegates_focus_target(runtime, root)}fn first_autofocus_candidate(runtime: &JsContextHost) -> Option<DomHandle> {@@ -1251,13 +1222,7 @@ pub(crate) fn focus_element(runtime_ptr: *mut JsContextHost,handle: DomHandle,) {- if let Err(error) = focus_element_with_options(- scope,- runtime_ptr,- handle,- false,- GeometryRead::for_default_action(unsafe { &*runtime_ptr }),- ) {+ if let Err(error) = focus_element_with_options(scope, runtime_ptr, handle, false) {tracing::warn!(?handle, %error, "failed to scroll focused element into view");}}@@ -1319,25 +1284,23 @@ fn focus_element_with_options(runtime_ptr: *mut JsContextHost,handle: DomHandle,prevent_scroll: bool,- geometry: GeometryRead,) -> Result<(), moli_layout::LayoutError> {let runtime = unsafe { &*runtime_ptr };let target = if runtime.dom_host().is_html_element_named(handle, "label")&& !label_receives_programmatic_focus(runtime, handle){- label_control_handle(runtime, handle)- .filter(|control| is_focusable_with_geometry(runtime, *control, geometry))+ label_control_handle(runtime, handle).filter(|control| is_focusable(runtime, *control))} else if let Some(shadow_root) = runtime.dom_host().shadow_root_handle(handle)&& runtime.dom_host().shadow_root_delegates_focus(shadow_root) == Some(true){- delegated_focus_target_with_geometry(runtime, handle, geometry)+ delegated_focus_target(runtime, handle)} else {- is_focusable_with_geometry(runtime, handle, geometry).then_some(handle)+ is_focusable(runtime, handle).then_some(handle)};if let Some(target) = target {update_focus(scope, runtime_ptr, Some(target));if !prevent_scroll {- scroll_node_into_view_if_needed(scope, runtime_ptr, target, None, geometry)?;+ scroll_node_into_view_if_needed(scope, runtime_ptr, target, None)?;}}Ok(())@@ -1403,13 +1366,7 @@ pub(in crate::native_bridge) fn node_focus_callback<'s>(let Some(prevent_scroll) = focus_options_prevent_scroll(scope, &args) else {return;};- if let Err(error) = focus_element_with_options(- scope,- runtime_ptr,- handle,- prevent_scroll,- moli_layout::LayoutFlushReason::SynchronousGeometry.into(),- ) {+ if let Err(error) = focus_element_with_options(scope, runtime_ptr, handle, prevent_scroll) {throw_focus_layout_error(scope, error);}rv.set_undefined();diff --git a/moli-renderer-v8/src/native_bridge/element/geometry.rs b/moli-renderer-v8/src/native_bridge/element/geometry.rsindex d7ddbf586..4fc3a8cf7 100644--- a/moli-renderer-v8/src/native_bridge/element/geometry.rs+++ b/moli-renderer-v8/src/native_bridge/element/geometry.rs@@ -11,8 +11,8 @@ pub use client_rect::ClientRect;#[cfg(test)]pub(crate) use hit_test::observable_scrollbar_hit_test;pub(crate) use hit_test::{- InputSurfaceHit, observable_deep_hit_test, observable_hit_test, observable_input_hit_test,- snapshot_input_surface_hit_test,+ InputSurfaceHit, input_surface_hit_test, observable_deep_hit_test, observable_hit_test,+ observable_input_hit_test,};pub(in crate::native_bridge) use metrics::{node_client_height_getter_function, node_client_left_getter_function,@@ -30,11 +30,10 @@ pub(crate) use mock::{compute_mock_intersection_scrollport_client_rect,};pub(crate) use provider::{- GeometryRead, observable_bounding_client_rects, observable_caret_position,- observable_event_offset, observable_geometry_batch, observable_hit_test_all,- observable_scroll_adjusted_client_rect, observable_sources_with_fragments,- observable_used_grid_tracks, read_bounding_client_rect, read_client_rects,- read_element_metrics,+ observable_bounding_client_rects, observable_caret_position, observable_event_offset,+ observable_geometry_batch, observable_hit_test_all, observable_scroll_adjusted_client_rect,+ observable_sources_with_fragments, observable_used_grid_tracks, 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.rsindex 930e9e661..de77e302d 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@@ -1,7 +1,6 @@use moli_layout::{- FrozenLayoutTree, LayoutControlSurfaceHit, LayoutError, LayoutFlushReason, LayoutHit,- LayoutPaintedSurfaceHit, LayoutPoint, LayoutQuery, LayoutQueryAnswer, LayoutQueryBatch,- LayoutTransform2D, LayoutViewport,+ FrozenLayoutTree, LayoutControlSurfaceHit, LayoutError, LayoutHit, LayoutPaintedSurfaceHit,+ LayoutPoint, LayoutQuery, LayoutQueryAnswer, LayoutQueryBatch, LayoutTransform2D,};#[cfg(test)]@@ -32,16 +31,14 @@ pub(crate) struct InputSurfaceHit {#[derive(Clone, Copy)]struct FrameHitTest {document: DomHandle,- viewport: LayoutViewport,point: LayoutPoint,root_to_frame: LayoutTransform2D,}impl FrameHitTest {- fn root(runtime: &JsContextHost, document: DomHandle, point: LayoutPoint) -> Self {+ fn root(document: DomHandle, point: LayoutPoint) -> Self {Self {document,- viewport: runtime.layout_viewport_for_document(document),point,root_to_frame: LayoutTransform2D::IDENTITY,}@@ -64,11 +61,6 @@ impl FrameHitTest {.concatenate(hit.viewport_to_local);Some(Self {document,- viewport: LayoutViewport::new(- css_viewport_dimension(content_box.width),- css_viewport_dimension(content_box.height),- self.viewport.device_pixel_ratio,- ),point: frame_to_child.map_point(self.point),root_to_frame: frame_to_child.concatenate(self.root_to_frame),})@@ -80,7 +72,7 @@ pub(crate) fn observable_input_hit_test(document: DomHandle,point: LayoutPoint,) -> Result<Option<InputHit>, LayoutError> {- observable_input_surface_hit_test(runtime, document, point, false, false).map(|hit| hit.input)+ input_surface_hit_test(runtime, document, point, false, false).map(|hit| hit.input)}#[cfg(test)]@@ -89,37 +81,15 @@ pub(crate) fn observable_scrollbar_hit_test(document: DomHandle,point: LayoutPoint,) -> Result<Option<LayoutScrollbarHit<DomHandle>>, LayoutError> {- observable_input_surface_hit_test(runtime, document, point, false, true).map(|hit| {- match hit.control {- Some(LayoutControlSurfaceHit::Scrollbar(scrollbar)) => Some(scrollbar),- Some(LayoutControlSurfaceHit::ScrollbarCorner(_)) | None => None,- }+ input_surface_hit_test(runtime, document, point, false, true).map(|hit| match hit.control {+ Some(LayoutControlSurfaceHit::Scrollbar(scrollbar)) => Some(scrollbar),+ Some(LayoutControlSurfaceHit::ScrollbarCorner(_)) | None => None,})}-pub(crate) fn observable_input_surface_hit_test(- runtime: &JsContextHost,- document: DomHandle,- point: LayoutPoint,- ignore_pointer_events_none: bool,- include_scrollbars: bool,-) -> Result<InputSurfaceHit, LayoutError> {- if runtime.layout_policy().uses_real_layout() {- let viewport = runtime.layout_viewport_for_document(document);- runtime.ensure_layout_at_viewport(document, LayoutFlushReason::HitTest, viewport)?;- }- snapshot_input_surface_hit_test(- runtime,- document,- point,- ignore_pointer_events_none,- include_scrollbars,- )-}-/// Coordinate input must not create or refresh geometry, including embedded/// frame geometry. Live DOM checks only reject sources that no longer exist.-pub(crate) fn snapshot_input_surface_hit_test(+pub(crate) fn input_surface_hit_test(runtime: &JsContextHost,document: DomHandle,point: LayoutPoint,@@ -135,14 +105,6 @@ pub(crate) fn snapshot_input_surface_hit_test(}runtime.with_latest_layout_tree_for_document(document, |tree| {- if runtime- .dom_host()- .dom()- .document_element_handle_for_document(document)- != Some(tree.source_root())- {- return Err(LayoutError::NoLayoutSnapshot);- }input_surface_hit_test_in_tree(runtime,tree,@@ -162,15 +124,11 @@ pub(crate) fn observable_deep_hit_test(point: LayoutPoint,ignore_pointer_events_none: bool,) -> Result<Option<DomHandle>, LayoutError> {- Ok(observable_input_surface_hit_test(- runtime,- document,- point,- ignore_pointer_events_none,- false,- )?- .input- .map(|hit| hit.handle))+ Ok(+ input_surface_hit_test(runtime, document, point, ignore_pointer_events_none, false)?+ .input+ .map(|hit| hit.handle),+ )}fn input_hit_test_via_documents(@@ -181,7 +139,7 @@ fn input_hit_test_via_documents() -> Result<Option<InputHit>, LayoutError> {input_hit_test_in_frame(runtime,- FrameHitTest::root(runtime, document, point),+ FrameHitTest::root(document, point),ignore_pointer_events_none,0,)@@ -353,10 +311,9 @@ fn live_hit_in_frame(frame: FrameHitTest,ignore_pointer_events_none: bool,) -> Result<Option<(LayoutHit<DomHandle>, DomHandle)>, LayoutError> {- let first_hit = observable_hit_test_in_viewport(+ let (_, first_hit) = observable_hit_test(runtime,frame.document,- frame.viewport,frame.point,ignore_pointer_events_none,)?;@@ -375,10 +332,9 @@ fn live_hit_in_frame(if live_first_hit.is_some() || first_hit.is_none() {return Ok(live_first_hit);}- let hits = observable_hit_test_all_in_viewport(+ let (_, hits) = observable_hit_test_all(runtime,frame.document,- frame.viewport,frame.point,ignore_pointer_events_none,)?;@@ -391,38 +347,6 @@ fn live_hit_in_frame(}))}-fn observable_hit_test_in_viewport(- runtime: &JsContextHost,- document: DomHandle,- viewport: LayoutViewport,- point: LayoutPoint,- ignore_pointer_events_none: bool,-) -> Result<Option<LayoutHit<DomHandle>>, LayoutError> {- if !runtime.layout_policy().uses_real_layout() {- return observable_hit_test(- runtime,- document,- point,- ignore_pointer_events_none,- LayoutFlushReason::HitTest,- )- .map(|(_, hit)| hit);- }- let answers = runtime.answer_layout_at_viewport(- document,- LayoutFlushReason::HitTest,- viewport,- &LayoutQueryBatch::new(vec![LayoutQuery::HitTest {- point,- ignore_pointer_events_none,- }]),- )?;- match answers.answers.into_iter().next() {- Some(LayoutQueryAnswer::HitTest(hit)) => Ok(hit),- _ => Err(provider_contract_error("viewport-scoped hit test")),- }-}-/// Resolve the foremost painted hit and the viewport sampled by the same/// frozen layout pass. Single-point DOM APIs consume this query while/// penetrating-list APIs use `observable_hit_test_all`.@@ -431,7 +355,6 @@ pub(crate) fn observable_hit_test(document: DomHandle,point: LayoutPoint,ignore_pointer_events_none: bool,- reason: LayoutFlushReason,) -> Result<(moli_layout::LayoutDocumentMetrics,@@ -442,7 +365,6 @@ pub(crate) fn observable_hit_test(let answers = observable_geometry_batch(runtime,document,- reason,&LayoutQueryBatch::new(vec![LayoutQuery::DocumentMetrics,LayoutQuery::HitTest {@@ -461,38 +383,6 @@ pub(crate) fn observable_hit_test(}}-fn observable_hit_test_all_in_viewport(- runtime: &JsContextHost,- document: DomHandle,- viewport: LayoutViewport,- point: LayoutPoint,- ignore_pointer_events_none: bool,-) -> Result<Vec<LayoutHit<DomHandle>>, LayoutError> {- if !runtime.layout_policy().uses_real_layout() {- return observable_hit_test_all(- runtime,- document,- point,- ignore_pointer_events_none,- LayoutFlushReason::HitTest,- )- .map(|(_, hits)| hits);- }- let answers = runtime.answer_layout_at_viewport(- document,- LayoutFlushReason::HitTest,- viewport,- &LayoutQueryBatch::new(vec![LayoutQuery::HitTestAll {- point,- ignore_pointer_events_none,- }]),- )?;- match answers.answers.into_iter().next() {- Some(LayoutQueryAnswer::HitTestAll(hits)) => Ok(hits),- _ => Err(provider_contract_error("viewport-scoped complete hit test")),- }-}-fn element_for_hit_source(runtime: &JsContextHost, mut source: DomHandle) -> Option<DomHandle> {loop {let node = runtime.dom_host().node(source)?;@@ -506,10 +396,3 @@ fn element_for_hit_source(runtime: &JsContextHost, mut source: DomHandle) -> Optsource = parent;}}--fn css_viewport_dimension(value: f32) -> u32 {- if !value.is_finite() {- return 0;- }- value.round().clamp(0.0, u32::MAX as f32) as u32-}diff --git a/moli-renderer-v8/src/native_bridge/element/geometry/metrics.rs b/moli-renderer-v8/src/native_bridge/element/geometry/metrics.rsindex b8024716c..608fb9ed5 100644--- a/moli-renderer-v8/src/native_bridge/element/geometry/metrics.rs+++ b/moli-renderer-v8/src/native_bridge/element/geometry/metrics.rs@@ -24,11 +24,7 @@ fn node_scroll_position_value<'s>(horizontal: bool,) -> Result<f64, moli_layout::LayoutError> {if let Ok((runtime_ptr, handle)) = node_runtime_and_handle_from_object(scope, object) {- let metrics = read_element_metrics(- unsafe { &*runtime_ptr },- handle,- moli_layout::LayoutFlushReason::SynchronousGeometry,- )?;+ let metrics = read_element_metrics(unsafe { &*runtime_ptr }, handle)?;return Ok(metrics.map(|metrics| {if horizontal {@@ -63,25 +59,21 @@ fn node_scroll_position_setter_for_object<'s>(}let runtime = unsafe { &mut *runtime_ptr };let (minimum, maximum) = if runtime.layout_policy().uses_real_layout() {- read_element_metrics(- runtime,- handle,- moli_layout::LayoutFlushReason::SynchronousGeometry,- )?- .map(|metrics| {- if horizontal {- (- f64::from(metrics.minimum_scroll_offset.x),- f64::from(metrics.maximum_scroll_offset.x),- )- } else {- (- f64::from(metrics.minimum_scroll_offset.y),- f64::from(metrics.maximum_scroll_offset.y),- )- }- })- .unwrap_or((0.0, 0.0))+ read_element_metrics(runtime, handle)?+ .map(|metrics| {+ if horizontal {+ (+ f64::from(metrics.minimum_scroll_offset.x),+ f64::from(metrics.maximum_scroll_offset.x),+ )+ } else {+ (+ f64::from(metrics.minimum_scroll_offset.y),+ f64::from(metrics.maximum_scroll_offset.y),+ )+ }+ })+ .unwrap_or((0.0, 0.0))} else {// Mock intentionally preserves the old synthetic geometry behavior:// non-negative scroll values are stored even without real overflow.@@ -231,11 +223,7 @@ fn scroll_node_to<'s>(} else {parse_scroll_coordinates(scope, &args, current_left, current_top)};- let metrics = read_element_metrics(- unsafe { &*runtime_ptr },- handle,- moli_layout::LayoutFlushReason::SynchronousGeometry,- )?;+ let metrics = read_element_metrics(unsafe { &*runtime_ptr }, handle)?;let Some(metrics) = metrics else {return Ok(());};@@ -273,11 +261,7 @@ fn node_box_metric_from_object<'s>(metric: &str,) -> Result<i32, moli_layout::LayoutError> {if let Ok((runtime_ptr, handle)) = node_runtime_and_handle_from_object(scope, object) {- let metrics = read_element_metrics(- unsafe { &*runtime_ptr },- handle,- moli_layout::LayoutFlushReason::SynchronousGeometry,- )?;+ let metrics = read_element_metrics(unsafe { &*runtime_ptr }, handle)?;return Ok(metrics.as_ref().map(|metrics| layout_box_metric(metrics, metric))@@ -562,11 +546,7 @@ pub(in crate::native_bridge) fn node_offset_parent_getter_function<'s>(return;};let runtime = unsafe { &mut *runtime_ptr };- let metrics = match read_element_metrics(- runtime,- handle,- moli_layout::LayoutFlushReason::SynchronousGeometry,- ) {+ let metrics = match read_element_metrics(runtime, handle) {Ok(metrics) => metrics,Err(error) => {let message = format!("Layout failed while reading offsetParent: {error}");@@ -607,13 +587,7 @@ pub(in crate::native_bridge) fn node_scroll_into_view_if_needed_callback(mut rv: v8::ReturnValue<'_, v8::Value>,) {if let Ok((runtime_ptr, handle)) = node_runtime_and_handle_from_object(scope, args.this())- && let Err(error) = scroll_node_into_view_if_needed(- scope,- runtime_ptr,- handle,- None,- moli_layout::LayoutFlushReason::SynchronousGeometry.into(),- )+ && let Err(error) = scroll_node_into_view_if_needed(scope, runtime_ptr, handle, None){throw_scroll_layout_error(scope, "scrollIntoViewIfNeeded", error);}diff --git a/moli-renderer-v8/src/native_bridge/element/geometry/provider.rs b/moli-renderer-v8/src/native_bridge/element/geometry/provider.rsindex 7369f722c..d153872be 100644--- a/moli-renderer-v8/src/native_bridge/element/geometry/provider.rs+++ b/moli-renderer-v8/src/native_bridge/element/geometry/provider.rs@@ -12,37 +12,9 @@ use super::mock::{};use crate::{document_runtime::DomHandle, native_bridge::JsContextHost};-/// Native input reads the rendered snapshot; explicit geometry APIs may-/// prepare layout. Both paths share the query and result conversion below.-#[derive(Clone, Copy)]-pub(crate) enum GeometryRead {- Demand(LayoutFlushReason),- Snapshot,-}--impl From<LayoutFlushReason> for GeometryRead {- fn from(reason: LayoutFlushReason) -> Self {- Self::Demand(reason)- }-}--impl GeometryRead {- pub(crate) fn for_default_action(runtime: &JsContextHost) -> Self {- if runtime- .current_input_event()- .is_some_and(|event| event.is_mouse())- {- Self::Snapshot- } else {- Self::Demand(LayoutFlushReason::SynchronousGeometry)- }- }-}-fn query_source(runtime: &JsContextHost,source: DomHandle,- read: impl Into<GeometryRead>,query: LayoutQuery<DomHandle>,) -> Result<Option<LayoutQueryAnswer<DomHandle>>, LayoutError> {if !runtime.dom_host().is_connected(source) {@@ -51,20 +23,12 @@ fn query_source(let Some(document) = runtime.layout_document_for_source(source) else {return Ok(None);};- let reason = match read.into() {- GeometryRead::Snapshot if runtime.layout_policy().uses_real_layout() => {- return Ok(runtime- .with_latest_layout_tree_for_document(document, |tree| tree.answer_query(&query)));- }- GeometryRead::Snapshot => LayoutFlushReason::SynchronousGeometry,- GeometryRead::Demand(reason) => reason,- };- let answers = observable_geometry_batch(- runtime,- document,- reason,- &LayoutQueryBatch::new(vec![query]),- )?;+ let answers =+ match observable_geometry_batch(runtime, document, &LayoutQueryBatch::new(vec![query])) {+ Ok(answers) => answers,+ Err(LayoutError::NoLayoutSnapshot) => return Ok(None),+ Err(error) => return Err(error),+ };answers.answers.into_iter()@@ -76,22 +40,25 @@ fn query_source(pub(crate) fn observable_geometry_batch(runtime: &JsContextHost,document: DomHandle,- reason: LayoutFlushReason,batch: &LayoutQueryBatch<DomHandle>,) -> Result<LayoutAnswers<DomHandle>, LayoutError> {if runtime.layout_policy().uses_real_layout() {- runtime.answer_layout_for_document(document, reason, batch)+ runtime.answer_layout_for_document(document, batch)} else {- Ok(answer_mock_queries(runtime, document, reason, batch))+ Ok(answer_mock_queries(+ runtime,+ document,+ LayoutFlushReason::SynchronousGeometry,+ batch,+ ))}}pub(crate) fn read_client_rects(runtime: &JsContextHost,source: DomHandle,- reason: impl Into<GeometryRead>,) -> Result<Vec<ClientRect>, LayoutError> {- match query_source(runtime, source, reason, LayoutQuery::ClientRects { source })? {+ match query_source(runtime, source, LayoutQuery::ClientRects { source })? {Some(LayoutQueryAnswer::ClientRects(rects)) => {Ok(rects.into_iter().map(client_rect_from_quad).collect())}@@ -104,7 +71,6 @@ pub(crate) fn observable_sources_with_fragments(runtime: &JsContextHost,document: DomHandle,sources: &[DomHandle],- reason: LayoutFlushReason,) -> Result<HashSet<DomHandle>, LayoutError> {if sources.is_empty() {return Ok(HashSet::new());@@ -114,8 +80,7 @@ pub(crate) fn observable_sources_with_fragments(.copied().map(|source| LayoutQuery::ContentQuads { source }).collect();- let answers =- observable_geometry_batch(runtime, document, reason, &LayoutQueryBatch::new(queries))?;+ let answers = observable_geometry_batch(runtime, document, &LayoutQueryBatch::new(queries))?;if answers.answers.len() != sources.len() {return Err(provider_contract_error("rendered source fragment"));}@@ -136,9 +101,8 @@ pub(crate) fn observable_sources_with_fragments(pub(crate) fn read_bounding_client_rect(runtime: &JsContextHost,source: DomHandle,- reason: impl Into<GeometryRead>,) -> Result<ClientRect, LayoutError> {- let mut rects = read_client_rects(runtime, source, reason)?.into_iter();+ let mut rects = read_client_rects(runtime, source)?.into_iter();let Some(mut bounds) = rects.next() else {return Ok(zero_client_rect());};@@ -151,7 +115,6 @@ pub(crate) fn read_bounding_client_rect(pub(crate) fn observable_bounding_client_rects(runtime: &JsContextHost,sources: &[DomHandle],- reason: LayoutFlushReason,) -> Result<Vec<ClientRect>, LayoutError> {let Some((&first, rest)) = sources.split_first() else {return Ok(Vec::new());@@ -177,7 +140,13 @@ pub(crate) fn observable_bounding_client_rects(.map(|source| LayoutQuery::ClientRects { source }).collect();let answers =- observable_geometry_batch(runtime, document, reason, &LayoutQueryBatch::new(queries))?;+ match observable_geometry_batch(runtime, document, &LayoutQueryBatch::new(queries)) {+ Ok(answers) => answers,+ Err(LayoutError::NoLayoutSnapshot) => {+ return Ok(vec![zero_client_rect(); sources.len()]);+ }+ Err(error) => return Err(error),+ };if answers.answers.len() != sources.len() {return Err(provider_contract_error("bounding client rects"));}@@ -198,9 +167,8 @@ pub(crate) fn observable_bounding_client_rects(pub(crate) fn read_box_model(runtime: &JsContextHost,source: DomHandle,- reason: impl Into<GeometryRead>,) -> Result<Option<LayoutBoxModel>, LayoutError> {- match query_source(runtime, source, reason, LayoutQuery::BoxModel { source })? {+ match query_source(runtime, source, LayoutQuery::BoxModel { source })? {Some(LayoutQueryAnswer::BoxModel(model)) => Ok(model),None => Ok(None),_ => Err(provider_contract_error("box model")),@@ -215,10 +183,9 @@ pub(crate) fn observable_scroll_adjusted_client_rect(source: DomHandle,scroll_x: f64,scroll_y: f64,- reason: LayoutFlushReason,) -> Result<ClientRect, LayoutError> {if runtime.layout_policy().uses_real_layout() {- read_bounding_client_rect(runtime, source, reason)+ read_bounding_client_rect(runtime, source)} else {Ok(compute_mock_scroll_adjusted_client_rect(runtime, source, scroll_x, scroll_y,@@ -230,14 +197,8 @@ pub(crate) fn observable_event_offset(runtime: &JsContextHost,source: DomHandle,point: LayoutPoint,- reason: LayoutFlushReason,) -> Result<LayoutPoint, LayoutError> {- match query_source(- runtime,- source,- reason,- LayoutQuery::EventOffset { source, point },- )? {+ match query_source(runtime, source, LayoutQuery::EventOffset { source, point })? {Some(LayoutQueryAnswer::EventOffset(offset)) => Ok(offset.unwrap_or(point)),None => Ok(point),_ => Err(provider_contract_error("event offset")),@@ -247,14 +208,8 @@ pub(crate) fn observable_event_offset(pub(crate) fn read_element_metrics(runtime: &JsContextHost,source: DomHandle,- reason: impl Into<GeometryRead>,) -> Result<Option<LayoutElementMetrics<DomHandle>>, LayoutError> {- match query_source(- runtime,- source,- reason,- LayoutQuery::ElementMetrics { source },- )? {+ match query_source(runtime, source, LayoutQuery::ElementMetrics { source })? {Some(LayoutQueryAnswer::ElementMetrics(metrics)) => Ok(metrics),None => Ok(None),_ => Err(provider_contract_error("element metrics")),@@ -264,14 +219,8 @@ pub(crate) fn read_element_metrics(pub(crate) fn observable_used_grid_tracks(runtime: &JsContextHost,source: DomHandle,- reason: LayoutFlushReason,) -> Result<Option<LayoutResolvedGridTracks>, LayoutError> {- match query_source(- runtime,- source,- reason,- LayoutQuery::UsedGridTracks { source },- )? {+ match query_source(runtime, source, LayoutQuery::UsedGridTracks { source })? {Some(LayoutQueryAnswer::UsedGridTracks(tracks)) => Ok(tracks),None => Ok(None),_ => Err(provider_contract_error("used Grid tracks")),@@ -281,12 +230,10 @@ pub(crate) fn observable_used_grid_tracks(pub(crate) fn read_scroll_into_view_geometry(runtime: &JsContextHost,source: DomHandle,- reason: impl Into<GeometryRead>,) -> Result<Option<LayoutScrollIntoViewGeometry<DomHandle>>, LayoutError> {match query_source(runtime,source,- reason,LayoutQuery::ScrollIntoViewGeometry { source },)? {Some(LayoutQueryAnswer::ScrollIntoViewGeometry(geometry)) => Ok(geometry),@@ -299,12 +246,10 @@ pub(crate) fn observable_caret_position(runtime: &JsContextHost,document: DomHandle,point: LayoutPoint,- reason: LayoutFlushReason,) -> Result<Option<LayoutCaretPosition<DomHandle>>, LayoutError> {let answers = observable_geometry_batch(runtime,document,- reason,&LayoutQueryBatch::new(vec![LayoutQuery::DocumentMetrics,LayoutQuery::CaretPosition { point },@@ -331,12 +276,10 @@ pub(crate) fn observable_hit_test_all(document: DomHandle,point: LayoutPoint,ignore_pointer_events_none: bool,- reason: LayoutFlushReason,) -> Result<(LayoutDocumentMetrics, Vec<LayoutHit<DomHandle>>), LayoutError> {let answers = observable_geometry_batch(runtime,document,- reason,&LayoutQueryBatch::new(vec![LayoutQuery::DocumentMetrics,LayoutQuery::HitTestAll {diff --git a/moli-renderer-v8/src/native_bridge/element/geometry/rects.rs b/moli-renderer-v8/src/native_bridge/element/geometry/rects.rsindex c4b3fca21..f7b82634f 100644--- a/moli-renderer-v8/src/native_bridge/element/geometry/rects.rs+++ b/moli-renderer-v8/src/native_bridge/element/geometry/rects.rs@@ -57,11 +57,7 @@ pub(in crate::native_bridge) fn node_get_bounding_client_rect_callback() {return;};- let rect = match read_bounding_client_rect(- unsafe { &*runtime_ptr },- handle,- moli_layout::LayoutFlushReason::SynchronousGeometry,- ) {+ let rect = match read_bounding_client_rect(unsafe { &*runtime_ptr }, handle) {Ok(rect) => rect,Err(error) => {throw_layout_error(scope, error);@@ -89,11 +85,7 @@ pub(in crate::native_bridge) fn node_get_client_rects_callback(if !require_element_method_receiver(scope, unsafe { &*runtime_ptr }, handle, "getClientRects") {return;};- let rects = match read_client_rects(- unsafe { &*runtime_ptr },- handle,- moli_layout::LayoutFlushReason::SynchronousGeometry,- ) {+ let rects = match read_client_rects(unsafe { &*runtime_ptr }, handle) {Ok(rects) => rects,Err(error) => {throw_layout_error(scope, error);diff --git a/moli-renderer-v8/src/native_bridge/element/geometry/scroll.rs b/moli-renderer-v8/src/native_bridge/element/geometry/scroll.rsindex 72f77d17e..786fd54a6 100644--- a/moli-renderer-v8/src/native_bridge/element/geometry/scroll.rs+++ b/moli-renderer-v8/src/native_bridge/element/geometry/scroll.rs@@ -1,7 +1,7 @@use crate::{document_runtime::DomHandle, dom::native::Node, native_bridge::JsContextHost};use super::super::{queue_revealed_lazy_image_loads, queue_revealed_lazy_media_loads};-use super::provider::{GeometryRead, read_element_metrics, read_scroll_into_view_geometry};+use super::provider::{read_element_metrics, read_scroll_into_view_geometry};pub(super) fn node_scroll_position(runtime: &JsContextHost, handle: DomHandle) -> (f64, f64) {runtime@@ -159,11 +159,7 @@ 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,- moli_layout::LayoutFlushReason::ObserverDelivery.into(),- );+ crate::observer_runtime::queue_intersection_checks(scope, runtime_ptr);if effects.iter().any(|effects| effects.queue_document_events())@@ -208,16 +204,14 @@ pub(crate) fn perform_wheel_scroll_default_action(let Some(target) = resolve_scroll_target(runtime, handle) else {return Ok(false);};- let Some(mut geometry) =- read_scroll_into_view_geometry(runtime, target, GeometryRead::Snapshot)?- else {+ let Some(mut geometry) = read_scroll_into_view_geometry(runtime, target)? else {return Ok(false);};// ScrollIntoView geometry begins at the target's parent. Include the// target itself so an empty overflow scroller still responds when its own// background is the hit-test result.- if let Some(metrics) = read_element_metrics(runtime, target, GeometryRead::Snapshot)?+ if let Some(metrics) = read_element_metrics(runtime, target)?&& metrics.is_scroll_container&& geometry.scroll_containersdiff --git a/moli-renderer-v8/src/native_bridge/element/geometry/scroll_into_view.rs b/moli-renderer-v8/src/native_bridge/element/geometry/scroll_into_view.rsindex 528075ece..478f566db 100644--- a/moli-renderer-v8/src/native_bridge/element/geometry/scroll_into_view.rs+++ b/moli-renderer-v8/src/native_bridge/element/geometry/scroll_into_view.rs@@ -2,7 +2,7 @@ use moli_page_types::DomScrollIntoViewRect;use crate::{document_runtime::DomHandle, native_bridge::JsContextHost};-use super::provider::{GeometryRead, read_box_model, read_scroll_into_view_geometry};+use super::provider::{read_box_model, read_scroll_into_view_geometry};use super::scroll::{apply_observable_window_scroll, resolve_scroll_target, set_node_scroll_position,};@@ -19,7 +19,6 @@ pub(super) enum ScrollIntoViewAlignment {#[derive(Clone, Copy)]struct ScrollIntoViewParams {- geometry_read: GeometryRead,horizontal: ScrollIntoViewAlignment,vertical: ScrollIntoViewAlignment,center_if_fully_hidden: bool,@@ -73,7 +72,6 @@ pub(crate) fn scroll_node_into_view_if_needed(runtime_ptr: *mut JsContextHost,handle: DomHandle,relative_rect: Option<DomScrollIntoViewRect>,- geometry_read: GeometryRead,) -> Result<Option<bool>, moli_layout::LayoutError> {scroll_node_into_view_with_params(scope,@@ -81,7 +79,6 @@ pub(crate) fn scroll_node_into_view_if_needed(handle,relative_rect,ScrollIntoViewParams {- geometry_read,horizontal: ScrollIntoViewAlignment::Nearest,vertical: ScrollIntoViewAlignment::Nearest,center_if_fully_hidden: true,@@ -103,7 +100,6 @@ pub(super) fn scroll_node_into_view(handle,relative_rect,ScrollIntoViewParams {- geometry_read: moli_layout::LayoutFlushReason::SynchronousGeometry.into(),horizontal,vertical,center_if_fully_hidden: false,@@ -122,8 +118,7 @@ fn scroll_node_into_view_with_params(let Some(target) = resolve_scroll_target(runtime, handle) else {return Ok(None);};- let Some(mut geometry) = read_scroll_into_view_geometry(runtime, target, params.geometry_read)?- else {+ let Some(mut geometry) = read_scroll_into_view_geometry(runtime, target)? else {return Ok(None);};if let Some(relative) = relative_rect {@@ -157,7 +152,6 @@ pub(crate) fn scroll_node_into_view_at_center(handle,None,ScrollIntoViewParams {- geometry_read: moli_layout::LayoutFlushReason::SynchronousGeometry.into(),horizontal: ScrollIntoViewAlignment::Center,vertical: ScrollIntoViewAlignment::Center,center_if_fully_hidden: false,@@ -176,7 +170,6 @@ pub(crate) fn scroll_node_into_view_at_start(handle,None,ScrollIntoViewParams {- geometry_read: GeometryRead::for_default_action(unsafe { &*runtime_ptr }),horizontal: ScrollIntoViewAlignment::Nearest,vertical: ScrollIntoViewAlignment::Start,center_if_fully_hidden: false,@@ -302,9 +295,7 @@ fn perform_bubbling_scroll_into_view(let Some(frame) = runtime.child_browsing_context_host_for_document_handle(document) else {return Ok(changed);};- let Some(frame_content) =- read_box_model(runtime, frame, params.geometry_read)?.map(|model| model.content)- else {+ let Some(frame_content) = read_box_model(runtime, frame)?.map(|model| model.content) else {return Ok(changed);};let Some(parent_target_rects) = convert_quads_to_parent_frame(@@ -314,9 +305,7 @@ fn perform_bubbling_scroll_into_view() else {return Ok(changed);};- let Some(mut parent_geometry) =- read_scroll_into_view_geometry(runtime, frame, params.geometry_read)?- else {+ let Some(mut parent_geometry) = read_scroll_into_view_geometry(runtime, frame)? else {return Ok(changed);};parent_geometry.target_rects = parent_target_rects;diff --git a/moli-renderer-v8/src/native_bridge/element/images/geometry.rs b/moli-renderer-v8/src/native_bridge/element/images/geometry.rsindex 9598d68cf..17e7b34e6 100644--- a/moli-renderer-v8/src/native_bridge/element/images/geometry.rs+++ b/moli-renderer-v8/src/native_bridge/element/images/geometry.rs@@ -34,13 +34,9 @@ fn image_root_coordinate<'s>(};let runtime = unsafe { &*runtime_ptr };- let origin = read_element_metrics(- runtime,- handle,- moli_layout::LayoutFlushReason::SynchronousGeometry,- )?- .map(|metrics| metrics.border_origin_in_viewport_ignoring_css_transforms)- .unwrap_or(moli_layout::LayoutPoint::ZERO);+ let origin = read_element_metrics(runtime, handle)?+ .map(|metrics| metrics.border_origin_in_viewport_ignoring_css_transforms)+ .unwrap_or(moli_layout::LayoutPoint::ZERO);// Blink returns LayoutUnit::ToInt(), whose integer division truncates// toward zero. Rust's float-to-integer cast has the same truncation and// saturates at the WebIDL `long` bounds.diff --git a/moli-renderer-v8/src/native_bridge/element/media/attributes.rs b/moli-renderer-v8/src/native_bridge/element/media/attributes.rsindex b71c4f0a9..4ac0f28a9 100644--- a/moli-renderer-v8/src/native_bridge/element/media/attributes.rs+++ b/moli-renderer-v8/src/native_bridge/element/media/attributes.rs@@ -424,11 +424,7 @@ fn media_is_inside_initial_viewport(runtime: &JsContextHost,handle: crate::document_runtime::DomHandle,) -> bool {- let Ok(rect) = read_bounding_client_rect(- runtime,- handle,- moli_layout::LayoutFlushReason::SynchronousGeometry,- ) else {+ let Ok(rect) = read_bounding_client_rect(runtime, handle) else {return false;};if rect.width <= 0.0 || rect.height <= 0.0 {diff --git a/moli-renderer-v8/src/native_bridge/element/styles/declaration/observation/sizing_tests/sampling.rs b/moli-renderer-v8/src/native_bridge/element/styles/declaration/observation/sizing_tests/sampling.rsindex 6c7e25949..31d709367 100644--- a/moli-renderer-v8/src/native_bridge/element/styles/declaration/observation/sizing_tests/sampling.rs+++ b/moli-renderer-v8/src/native_bridge/element/styles/declaration/observation/sizing_tests/sampling.rs@@ -1,11 +1,8 @@-//! A Grid used-track query can create the first geometry sample. Size reads-//! themselves cannot: their first result, including absence, belongs to one-//! observation. A later observation may therefore return different sizes-//! without any intervening DOM/style mutation.--use std::collections::BTreeMap;+//! Grid, size, and inspector reads consume one published layout. None can+//! create the first sample, including when Grid is read first in a batch.use super::*;+use std::collections::BTreeMap;const GRID: &str = r#"<div id=target class=sized style="display:grid;grid-template-columns:30px 1fr;grid-template-rows:20px 1fr"></div>"#;@@ -17,139 +14,119 @@ fn inspector_properties(host: &JsContextHost, target: DomHandle) -> BTreeMap<Str}#[test]-fn computed_size_cold_inspector_enumeration_transitions_to_a_stable_sample() {+fn computed_size_inspector_enumeration_waits_for_explicit_publication() {for real in [false, true] {let mut vm = fixture(GRID);if !real {vm.set_layout_policy(moli_page_types::LayoutPolicy::Mock);}let host = vm.context_host_weak_for_test().upgrade().unwrap();- let host = host.borrow();- let target = host.dom_host().element_handle_by_id("target").unwrap();- let before = host.layout_snapshot_cache_observability_for_test();- assert!(before.cached.is_none());- let passes = host.layout_pass_observability_for_test().1;- take_query_counts();- let initial = inspector_properties(&host, target);+ let target = host+ .borrow()+ .dom_host()+ .element_handle_by_id("target")+ .unwrap();+ let passes = vm.layout_pass_observability_for_test().1;+ let initial = inspector_properties(&host.borrow(), target);assert!(initial.len() > 200);- let size_names = ["width", "height", "inline-size", "block-size"];- for (name, expected) in size_names- .into_iter()- .zip(["500px", "400px", "500px", "400px"])- {- assert_eq!(initial[name], expected, "cold {name}, real={real}");+ for _ in 0..3 {+ assert_eq!(inspector_properties(&host.borrow(), target), initial);+ assert_eq!(vm.layout_pass_observability_for_test().1, passes);+ assert!(+ vm.layout_snapshot_cache_observability_for_test()+ .3+ .is_none()+ );}- assert_eq!(take_query_counts(), SizeQueryCounts::default());- let sampled = host.layout_snapshot_cache_observability_for_test();- assert_eq!(sampled.publishes, before.publishes + u64::from(real));- assert_eq!(sampled.cached.is_some(), real);- assert_eq!(- host.layout_pass_observability_for_test().1,- passes + u64::from(real)- );- if !real {- assert_eq!(sampled, before);+ if real {+ vm.publish_layout_for_test().unwrap();}-- let mut previous = None;+ let size_names = ["width", "height", "inline-size", "block-size"];for _ in 0..3 {- let values = inspector_properties(&host, target);- let expected = if real {+ take_query_counts();+ let values = inspector_properties(&host.borrow(), target);+ for (name, expected) in size_names.into_iter().zip(if real {["120px", "80px", "120px", "80px"]} else {["500px", "400px", "500px", "400px"]- };- for (name, expected) in size_names.into_iter().zip(expected) {- assert_eq!(values[name], expected, "sampled {name}, real={real}");+ }) {+ assert_eq!(values[name], expected, "{name}, real={real}");+ assert_eq!(+ initial[name],+ if name == "width" || name == "inline-size" {+ "500px"+ } else {+ "400px"+ }+ );}assert_eq!(values.keys().collect::<Vec<_>>(),initial.keys().collect::<Vec<_>>());for (name, value) in &initial {- if !size_names.contains(&name.as_str()) {- assert_eq!(&values[name], value, "non-size property {name}");+ if !size_names.contains(&name.as_str()) && !name.starts_with("grid-template-") {+ assert_eq!(&values[name], value, "non-geometric property {name}");}}- if let Some(previous) = previous {- assert_eq!(values, previous, "same-sample declarations stay identical");- }- previous = Some(values);assert_eq!(- take_query_counts(),- SizeQueryCounts {- source_queries: usize::from(real),- ..Default::default()- }+ values["grid-template-columns"],+ if real { "30px 90px" } else { "30px 1fr" });+ assert_eq!(take_query_counts().source_queries, usize::from(real));assert_eq!(- host.layout_pass_observability_for_test().1,+ vm.layout_pass_observability_for_test().1,passes + u64::from(real));- let after = host.layout_snapshot_cache_observability_for_test();- assert_eq!(after.publishes, sampled.publishes);- assert_eq!(after.cached, sampled.cached);}}}#[test]-fn computed_size_observation_pins_first_sample_availability_not_the_held_js_wrapper() {+fn computed_size_observation_stays_cold_regardless_of_grid_read_order() {for grid_first in [false, true] {- let vm = fixture(GRID);+ let mut vm = fixture(GRID);let host = vm.context_host_weak_for_test().upgrade().unwrap();- let host = host.borrow();- let target = host.dom_host().element_handle_by_id("target").unwrap();- let passes = host.layout_pass_observability_for_test().1;- let before = host.layout_snapshot_cache_observability_for_test();- assert!(before.cached.is_none());+ let target = host+ .borrow()+ .dom_host()+ .element_handle_by_id("target")+ .unwrap();+ let passes = vm.layout_pass_observability_for_test().1;{+ let host = host.borrow();let read = ComputedStyleRead::new(&host, target);+ take_query_counts();if !grid_first {assert_eq!(sizes(&read), ["500px", "400px", "500px", "400px"]);- assert_eq!(host.layout_snapshot_cache_observability_for_test(), before);}- assert_eq!(read.property("grid-template-columns"), "30px 90px");- let sampled = host.layout_snapshot_cache_observability_for_test();- assert_eq!(sampled.publishes, before.publishes + 1);- take_query_counts();+ assert_eq!(read.property("grid-template-columns"), "30px 1fr");for _ in 0..20 {- assert_eq!(- sizes(&read),- if grid_first {- ["120px", "80px", "120px", "80px"]- } else {- ["500px", "400px", "500px", "400px"]- }- );+ assert_eq!(sizes(&read), ["500px", "400px", "500px", "400px"]);}- assert_eq!(- take_query_counts(),- SizeQueryCounts {- source_queries: usize::from(grid_first),- ..Default::default()- }- );- assert_eq!(host.layout_snapshot_cache_observability_for_test(), sampled);+ assert_eq!(take_query_counts(), SizeQueryCounts::default());+ }+ assert_eq!(vm.layout_pass_observability_for_test().1, passes);+ vm.publish_layout_for_test().unwrap();+ let host = host.borrow();+ take_query_counts();+ let read = ComputedStyleRead::new(&host, target);+ for _ in 0..20 {+ assert_eq!(sizes(&read), ["120px", "80px", "120px", "80px"]);}- assert_eq!(- sizes(&ComputedStyleRead::new(&host, target)),- ["120px", "80px", "120px", "80px"]- );+ assert_eq!(read.property("grid-template-columns"), "30px 90px");assert_eq!(take_query_counts().source_queries, 1);assert_eq!(host.layout_pass_observability_for_test().1, passes + 1);}}#[test]-fn computed_size_document_batch_pins_one_sample_even_if_grid_is_read_mid_batch() {+fn computed_size_document_batch_never_publishes_layout_regardless_of_grid_order() {for grid_first in [false, true] {- let vm = fixture(&format!("{GRID}<div id=other class=sized></div>"));+ let mut vm = fixture(&format!("{GRID}<div id=other class=sized></div>"));let host = vm.context_host_weak_for_test().upgrade().unwrap();- let handles = {- let host = host.borrow();- ["target", "other"].map(|id| host.dom_host().element_handle_by_id(id).unwrap())- };+ let handles = ["target", "other"]+ .map(|id| host.borrow().dom_host().element_handle_by_id(id).unwrap());let properties = if grid_first {["grid-template-columns",@@ -169,38 +146,36 @@ fn computed_size_document_batch_pins_one_sample_even_if_grid_is_read_mid_batch()}.map(String::from);let passes = vm.layout_pass_observability_for_test().1;- assert!(- vm.layout_snapshot_cache_observability_for_test()- .3- .is_none()- );- take_query_counts();- let rows = vm.computed_style_property_values_for_document_snapshot(handles, &properties);- assert_eq!(rows.len(), 2);- for (row, tracks) in rows.iter().zip(["30px 90px", "none"]) {- let expected = if grid_first {- [tracks, "120px", "80px", "120px", "80px"]- } else {- ["500px", tracks, "400px", "500px", "400px"]- };- assert_eq!(row, &expected, "grid_first={grid_first}");- }- assert_eq!(take_query_counts().index_builds, usize::from(grid_first));- let sampled = vm.layout_snapshot_cache_observability_for_test();- assert!(sampled.3.is_some());- let rows = vm.computed_style_property_values_for_document_snapshot(- handles,- &["width", "height", "inline-size", "block-size"].map(String::from),- );- for row in rows {- assert_eq!(row, ["120px", "80px", "120px", "80px"]);+ for published in [false, true] {+ if published {+ vm.publish_layout_for_test().unwrap();+ }+ take_query_counts();+ let rows =+ vm.computed_style_property_values_for_document_snapshot(handles, &properties);+ assert_eq!(rows.len(), 2);+ let tracks = if published { "30px 90px" } else { "30px 1fr" };+ for (row, tracks) in rows.iter().zip([tracks, "none"]) {+ let (width, height) = if published {+ ("120px", "80px")+ } else {+ ("500px", "400px")+ };+ let expected = if grid_first {+ [tracks, width, height, width, height]+ } else {+ [width, tracks, height, width, height]+ };+ assert_eq!(+ row, &expected,+ "grid_first={grid_first}, published={published}"+ );+ }+ assert_eq!(take_query_counts().index_builds, usize::from(published));+ assert_eq!(+ vm.layout_pass_observability_for_test().1,+ passes + u64::from(published)+ );}- assert_eq!(- take_query_counts().index_builds,- 1,- "a new batch derives its own table"- );- assert_eq!(vm.layout_snapshot_cache_observability_for_test(), sampled);- assert_eq!(vm.layout_pass_observability_for_test().1, passes + 1);}}diff --git a/moli-renderer-v8/src/native_bridge/element/styles/declaration/values.rs b/moli-renderer-v8/src/native_bridge/element/styles/declaration/values.rsindex 47939953e..beb391bf1 100644--- a/moli-renderer-v8/src/native_bridge/element/styles/declaration/values.rs+++ b/moli-renderer-v8/src/native_bridge/element/styles/declaration/values.rs@@ -5228,12 +5228,7 @@ fn resolved_grid_template_tracks(if !runtime.layout_policy().uses_real_layout() {return None;}- let grid = observable_used_grid_tracks(- runtime,- handle,- moli_layout::LayoutFlushReason::SynchronousGeometry,- )- .ok()??;+ let grid = observable_used_grid_tracks(runtime, handle).ok()??;let tracks = match property {"grid-template-columns" => &grid.columns,"grid-template-rows" => &grid.rows,@@ -6188,12 +6183,7 @@ fn runtime_static_position_offset(.dom_host().node(containing_block).and_then(Node::parent_node)?;- let rects = observable_bounding_client_rects(- runtime,- &[parent, containing_block],- moli_layout::LayoutFlushReason::SynchronousGeometry,- )- .ok()?;+ let rects = observable_bounding_client_rects(runtime, &[parent, containing_block]).ok()?;let [parent_rect, containing_rect] = rects.as_slice() else {return None;};@@ -6206,12 +6196,7 @@ fn runtime_static_position_offset(}fn computed_style_geometry_rect(runtime: &JsContextHost, handle: DomHandle) -> Option<ClientRect> {- read_bounding_client_rect(- runtime,- handle,- moli_layout::LayoutFlushReason::SynchronousGeometry,- )- .ok()+ read_bounding_client_rect(runtime, handle).ok()}fn inset_uses_start_static_position(diff --git a/moli-renderer-v8/src/observer_runtime/dom_access.rs b/moli-renderer-v8/src/observer_runtime/dom_access.rsindex eccf56f4a..fa40e7eec 100644--- a/moli-renderer-v8/src/observer_runtime/dom_access.rs+++ b/moli-renderer-v8/src/observer_runtime/dom_access.rs@@ -1,6 +1,5 @@use std::ptr::NonNull;-use crate::native_bridge::element::GeometryRead;use crate::{dom::native::{DomHost, DomMutationEffects, NativeNodeId},native_bridge::{JsContextHost, RuntimeObservableContextToken, WindowExecutionContextOwner},@@ -474,14 +473,13 @@ 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, read)+ intersection::compute_intersection_check_batch(runtime, runtime.dom_host(), batch)}) else {return;};@@ -501,14 +499,9 @@ fn queue_intersection_checks_with_dom(else {return;};- let Ok(completed) = access.read(|runtime| {- intersection::compute_intersection_check_batch(- runtime,- dom_host,- batch,- GeometryRead::Demand(moli_layout::LayoutFlushReason::ObserverDelivery),- )- }) else {+ let Ok(completed) = access+ .read(|runtime| intersection::compute_intersection_check_batch(runtime, dom_host, batch))+ else {return;};let queued_any = access.store(|store| store.apply_intersection_check_batch(completed));@@ -523,11 +516,7 @@ 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,- GeometryRead::Demand(moli_layout::LayoutFlushReason::ObserverDelivery),- );+ queue_intersection_checks(scope, host_ptr);}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.rsindex 6647a3abf..c8cb45c72 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, element::GeometryRead},+ native_bridge::JsContextHost,};use super::{@@ -92,7 +92,6 @@ 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(@@ -138,25 +137,15 @@ pub(super) fn compute_intersection_check_batch(}).collect();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(),- };+ let answers: Vec<_> = 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(diff --git a/moli-renderer-v8/src/runtime/page_dom.rs b/moli-renderer-v8/src/runtime/page_dom.rsindex 6afb87aa2..2300ea04d 100644--- a/moli-renderer-v8/src/runtime/page_dom.rs+++ b/moli-renderer-v8/src/runtime/page_dom.rs@@ -3325,7 +3325,6 @@ impl PageVm {.vm_mut().observable_geometry_batch_for_document(document,- moli_layout::LayoutFlushReason::CdpGeometry,&moli_layout::LayoutQueryBatch::new(vec![moli_layout::LayoutQuery::BoxModel { source: handle },moli_layout::LayoutQuery::ContentQuads { source: handle },@@ -3541,7 +3540,6 @@ impl PageVm {.vm_mut().observable_geometry_batch_for_document(document,- moli_layout::LayoutFlushReason::CdpGeometry,&moli_layout::LayoutQueryBatch::new(vec![moli_layout::LayoutQuery::ClientRects {source: handle,}]),diff --git a/moli-renderer-v8/src/runtime/page_geometry.rs b/moli-renderer-v8/src/runtime/page_geometry.rsindex 5b6adfb9d..593ed446f 100644--- a/moli-renderer-v8/src/runtime/page_geometry.rs+++ b/moli-renderer-v8/src/runtime/page_geometry.rs@@ -1,5 +1,5 @@-use anyhow::{Context, Result, anyhow};-use moli_layout::{LayoutFlushReason, LayoutQuery, LayoutQueryAnswer, LayoutQueryBatch};+use anyhow::{Result, anyhow};+use moli_layout::{LayoutQuery, LayoutQueryAnswer, LayoutQueryBatch};use super::{PageVm, RendererLayoutMetrics};@@ -7,11 +7,9 @@ impl PageVm {pub(crate) fn layout_metrics(&mut self) -> Result<RendererLayoutMetrics> {let answers = self.vm_mut()- .observable_geometry_batch_for_current_document(- LayoutFlushReason::CdpGeometry,- &LayoutQueryBatch::new(vec![LayoutQuery::DocumentMetrics]),- )- .context("failed to produce document layout metrics")?;+ .observable_geometry_batch_for_current_document(&LayoutQueryBatch::new(vec![+ LayoutQuery::DocumentMetrics,+ ]))?;let Some(LayoutQueryAnswer::DocumentMetrics(metrics)) = answers.answers.into_iter().next()else {return Err(anyhow!(diff --git a/moli-renderer-v8/src/runtime/page_screenshot.rs b/moli-renderer-v8/src/runtime/page_screenshot.rsindex 0c2cb656c..c483ca911 100644--- a/moli-renderer-v8/src/runtime/page_screenshot.rs+++ b/moli-renderer-v8/src/runtime/page_screenshot.rs@@ -217,7 +217,10 @@ impl PageVm {request.quality,request.optimize_for_speed,paint_capture,- moli_layout::LayoutFlushReason::Screenshot,+ match request.purpose {+ RendererScreenshotPurpose::Screenshot => moli_layout::LayoutFlushReason::Screenshot,+ RendererScreenshotPurpose::Print { .. } => moli_layout::LayoutFlushReason::Print,+ },);if let Some(previous) = restore_media {self.set_emulated_media(&previous);diff --git a/moli-renderer-v8/src/runtime/page_vm/tests/computed_size.rs b/moli-renderer-v8/src/runtime/page_vm/tests/computed_size.rsindex fc7f8ebb1..88fe49b57 100644--- a/moli-renderer-v8/src/runtime/page_vm/tests/computed_size.rs+++ b/moli-renderer-v8/src/runtime/page_vm/tests/computed_size.rs@@ -34,8 +34,8 @@ fn read_sizes(page_vm: &mut PageVm, ids: &[&str]) -> anyhow::Result<serde_json::)}-// Assert the cost contract as well as the returned values. A cache hit is-// insufficient: CSSOM must not call the geometry provider at all, even cold.+// Assert that CSSOM reads may inspect published geometry but never publish+// a new layout, including a cold Grid track query.fn read_without_layout(page_vm: &mut PageVm,expression: &str,@@ -50,10 +50,11 @@ fn read_without_layout(passes,"CSSOM read must not execute layout: {expression}");+ let after = page_vm.vm().layout_snapshot_cache_observability_for_test();assert_eq!(- page_vm.vm().layout_snapshot_cache_observability_for_test(),- cache,- "CSSOM read must not request, publish, or retire layout: {expression}"+ (after.2, after.3),+ (cache.2, cache.3),+ "CSSOM read must not publish or retire layout: {expression}");Ok(serde_json::from_str(&values)?)}diff --git a/moli-renderer-v8/src/runtime/page_vm/tests/computed_size/sampling.rs b/moli-renderer-v8/src/runtime/page_vm/tests/computed_size/sampling.rsindex 869d4b013..8e80743fd 100644--- a/moli-renderer-v8/src/runtime/page_vm/tests/computed_size/sampling.rs+++ b/moli-renderer-v8/src/runtime/page_vm/tests/computed_size/sampling.rs@@ -1,4 +1,4 @@-//! Grid queries are geometry demands; the four size getters are snapshot-only.+//! Grid and size queries only read published layout; explicit output publishes it.//! Unlike an internal synchronous property batch, a held JavaScript CSSOM//! wrapper starts a new read for each getter and must see newly sampled boxes.@@ -14,61 +14,66 @@ fn held_sizes(page: &mut PageVm) -> anyhow::Result<serde_json::Value> {}#[tokio::test(flavor = "current_thread")]-async fn computed_size_held_getters_observe_grid_sampling_without_dom_mutation() {+async fn computed_size_held_getters_wait_for_explicit_publication() {run_page_vm_async_test(async move {for real in [false, true] {- for (property, raw, used) in [- ("gridTemplateColumns", "1fr 3fr", "40px 120px"),- ("gridTemplateRows", "40px", "40px"),- ] {- let mut page = page_with_size_fixture(GRID)?;- if !real {- page.vm_mut()- .set_layout_policy(moli_page_types::LayoutPolicy::Mock);- }- let before = page.vm().layout_snapshot_cache_observability_for_test();- let passes = page.vm().layout_pass_observability_for_test().1;- assert!(before.3.is_none());- let result = page.vm_mut().eval(&format!(- r#"JSON.stringify((() => {{- const held = getComputedStyle(document.getElementById('target'));- const sizes = () => [held.width,held.height,held.inlineSize,held.blockSize];- const before = sizes();- const tracks = held.{property};- return {{before, tracks, after:sizes(), repeated:sizes()}};- }})())"#- ))?;- let result: serde_json::Value = serde_json::from_str(&result)?;- let expected = if real {- json!(["160px", "40px", "160px", "40px"])- } else {+ let mut page = page_with_size_fixture(GRID)?;+ if !real {+ page.vm_mut()+ .set_layout_policy(moli_page_types::LayoutPolicy::Mock);+ }+ page.vm_mut().eval(+ "globalThis.held=getComputedStyle(document.getElementById('target'));'held'",+ )?;+ let passes = page.vm().layout_pass_observability_for_test().1;+ for _ in 0..3 {+ assert_eq!(+ read_without_layout(+ &mut page,+ "[held.gridTemplateColumns,held.gridTemplateRows]"+ )?,+ json!(["1fr 3fr", "40px"])+ );+ assert_eq!(+ held_sizes(&mut page)?,json!(["auto", "auto", "auto", "auto"])- };+ );+ }+ assert!(+ page.vm()+ .layout_snapshot_cache_observability_for_test()+ .3+ .is_none()+ );+ if real {+ publish_size_layout(&mut page)?;+ }+ for _ in 0..3 {+ assert_eq!(+ held_sizes(&mut page)?,+ if real {+ json!(["160px", "40px", "160px", "40px"])+ } else {+ json!(["auto", "auto", "auto", "auto"])+ }+ );assert_eq!(- result,- json!({- "before":["auto","auto","auto","auto"],- "tracks":if real { used } else { raw },- "after":expected, "repeated":expected,- }),- "{property}, real={real}"+ read_without_layout(+ &mut page,+ "[held.gridTemplateColumns,held.gridTemplateRows]"+ )?,+ json!([if real { "40px 120px" } else { "1fr 3fr" }, "40px"]));assert_eq!(page.vm().layout_pass_observability_for_test().1,passes + u64::from(real));- let after = page.vm().layout_snapshot_cache_observability_for_test();- assert_eq!(after.2, before.2 + u64::from(real));- assert_eq!(after.3.is_some(), real);- if !real {- assert_eq!(after, before);- }}}Ok::<_, anyhow::Error>(())}).await- .expect("held CSSOM objects must not retain a cold geometry miss across getters");+ .expect("held CSSOM objects observe the next explicit publication");}#[tokio::test(flavor = "current_thread")]@@ -88,6 +93,11 @@ async fn computed_size_grid_sampling_reuses_old_geometry_until_explicit_refresh(json!(["auto", "auto", "auto", "auto"]));let passes = page.vm().layout_pass_observability_for_test().1;+ assert_eq!(+ read_without_layout(&mut page, "held.gridTemplateColumns")?,+ json!("1fr 3fr")+ );+ publish_size_layout(&mut page)?;assert_eq!(page.vm_mut().eval("held.gridTemplateColumns")?,"40px 120px"@@ -136,7 +146,7 @@ async fn computed_size_grid_sampling_reuses_old_geometry_until_explicit_refresh(Ok::<_, anyhow::Error>(())}).await- .expect("Grid-created geometry follows the same snapshot lifecycle as explicit box reads");+ .expect("Grid geometry follows explicit visual publication");}#[tokio::test(flavor = "current_thread")]@@ -152,6 +162,7 @@ async fn computed_size_grid_sampling_does_not_warm_another_page() {}let second_cache = second.vm().layout_snapshot_cache_observability_for_test();let second_passes = second.vm().layout_pass_observability_for_test().1;+ publish_size_layout(&mut first)?;assert_eq!(first.vm_mut().eval("held.gridTemplateColumns")?,"40px 120px"@@ -173,6 +184,15 @@ async fn computed_size_grid_sampling_does_not_warm_another_page() {second_passes);assert_eq!(second.vm_mut().eval("held.gridTemplateRows")?, "40px");+ assert_eq!(+ second.vm().layout_pass_observability_for_test().1,+ second_passes+ );+ assert_eq!(+ held_sizes(&mut second)?,+ json!(["auto", "auto", "auto", "auto"])+ );+ publish_size_layout(&mut second)?;assert_eq!(held_sizes(&mut second)?,json!(["160px", "40px", "160px", "40px"])diff --git a/moli-renderer-v8/src/runtime/page_vm/tests/file_system_directory_reader.rs b/moli-renderer-v8/src/runtime/page_vm/tests/file_system_directory_reader.rsindex dd5ba269e..089c2edf9 100644--- a/moli-renderer-v8/src/runtime/page_vm/tests/file_system_directory_reader.rs+++ b/moli-renderer-v8/src/runtime/page_vm/tests/file_system_directory_reader.rs@@ -38,6 +38,7 @@ document.body.appendChild(dropTarget);"installed""#,)?;+ page_vm.vm_mut().publish_layout_for_test()?;let outcome = page_vm.dispatch_drag_event_at_point(10.0,10.0,diff --git a/moli-renderer-v8/src/runtime/page_vm/tests/lifecycle.rs b/moli-renderer-v8/src/runtime/page_vm/tests/lifecycle.rsindex d9624645c..c828ae33e 100644--- a/moli-renderer-v8/src/runtime/page_vm/tests/lifecycle.rs+++ b/moli-renderer-v8/src/runtime/page_vm/tests/lifecycle.rs@@ -63,7 +63,8 @@ async fn history_keeps_action_window_but_document_open_cancels_it() {local_executor.run(async move {let mut page_vm = page_vm;- page_vm.vm_mut().eval("const root=document.documentElement || document.appendChild(document.createElement('html')); root.getBoundingClientRect()")?;+ page_vm.vm_mut().eval("const root=document.documentElement || document.appendChild(document.createElement('html'));")?;+ page_vm.vm_mut().publish_layout_for_test()?;let initial_document = page_vm.document_lifecycle.identity();let outcome = page_vm.queue_wheel_event(10.0,diff --git a/moli-renderer-v8/src/runtime/page_vm/tests/mod.rs b/moli-renderer-v8/src/runtime/page_vm/tests/mod.rsindex 7fb68ce1d..49cd9fcaa 100644--- a/moli-renderer-v8/src/runtime/page_vm/tests/mod.rs+++ b/moli-renderer-v8/src/runtime/page_vm/tests/mod.rs@@ -10237,7 +10237,7 @@ async fn page_vm_input_event_commits_child_navigation_before_document_script_rea"#,)?;- page_vm.vm_mut().eval("document.elementFromPoint(0, 0)")?;+ page_vm.vm_mut().publish_layout_for_test()?;let mouse_down_handled = page_vm.vm_mut()diff --git a/moli-renderer-v8/src/runtime/page_vm/tests/rendering_update.rs b/moli-renderer-v8/src/runtime/page_vm/tests/rendering_update.rsindex b26979a9d..f0da31e15 100644--- a/moli-renderer-v8/src/runtime/page_vm/tests/rendering_update.rs+++ b/moli-renderer-v8/src/runtime/page_vm/tests/rendering_update.rs@@ -91,8 +91,6 @@ getComputedStyle(document.getElementById('fallback')).display]);let output = moli_layout::GeometryProvider::answer(page_vm.vm_mut(),- moli_layout::LayoutFlushReason::SynchronousGeometry,- viewport,&batch,)?;assert!(matches!(@@ -116,7 +114,7 @@ getComputedStyle(document.getElementById('fallback')).display}#[tokio::test(flavor = "current_thread")]-async fn geometry_batch_reuses_latest_tree_at_same_viewport_until_fresh_paint_replaces_it() {+async fn geometry_batch_requires_explicit_output_and_reuses_it_until_the_next_output() {run_page_vm_async_test(async move {let loader =crate::network::ResourceRequestClient::new(&FetchConfig::default()).expect("loader");@@ -170,10 +168,15 @@ document.body.innerHTML = '<div id="target"></div><div id="pass-through"></div><},]);let viewport = moli_layout::LayoutViewport::new(320, 200, 1.0);+ let error = moli_layout::GeometryProvider::answer(page_vm.vm_mut(), &batch).unwrap_err();+ assert_eq!(error, moli_layout::LayoutError::NoLayoutSnapshot);+ for command in ["Page.captureScreenshot", "Page.printToPDF", "Page.startScreencast"] {+ assert!(error.to_string().contains(command));+ }+ assert_eq!(page_vm.vm().layout_pass_observability_for_test().1, before.1);+ page_vm.vm_mut().screenshot_layout_snapshot(viewport)?.expect("initial screenshot layout");let first = moli_layout::GeometryProvider::answer(page_vm.vm_mut(),- moli_layout::LayoutFlushReason::SynchronousGeometry,- viewport,&batch,)?;let after_first = page_vm.vm().layout_pass_observability_for_test();@@ -182,15 +185,15 @@ document.body.innerHTML = '<div id="target"></div><div id="pass-through"></div><.layout_snapshot_cache_observability_for_test();assert!(!after_first.0);assert_eq!(after_first.1, before.1 + 1);- assert_eq!(cache_after_first.0, cache_before.0);+ assert_eq!(cache_after_first.0, cache_before.0 + 1);assert_eq!(cache_after_first.1, cache_before.1 + 1);assert_eq!(cache_after_first.2, cache_before.2 + 1);assert_eq!(first.answers.len(), batch.queries.len());assert_eq!(first.metrics.reason,- moli_layout::LayoutFlushReason::SynchronousGeometry+ moli_layout::LayoutFlushReason::Screenshot);- assert_eq!(first.metrics.paint_operation_count, 0);+ assert!(first.metrics.paint_operation_count > 0);let first_width = match &first.answers[1] {moli_layout::LayoutQueryAnswer::BoxModel(Some(model)) => {model.border.bounding_rect().width@@ -231,8 +234,6 @@ document.body.innerHTML = '<div id="target"></div><div id="pass-through"></div><.eval("document.getElementById('target').style.width='180px'; 'mutated'")?;let second = moli_layout::GeometryProvider::answer(page_vm.vm_mut(),- moli_layout::LayoutFlushReason::SynchronousGeometry,- viewport,&batch,)?;let after_second = page_vm.vm().layout_pass_observability_for_test();@@ -241,7 +242,7 @@ document.body.innerHTML = '<div id="target"></div><div id="pass-through"></div><.layout_snapshot_cache_observability_for_test();assert!(!after_second.0);assert_eq!(after_second.1, before.1 + 1);- assert_eq!(cache_after_second.0, cache_before.0 + 1);+ assert_eq!(cache_after_second.0, cache_before.0 + 2);assert_eq!(cache_after_second.1, cache_before.1 + 1);assert_eq!(cache_after_second.2, cache_before.2 + 1);let second_width = match &second.answers[1] {@@ -270,7 +271,7 @@ document.body.innerHTML = '<div id="target"></div><div id="pass-through"></div><.layout_snapshot_cache_observability_for_test();assert!(!after_screenshot.0);assert_eq!(after_screenshot.1, before.1 + 2);- assert_eq!(cache_after_screenshot.0, cache_before.0 + 1);+ assert_eq!(cache_after_screenshot.0, cache_before.0 + 2);assert_eq!(cache_after_screenshot.1, cache_before.1 + 1);assert_eq!(cache_after_screenshot.2, cache_before.2 + 2);let (_, retention) = cache_after_screenshot@@ -295,8 +296,6 @@ document.body.innerHTML = '<div id="target"></div><div id="pass-through"></div><let third = moli_layout::GeometryProvider::answer(page_vm.vm_mut(),- moli_layout::LayoutFlushReason::SynchronousGeometry,- viewport,&batch,)?;let after_third = page_vm.vm().layout_pass_observability_for_test();@@ -304,7 +303,7 @@ document.body.innerHTML = '<div id="target"></div><div id="pass-through"></div><.vm().layout_snapshot_cache_observability_for_test();assert_eq!(after_third.1, before.1 + 2);- assert_eq!(cache_after_third.0, cache_before.0 + 2);+ assert_eq!(cache_after_third.0, cache_before.0 + 3);assert_eq!(cache_after_third.1, cache_before.1 + 1);assert_eq!(cache_after_third.2, cache_before.2 + 2);let third_width = match &third.answers[1] {@@ -373,8 +372,6 @@ document.body.innerHTML = '<div id=target></div>';.eval("document.getElementById('target').style.width='80px'; 'mutated'")?;let stale = moli_layout::GeometryProvider::answer(page_vm.vm_mut(),- moli_layout::LayoutFlushReason::SynchronousGeometry,- moli_layout::LayoutViewport::new(320, 200, 1.0),&batch,)?;let stale_width = match &stale.answers[0] {@@ -410,8 +407,6 @@ document.body.innerHTML = '<div id=target></div>';let refreshed = moli_layout::GeometryProvider::answer(page_vm.vm_mut(),- moli_layout::LayoutFlushReason::SynchronousGeometry,- moli_layout::LayoutViewport::new(320, 200, 1.0),&batch,)?;let refreshed_width = match &refreshed.answers[0] {@@ -1040,6 +1035,7 @@ document.body.innerHTML = `<div id=centered></div><div id=definite-parent><div i"#,)?;page_vm.vm_mut().sync_live_document_style_sources();+ page_vm.vm_mut().publish_layout_for_test()?;let geometry = page_vm.vm_mut().eval(r#"JSON.stringify(Object.fromEntries(['centered','definite-parent','definite-child','indefinite-parent','indefinite-child'].map(id=>{const r=document.getElementById(id).getBoundingClientRect();return [id,[r.x,r.y,r.width,r.height]]})))"#,@@ -1156,6 +1152,7 @@ shadow.innerHTML=`<style>.root{contain:content;margin-left:40px;width:200px;heig"#,)?;page_vm.vm_mut().sync_live_document_style_sources();+ page_vm.vm_mut().publish_layout_for_test()?;let result = page_vm.vm_mut().eval(r#"JSON.stringify((()=>{const shadow=document.getElementById('shadow-host').shadowRoot;@@ -1478,6 +1475,7 @@ document.body.innerHTML = `<main id=stage><header id=header><div id=left></div><"#,)?;page_vm.vm_mut().sync_live_document_style_sources();+ page_vm.vm_mut().publish_layout_for_test()?;let geometry = page_vm.vm_mut().eval(r#"JSON.stringify(Object.fromEntries(['stage','header','left','right'].map(id=>{const r=document.getElementById(id).getBoundingClientRect();return [id,[r.x,r.y,r.width,r.height]]})))"#,@@ -1551,6 +1549,7 @@ document.body.innerHTML = `"#,)?;page_vm.vm_mut().sync_live_document_style_sources();+ page_vm.vm_mut().publish_layout_for_test()?;let geometry = page_vm.vm_mut().eval(r#"JSON.stringify(Object.fromEntries(['wide','wide-card','wide-primary','wide-secondary','narrow','narrow-card','narrow-primary','narrow-secondary','flex','flex-card','grid','grid-card','specified','specified-card','margined','margined-card','table','table-card','table-a','table-b'].map(id=>{const r=document.getElementById(id).getBoundingClientRect();return [id,[r.x,r.y,r.width,r.height]]})))"#,@@ -1619,6 +1618,7 @@ document.body.innerHTML = `<center id=host><span id=first></span><span id=second"#,)?;page_vm.vm_mut().sync_live_document_style_sources();+ page_vm.vm_mut().publish_layout_for_test()?;let geometry = page_vm.vm_mut().eval(r#"JSON.stringify(Object.fromEntries(['host','first','second'].map(id=>{const r=document.getElementById(id).getBoundingClientRect();return [id,[r.x,r.y,r.width,r.height]]})))"#,@@ -1708,6 +1708,7 @@ document.body.innerHTML = `<div id=stage>"#,)?;page_vm.vm_mut().sync_live_document_style_sources();+ page_vm.vm_mut().publish_layout_for_test()?;let geometry = page_vm.vm_mut().eval(r#"JSON.stringify(Object.fromEntries(['left-max-case','left-max','left-limit-case','left-limit','left-min-case','left-min','right-max-case','right-max','stretch-case','stretch','margin-min-case','margin-min','max-clamp-case','max-clamp','min-clamp-case','min-clamp','specified-case','specified','static-ltr-case','static-ltr','static-rtl-case','static-rtl','flex-case','flex-abs'].map(id=>{const r=document.getElementById(id).getBoundingClientRect();return [id,[r.x,r.y,r.width,r.height]]})))"#,@@ -1787,6 +1788,7 @@ document.body.innerHTML = `<div class=case id=pre><div class=float></div><p>abcd"#,)?;page_vm.vm_mut().sync_live_document_style_sources();+ page_vm.vm_mut().publish_layout_for_test()?;let geometry = page_vm.vm_mut().eval(r#"JSON.stringify(['pre','nowrap','wrap'].map(id=>{const c=document.getElementById(id), p=c.querySelector('p');@@ -1888,6 +1890,7 @@ document.body.innerHTML = `<div id=stage>"#,)?;page_vm.vm_mut().sync_live_document_style_sources();+ page_vm.vm_mut().publish_layout_for_test()?;let geometry = page_vm.vm_mut().eval(r#"JSON.stringify(Object.fromEntries(['baidu-case','baidu-logo','baidu-logo-image','baidu-main','max-case','max','limit-case','limit','min-case','min','right-case','right','margin-case','margin-float','max-clamp-case','max-clamp','min-clamp-case','min-clamp','specified-case','specified','edge-case','edge','block-control-case','block-control','replaced-control-case','replaced-control','stretch-control-case','stretch-control','inline-margin-case','inline-margin-float','negative-margin-case','negative-margin-float','inline-negative-margin-case','inline-negative-margin-float'].map(id=>{const r=document.getElementById(id).getBoundingClientRect();return [id,[r.x,r.y,r.width,r.height]]})))"#,@@ -2014,6 +2017,7 @@ document.body.innerHTML = `"#,)?;page_vm.vm_mut().sync_live_document_style_sources();+ page_vm.vm_mut().publish_layout_for_test()?;let supports = page_vm.vm_mut().eval(r#"(()=>{const values=['min-content','max-content','fit-content','fit-content(120px)','fit-content(50%)','stretch','-webkit-fill-available'];const result=Object.fromEntries(values.map(value=>[value,CSS.supports('width',value)]));result['grid-fit-content(120px)']=CSS.supports('grid-template-columns','fit-content(120px)');for(const [key,property,value] of [['min-width:fit-content','min-width','fit-content'],['max-width:fit-content','max-width','fit-content'],['min-width:stretch','min-width','stretch'],['max-width:stretch','max-width','stretch'],['min-width:-webkit-fill-available','min-width','-webkit-fill-available'],['max-width:-webkit-fill-available','max-width','-webkit-fill-available']])result[key]=CSS.supports(property,value);return JSON.stringify(result)})()"#,@@ -2169,6 +2173,7 @@ document.body.innerHTML = `<table id=precedence><colgroup><col><col></colgroup><"#,)?;page_vm.vm_mut().sync_live_document_style_sources();+ page_vm.vm_mut().publish_layout_for_test()?;let geometry = page_vm.vm_mut().eval(r#"JSON.stringify(Object.fromEntries(['precedence','p0','p1','rules','wide-left','wide-right','style-left','style-right','hidden-left','hidden-right','span','spanning','upper','lower','colspan','across','col-left','col-right'].map(id=>{const r=document.getElementById(id).getBoundingClientRect();return [id,[r.x,r.y,r.width,r.height]]})))"#,@@ -3870,6 +3875,7 @@ document.body.innerHTML = `<div id=bar><header id=header><div id=wrapper><span i.vm_mut().prime_document_lifecycle_processing_and_record_stylesheet_network_results();+ page_vm.vm_mut().publish_layout_for_test()?;let geometry = page_vm.vm_mut().eval(r#"JSON.stringify(Object.fromEntries(['bar','header','wrapper','atomic'].map(id=>{const r=document.getElementById(id).getBoundingClientRect();return [id,[r.x,r.y,r.width,r.height]]})))"#,)?;@@ -3922,6 +3928,7 @@ document.body.innerHTML = `<p id=line>All the <span id=atomic>words</span> after.vm_mut().prime_document_lifecycle_processing_and_record_stylesheet_network_results();+ page_vm.vm_mut().publish_layout_for_test()?;let geometry = page_vm.vm_mut().eval(r#"JSON.stringify((()=>{const line=document.getElementById('line');const atomic=document.getElementById('atomic');const rect=node=>{const range=document.createRange();range.selectNodeContents(node);const value=range.getBoundingClientRect();return [value.x,value.right]};const box=atomic.getBoundingClientRect();return {preceding:rect(line.firstChild),atomic:[box.x,box.right],text:rect(atomic)}})())"#,)?;@@ -3995,6 +4002,7 @@ document.body.innerHTML = `<div class=row><div class=item id=ask><i class=icon><.vm_mut().prime_document_lifecycle_processing_and_record_stylesheet_network_results();+ page_vm.vm_mut().publish_layout_for_test()?;let geometry = page_vm.vm_mut().eval(r#"JSON.stringify(Object.fromEntries(['ask','ask-text','constrained'].map(id=>{const r=document.getElementById(id).getBoundingClientRect();return [id,[r.width,r.height]]})))"#,)?;diff --git a/moli-renderer-v8/src/runtime/phase_one/mod.rs b/moli-renderer-v8/src/runtime/phase_one/mod.rsindex 58a88c5ff..25a3fe67f 100644--- a/moli-renderer-v8/src/runtime/phase_one/mod.rs+++ b/moli-renderer-v8/src/runtime/phase_one/mod.rs@@ -9983,7 +9983,6 @@ parserTarget.focus();runtime.block_on(tokio::task::LocalSet::new().run_until(async move {let mut page_vm = new_phase_one_page_vm_for_test();let body = create_connected_html_body_for_test(&mut page_vm);- page_vm.vm_mut().force_fresh_layout_reads_for_test();page_vm.evaluate_expression(@@ -10151,7 +10150,6 @@ window.parserPendingPointerCapture = installPendingPointerCaptureTarget('parser-runtime.block_on(tokio::task::LocalSet::new().run_until(async move {let mut page_vm = new_phase_one_page_vm_for_test();create_connected_html_body_for_test(&mut page_vm);- page_vm.vm_mut().force_fresh_layout_reads_for_test();page_vm.evaluate_expression(@@ -10341,7 +10339,6 @@ window.parserPendingPointerCaptureReparent =runtime.block_on(tokio::task::LocalSet::new().run_until(async move {let mut page_vm = new_phase_one_page_vm_for_test();let body = create_connected_html_body_for_test(&mut page_vm);- page_vm.vm_mut().force_fresh_layout_reads_for_test();page_vm.evaluate_expression(@@ -10410,7 +10407,6 @@ window.parserScrollAnchorTarget = parserTarget;runtime.block_on(tokio::task::LocalSet::new().run_until(async move {let mut page_vm = new_phase_one_page_vm_for_test();create_connected_html_body_for_test(&mut page_vm);- page_vm.vm_mut().force_fresh_layout_reads_for_test();page_vm.evaluate_expression(@@ -10500,7 +10496,6 @@ window.parserScrollAnchorReparentTarget = parserTarget;runtime.block_on(tokio::task::LocalSet::new().run_until(async move {let mut page_vm = new_phase_one_page_vm_for_test();create_connected_html_body_for_test(&mut page_vm);- page_vm.vm_mut().force_fresh_layout_reads_for_test();page_vm.evaluate_expression(diff --git a/moli-renderer-v8/src/runtime/tests.rs b/moli-renderer-v8/src/runtime/tests.rsindex 01d669cf9..5393c3203 100644--- a/moli-renderer-v8/src/runtime/tests.rs+++ b/moli-renderer-v8/src/runtime/tests.rs@@ -1167,6 +1167,7 @@ async fn mouse_input_completion_publishes_handler_navigation_once() {RendererTopLevelNavigationDispatch::DelegateToBrowser,).await;+ capture_screenshot_for_renderer_page(&page).await;let (snapshot, _) = page.run_async_command(RendererPageCommand::PageDiagnosticsSnapshot).await@@ -1308,6 +1309,7 @@ async fn mouse_input_completion_preserves_standalone_and_child_navigation_scope(mode,).await;+ capture_screenshot_for_renderer_page(&page).await;let hit_expression = if case == "standalone" {"document.elementFromPoint(30,30).id"} else {@@ -12345,6 +12347,7 @@ addEventListener("wheel", event => {))).await.expect("action-window viewport should update");+ capture_screenshot_for_renderer_page(&page).await;let (observer_installed, _) = page.run_async_command(RendererPageCommand::EvaluateExpression {expression: r#"@@ -12469,12 +12472,7 @@ addEventListener("wheel", event => {.await.expect("capture barrier viewport should update");- page.run_async_command(RendererPageCommand::EvaluateExpression {- expression: "document.elementFromPoint(0, 0); true".to_owned(),- await_promise: false,- })- .await- .expect("publish root geometry before mouse input");+ capture_screenshot_for_renderer_page(&page).await;assert!(dispatch_wheel_for_action_window_test(&page, 10.0)@@ -12556,12 +12554,7 @@ document.addEventListener("wheel", event => {).await;- page.run_async_command(RendererPageCommand::EvaluateExpression {- expression: "document.elementFromPoint(0, 0); true".to_owned(),- await_promise: false,- })- .await- .expect("publish root geometry before mouse input");+ capture_screenshot_for_renderer_page(&page).await;for delta_y in [10.0, 20.0, 30.0] {assert!(diff --git a/moli-renderer-v8/src/script_vm.rs b/moli-renderer-v8/src/script_vm.rsindex f257e7f26..5ddf38bd5 100644--- a/moli-renderer-v8/src/script_vm.rs+++ b/moli-renderer-v8/src/script_vm.rs@@ -981,24 +981,9 @@ impl moli_layout::GeometryProvider for ScriptVm {fn answer(&mut self,- reason: moli_layout::LayoutFlushReason,- viewport: moli_layout::LayoutViewport,queries: &moli_layout::LayoutQueryBatch<Self::NodeId>,) -> Result<moli_layout::LayoutAnswers<Self::NodeId>, moli_layout::LayoutError> {- let needs_refresh = {- let context_host = self._context_host.borrow();- !context_host.can_answer_layout_from_snapshot(- context_host.document_handle(),- reason,- viewport,- )- };- if needs_refresh {- self.reconcile_document_web_fonts_for_layout();- }- self._context_host- .borrow_mut()- .answer(reason, viewport, queries)+ self._context_host.borrow_mut().answer(queries)}}@@ -2457,6 +2442,17 @@ impl ScriptVm {self.paint_layout_snapshot(viewport, moli_layout::LayoutFlushReason::Screenshot)}+ #[cfg(test)]+ pub(crate) fn publish_layout_for_test(&mut self) -> anyhow::Result<()> {+ let viewport = {+ let host = self._context_host.borrow();+ host.layout_viewport_for_document(host.document_handle())+ };+ self.screenshot_layout_snapshot(viewport)?+ .ok_or_else(|| anyhow::anyhow!("fixture screenshot requires a document"))?;+ Ok(())+ }+#[cfg(test)]pub(crate) fn refresh_layout_snapshot_for_test(&mut self,@@ -2551,11 +2547,7 @@ 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::observer_runtime::queue_intersection_checks(scope, runtime_ptr);crate::native_bridge::element::queue_revealed_lazy_image_loads(scope,runtime_ptr,@@ -2747,29 +2739,19 @@ impl ScriptVm {pub(crate) fn observable_geometry_batch_for_current_document(&mut self,- reason: moli_layout::LayoutFlushReason,batch: &moli_layout::LayoutQueryBatch<DomHandle>,) -> Result<moli_layout::LayoutAnswers<DomHandle>, moli_layout::LayoutError> {let document = self._context_host.borrow().document_handle();- self.observable_geometry_batch_for_document(document, reason, batch)+ self.observable_geometry_batch_for_document(document, batch)}pub(crate) fn observable_geometry_batch_for_document(&mut self,document: DomHandle,- reason: moli_layout::LayoutFlushReason,batch: &moli_layout::LayoutQueryBatch<DomHandle>,) -> Result<moli_layout::LayoutAnswers<DomHandle>, moli_layout::LayoutError> {- if self- ._context_host- .borrow()- .layout_policy()- .uses_real_layout()- {- self.reconcile_document_web_fonts_for_layout();- }let host = self._context_host.borrow();- crate::native_bridge::element::observable_geometry_batch(&host, document, reason, batch)+ crate::native_bridge::element::observable_geometry_batch(&host, document, batch)}pub(crate) fn observable_deep_hit_test_for_current_document(@@ -2777,14 +2759,6 @@ impl ScriptVm {point: moli_layout::LayoutPoint,ignore_pointer_events_none: bool,) -> Result<Option<DomHandle>, moli_layout::LayoutError> {- if self- ._context_host- .borrow()- .layout_policy()- .uses_real_layout()- {- self.reconcile_document_web_fonts_for_layout();- }let host = self._context_host.borrow();let document = host.document_handle();crate::native_bridge::element::observable_deep_hit_test(@@ -4493,6 +4467,16 @@ impl ScriptVm {if !self._context_host.borrow().dom_host().is_connected(handle) {return Ok(RendererScrollIntoViewResult::NodeDetached);}+ {+ let host = self._context_host.borrow();+ if host.layout_policy().uses_real_layout() {+ let document = host+ .layout_document_for_source(handle)+ .ok_or(moli_layout::LayoutError::NoLayoutSnapshot)?;+ host.with_latest_layout_tree_for_document(document, |_| ())+ .ok_or(moli_layout::LayoutError::NoLayoutSnapshot)?;+ }+ }self.with_default_context_scope(|scope, runtime_ptr| {Ok(match crate::native_bridge::element::scroll_node_into_view_if_needed(@@ -4500,7 +4484,6 @@ impl ScriptVm {runtime_ptr,handle,rect,- moli_layout::LayoutFlushReason::SynchronousGeometry.into(),)? {Some(_) => RendererScrollIntoViewResult::ScrolledOrAlreadyVisible,None => RendererScrollIntoViewResult::NodeDoesNotHaveLayoutObject,@@ -4523,7 +4506,6 @@ impl ScriptVm {};let answers = self.observable_geometry_batch_for_document(document,- moli_layout::LayoutFlushReason::CdpGeometry,&moli_layout::LayoutQueryBatch::new(vec![moli_layout::LayoutQuery::ClientRects {source: handle,}]),@@ -4590,7 +4572,6 @@ impl ScriptVm {let (frame, parent_document, child_viewport) = frame_context;let answers = self.observable_geometry_batch_for_document(parent_document,- moli_layout::LayoutFlushReason::CdpGeometry,&moli_layout::LayoutQueryBatch::new(vec![moli_layout::LayoutQuery::BoxModel {source: frame,}]),@@ -5159,13 +5140,6 @@ impl ScriptVm {self._context_host.borrow_mut().set_layout_policy(policy);}- #[cfg(test)]- pub(crate) fn force_fresh_layout_reads_for_test(&mut self) {- self._context_host- .borrow_mut()- .force_fresh_layout_reads_for_test();- }-fn sync_document_fonts_for_environment(&mut self) {self.renderer_document_isolate.with_renderer_document_isolate_mut(|isolate| {diff --git a/moli-renderer-v8/src/script_vm/dom_heavy_regression_tests.rs b/moli-renderer-v8/src/script_vm/dom_heavy_regression_tests.rsindex b03d3ce55..a19261199 100644--- a/moli-renderer-v8/src/script_vm/dom_heavy_regression_tests.rs+++ b/moli-renderer-v8/src/script_vm/dom_heavy_regression_tests.rs@@ -290,10 +290,13 @@ fn intersection_observer_callback_fires_after_dom_mutation_without_mutation_obsewindow.__lmIoCallbacks += 1;window.__lmIoEntryCount += entries.length;});- window.__lmIoObserver.observe(window.__lmIoTarget);+ window.__startPreparedObserver = () => window.__lmIoObserver.observe(window.__lmIoTarget);return 'observed';})()"#,);+ vm.publish_layout_for_test()+ .expect("publish observer fixture");+ eval_with_body(&mut vm, "window.__startPreparedObserver()");let after_initial = eval_with_body(&mut vm, "String(window.__lmIoCallbacks)");assert_eq!(after_initial, "1",@@ -456,10 +459,13 @@ fn rootless_intersection_observer_keeps_plain_deep_spa_targets_viewport_visible(top: entry.boundingClientRect.top})));}, { root: null, rootMargin: '0px', threshold: [0, 1] });- observer.observe(target);+ window.__startPreparedObserver = () => observer.observe(target);return 'observed';})()"#,);+ vm.publish_layout_for_test()+ .expect("publish observer fixture");+ eval_with_body(&mut vm, "window.__startPreparedObserver()");let result = eval_with_body(&mut vm,@@ -555,10 +561,13 @@ fn rootless_intersection_observer_keeps_inline_sized_deep_targets_outside_viewpotop: entry.boundingClientRect.top})));}, { root: null, rootMargin: '0px', threshold: [0, 1] });- observer.observe(target);+ window.__startPreparedObserver = () => observer.observe(target);return 'observed';})()"#,);+ vm.publish_layout_for_test()+ .expect("publish observer fixture");+ eval_with_body(&mut vm, "window.__startPreparedObserver()");let result = eval_with_body(&mut vm, "JSON.stringify(window.__lmIoEntries)");let entries: serde_json::Value =@@ -600,10 +609,13 @@ fn rootless_intersection_observer_counts_text_content_flow_units() {top: entry.boundingClientRect.top})));}, { root: null, rootMargin: '0px', threshold: [0, 1] });- observer.observe(target);+ window.__startPreparedObserver = () => observer.observe(target);return 'observed';})()"#,);+ vm.publish_layout_for_test()+ .expect("publish observer fixture");+ eval_with_body(&mut vm, "window.__startPreparedObserver()");let result = eval_with_body(&mut vm, "JSON.stringify(window.__lmIoEntries)");let entries: serde_json::Value =@@ -641,11 +653,14 @@ fn intersection_observer_and_mutation_observer_coexist_during_dom_mutations() {window.__lmMoObserver = new MutationObserver((records) => {window.__lmMoCount += records.length;});- window.__lmIoObserver.observe(window.__lmIoTarget);+ window.__startPreparedObserver = () => window.__lmIoObserver.observe(window.__lmIoTarget);window.__lmMoObserver.observe(document.body, { childList: true, subtree: true });return 'observed';})()"#,);+ vm.publish_layout_for_test()+ .expect("publish observer fixture");+ eval_with_body(&mut vm, "window.__startPreparedObserver()");eval_with_body(&mut vm, "String(window.__lmIoCount)");eval_with_body(&mut vm,@@ -695,10 +710,13 @@ fn mutation_observer_disconnect_does_not_starve_intersection_observer() {window.__lmIoObserver = new IntersectionObserver(() => {window.__lmIoCount += 1;});- window.__lmIoObserver.observe(window.__lmIoTarget);+ window.__startPreparedObserver = () => window.__lmIoObserver.observe(window.__lmIoTarget);return 'observed';})()"#,);+ vm.publish_layout_for_test()+ .expect("publish observer fixture");+ eval_with_body(&mut vm, "window.__startPreparedObserver()");eval_with_body(&mut vm, "String(window.__lmIoCount)");eval_with_body(&mut vm,diff --git a/moli-renderer-v8/src/script_vm/element_click.rs b/moli-renderer-v8/src/script_vm/element_click.rsindex 3a966aa4b..b5efe12bd 100644--- a/moli-renderer-v8/src/script_vm/element_click.rs+++ b/moli-renderer-v8/src/script_vm/element_click.rs@@ -7,7 +7,7 @@ use crate::runtime::{RendererElementClickError as ClickError, RendererElementClickTarget as ClickTarget,RendererInputDispatchOutcome, RendererPointerEventProperties, RendererPreparedPointerClick,};-use moli_layout::{LayoutFlushReason, LayoutPassRequest, LayoutPoint, LayoutQuad};+use moli_layout::{LayoutPoint, LayoutQuad};fn layout_error(error: impl std::fmt::Display) -> ClickError {ClickError::LayoutUnavailable(error.to_string())@@ -35,26 +35,17 @@ impl ScriptVm {if !host.layout_policy().uses_real_layout() {return Ok(ClickTarget::DomActivation);}+ let document = host+ .layout_document_for_source(handle)+ .ok_or(ClickError::StaleNode)?;+ host.with_latest_layout_tree_for_document(document, |_| ())+ .ok_or_else(|| layout_error(moli_layout::LayoutError::NoLayoutSnapshot))?;}- let scrolled = self- .with_default_context_scope(|scope, runtime_ptr| {- Ok(scroll_node_into_view_at_center(scope, runtime_ptr, handle)?)- })- .map_err(layout_error)?- .ok_or(ClickError::NoClickableRect)?;- if scrolled {- // Element click must prepare a point in the newly scrolled view.- // Ordinary geometry reads and coordinate input retain the snapshot.- let viewport = {- let host = self._context_host.borrow();- host.layout_viewport_for_document(host.document_handle())- };- self.with_fresh_layout_pass(- LayoutPassRequest::new(viewport, LayoutFlushReason::HitTest),- |_| Ok(()),- )- .map_err(layout_error)?;- }+ self.with_default_context_scope(|scope, runtime_ptr| {+ Ok(scroll_node_into_view_at_center(scope, runtime_ptr, handle)?)+ })+ .map_err(layout_error)?+ .ok_or(ClickError::NoClickableRect)?;self.prepare_pointer_click_geometry(handle).map(ClickTarget::Pointer)}@@ -63,7 +54,6 @@ impl ScriptVm {&mut self,handle: DomHandle,) -> Result<RendererPreparedPointerClick, ClickError> {- self.reconcile_document_web_fonts_for_layout();let (document, point, root_document) = {let host = self._context_host.borrow();if !host.dom_host().is_connected(handle) {@@ -73,12 +63,14 @@ impl ScriptVm {.dom_host().owner_document_handle(handle).ok_or(ClickError::StaleNode)?;- let rect = read_client_rects(&host, handle, LayoutFlushReason::SynchronousGeometry)+ let rect = read_client_rects(&host, handle).map_err(layout_error)?.into_iter().next().ok_or(ClickError::NoClickableRect)?;- let viewport = host.layout_viewport_for_document(document);+ let viewport = host+ .with_latest_layout_tree_for_document(document, |tree| tree.viewport)+ .ok_or_else(|| layout_error(moli_layout::LayoutError::NoLayoutSnapshot))?;let left = rect.left.max(0.0);let top = rect.top.max(0.0);let right = rect.right.min(f64::from(viewport.css_width));diff --git a/moli-renderer-v8/src/script_vm/input_dispatch.rs b/moli-renderer-v8/src/script_vm/input_dispatch.rsindex 2bfb0df1f..b4fc2b8db 100644--- a/moli-renderer-v8/src/script_vm/input_dispatch.rs+++ b/moli-renderer-v8/src/script_vm/input_dispatch.rs@@ -24,13 +24,12 @@ use crate::native_bridge::element::{construct_pointer_event_with_modifiers, construct_pointer_event_with_related_target,construct_pointer_event_with_related_target_and_modifiers, construct_simple_event,construct_touch_event, construct_touch_event_with_points, construct_wheel_event,- contenteditable_editing_host, dispatch_public_event, is_text_control,+ contenteditable_editing_host, dispatch_public_event, input_surface_hit_test, is_text_control,observable_input_hit_test, perform_auxiliary_link_default_action, perform_drop_default_action,perform_implicit_submission_from_control, perform_mouse_focus_default_action,perform_scrollbar_scroll_default_action, perform_wheel_scroll_default_action,replace_contenteditable_selection, replace_text_control_selection,- select_contenteditable_contents, snapshot_input_surface_hit_test,- text_control_set_selection_range_internal,+ select_contenteditable_contents, text_control_set_selection_range_internal,text_control_set_selection_range_with_direction_internal, text_control_value, update_focus,};use crate::native_bridge::{@@ -475,7 +474,7 @@ impl ScriptVm {y: f64,event_name: &str,) -> Result<crate::native_bridge::element::InputSurfaceHit> {- Ok(snapshot_input_surface_hit_test(+ Ok(input_surface_hit_test(&self._context_host.borrow(),self.document_runtime.document_handle(),moli_layout::LayoutPoint::new(x as f32, y as f32),diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/events_selection_storage.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/events_selection_storage.rsindex 0cd6218a9..9540cd999 100644--- a/moli-renderer-v8/src/script_vm/tests/browser_api/events_selection_storage.rs+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/events_selection_storage.rs@@ -3121,9 +3121,8 @@ fn range_uses_native_record_storage_and_static_range_keeps_boundary_slots() {fn selection_record_handle_ignores_legacy_slot_name_property() {let mut vm = new_storage_test_vm("https://selection-record-internal-field.test/");- let result = vm- .eval(- r#"+ vm.eval(+ r#"(() => {const container = document.body || document.documentElement || document;const host = document.createElement("div");@@ -3131,6 +3130,7 @@ fn selection_record_handle_ignores_legacy_slot_name_property() {host.appendChild(text);container.appendChild(host);+globalThis.__readFixture = () => {const selection = getSelection();selection.__moliSelectionRecordId = 0n;selection.setBaseAndExtent(text, 1, text, 3);@@ -3148,9 +3148,15 @@ fn selection_record_handle_ignores_legacy_slot_name_property() {range.endOffset,selection.toString()].join("|");- })()+ };+})()"#,- )+ )+ .expect("Selection native record handle should ignore public legacy-slot-name spoofing");+ vm.publish_layout_for_test()+ .expect("publish prepared fixture");+ let result = vm+ .eval("__readFixture()").expect("Selection native record handle should ignore public legacy-slot-name spoofing");assert_eq!(result, "true|true|1|true|3|true|1|true|3|bc");@@ -3198,10 +3204,10 @@ fn document_create_range_declared_method_keeps_descriptor_and_behavior() {fn range_prototype_methods_are_declared_operations() {let mut vm = new_storage_test_vm("https://range-prototype-methods.test/");- let result = vm- .eval(- r#"- (() => {+ let result = eval_with_layout_publications(+ &mut vm,+ r#"+ (function* () {const methods = [["setStart", 2],["setEnd", 2],@@ -3256,7 +3262,8 @@ fn range_prototype_methods_are_declared_operations() {range.setStart(text, 1);range.setEnd(text, 4);const clone = range.cloneRange();- const rect = range.getBoundingClientRect();+ yield; // Publish this scene before reading its geometry.+const rect = range.getBoundingClientRect();const rects = range.getClientRects();const behavior = [range.toString(),@@ -3283,8 +3290,8 @@ fn range_prototype_methods_are_declared_operations() {});})()"#,- )- .expect("Range prototype method descriptor probe should evaluate");+ )+ .expect("Range prototype method descriptor probe should evaluate");assert_eq!(result,@@ -3620,10 +3627,10 @@ fn range_contents_handles_cdata_pi_foreign_text_and_doctype_edges() {fn selection_prototype_methods_are_declared_operations() {let mut vm = new_storage_test_vm("https://selection-prototype-methods.test/");- let result = vm- .eval(- r#"- (() => {+ let result = eval_with_layout_publications(+ &mut vm,+ r#"+ (function* () {const methods = [["getRangeAt", 1],["addRange", 1],@@ -3720,7 +3727,8 @@ fn selection_prototype_methods_are_declared_operations() {Selection.prototype[slot] = "prototype-spoof";selection[slot] = "own-spoof";}- const behavior = [+ yield; // Publish this scene before reading its geometry.+const behavior = [selection.getRangeAt(0) === range,selection.toString(),selection.containsNode(text, true),@@ -3765,8 +3773,8 @@ fn selection_prototype_methods_are_declared_operations() {});})()"#,- )- .expect("Selection prototype method descriptor probe should evaluate");+ )+ .expect("Selection prototype method descriptor probe should evaluate");assert_eq!(result,@@ -8348,10 +8356,10 @@ fn selection_add_range_ignores_detached_and_foreign_ranges() {fn window_selection_rejects_child_document_shadow_ranges() {let mut vm = new_storage_test_vm("https://selection-child-shadow-range.test/");- let result = vm- .eval(- r#"- (() => {+ let result = eval_with_layout_publications(+ &mut vm,+ r#"+ (function* () {const frame = document.createElement("iframe");(document.body || document.documentElement || document).appendChild(frame);const childDocument = frame.contentWindow.document;@@ -8390,7 +8398,8 @@ fn window_selection_rejects_child_document_shadow_ranges() {parentSelection.toString()].join(":");- const childSelection = frame.contentWindow.getSelection();+ yield; // Publish this scene before reading its geometry.+const childSelection = frame.contentWindow.getSelection();childSelection.removeAllRanges();childSelection.addRange(shadowRange);const childState = [@@ -8401,8 +8410,8 @@ fn window_selection_rejects_child_document_shadow_ranges() {return `${shadowState}|${slottedState}|${childState}`;})()"#,- )- .expect("window Selection should reject child document shadow ranges");+ )+ .expect("window Selection should reject child document shadow ranges");assert_eq!(result, "0:|0:|1:Som");}@@ -9110,10 +9119,10 @@ fn document_get_selection_uses_associated_window_selection() {fn modal_dialog_selection_inertness_is_scoped_to_its_document() {let mut vm = new_storage_test_vm("https://selection-modal-document-scope.test/");- let result = vm- .eval(- r#"- (() => {+ let result = eval_with_layout_publications(+ &mut vm,+ r#"+ (function* () {const html = document.documentElement ||document.appendChild(document.createElement("html"));const body = document.body || html.appendChild(document.createElement("body"));@@ -9146,7 +9155,8 @@ fn modal_dialog_selection_inertness_is_scoped_to_its_document() {const childSelection = frame.contentWindow.getSelection();parentDialog.showModal();- const parentWithParentModal = selectedText(parentSelection, body);+ yield; // Publish this scene before reading its geometry.+const parentWithParentModal = selectedText(parentSelection, body);const childWithParentModal = selectedText(childSelection, childBody);childSelection.removeAllRanges();const childCommandWithParentModal = childDocument.execCommand("selectAll");@@ -9154,7 +9164,8 @@ fn modal_dialog_selection_inertness_is_scoped_to_its_document() {parentDialog.close();childDialog.showModal();- const parentWithChildModal = selectedText(parentSelection, body);+ yield; // Publish this scene before reading its geometry.+const parentWithChildModal = selectedText(parentSelection, body);const childWithChildModal = selectedText(childSelection, childBody);parentSelection.removeAllRanges();const parentCommandWithChildModal = document.execCommand("selectAll");@@ -9172,8 +9183,8 @@ fn modal_dialog_selection_inertness_is_scoped_to_its_document() {});})()"#,- )- .expect("modal selection inertness should remain document-scoped");+ )+ .expect("modal selection inertness should remain document-scoped");assert_eq!(result,diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/misc.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/misc.rsindex 82481fce9..85dacaae6 100644--- a/moli-renderer-v8/src/script_vm/tests/browser_api/misc.rs+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/misc.rs@@ -23582,10 +23582,10 @@ fn zhihu_probe_screen_orientation_surface_matches_chromium_headless_essentials()fn empty_main_and_section_use_ordinary_css_block_geometry() {let mut vm = new_storage_test_vm("https://example.com/");- let result = vm- .eval(- r#"- (() => {+ let result = eval_with_layout_publications(+ &mut vm,+ r#"+ (function* () {if (!document.documentElement) {document.appendChild(document.createElement("html"));}@@ -23601,7 +23601,8 @@ fn empty_main_and_section_use_ordinary_css_block_geometry() {child.id = "message-list";main.appendChild(child);document.body.appendChild(main);- const mainRect = main.getBoundingClientRect();+ yield; // Publish this scene before reading its geometry.+const mainRect = main.getBoundingClientRect();const childRect = child.getBoundingClientRect();return JSON.stringify({main: {@@ -23620,8 +23621,8 @@ fn empty_main_and_section_use_ordinary_css_block_geometry() {});})()"#,- )- .expect("main geometry probe should evaluate");+ )+ .expect("main geometry probe should evaluate");assert_eq!(result,@@ -23633,10 +23634,9 @@ fn empty_main_and_section_use_ordinary_css_block_geometry() {fn utility_class_names_do_not_synthesize_app_shell_geometry() {let mut vm = new_storage_test_vm("https://example.com/");- let result = vm- .eval(+ let result = eval_with_layout_publications(&mut vm,r#"- (() => {+ (function* () {if (!document.documentElement) {document.appendChild(document.createElement("html"));}@@ -23672,7 +23672,8 @@ fn utility_class_names_do_not_synthesize_app_shell_geometry() {app.appendChild(outer);root.appendChild(app);document.body.appendChild(root);- const outerRect = outer.getBoundingClientRect();+ yield; // Publish this scene before reading its geometry.+const outerRect = outer.getBoundingClientRect();const innerRect = inner.getBoundingClientRect();const scrollRootRect = scrollRoot.getBoundingClientRect();const threadRect = thread.getBoundingClientRect();@@ -23727,10 +23728,10 @@ fn utility_class_names_do_not_synthesize_app_shell_geometry() {fn app_shell_geometry_does_not_match_site_specific_names() {let mut vm = new_storage_test_vm("https://example.com/");- let result = vm- .eval(- r#"- (() => {+ let result = eval_with_layout_publications(+ &mut vm,+ r#"+ (function* () {if (!document.documentElement) {document.appendChild(document.createElement("html"));}@@ -23746,7 +23747,8 @@ fn app_shell_geometry_does_not_match_site_specific_names() {main.appendChild(namedThread);main.appendChild(namedComposer);document.body.appendChild(main);- const threadRect = namedThread.getBoundingClientRect();+ yield; // Publish this scene before reading its geometry.+const threadRect = namedThread.getBoundingClientRect();const composerRect = namedComposer.getBoundingClientRect();return JSON.stringify({thread: {width: threadRect.width, height: threadRect.height},@@ -23754,8 +23756,8 @@ fn app_shell_geometry_does_not_match_site_specific_names() {});})()"#,- )- .expect("site-specific geometry probe should evaluate");+ )+ .expect("site-specific geometry probe should evaluate");assert_eq!(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.rsindex dcf3b65d1..07950a7f3 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@@ -181,7 +181,6 @@ fn element_scroll_into_view_surface_is_available() {#[test]fn element_scroll_into_view_if_needed_updates_observable_window_scroll() {let mut vm = new_storage_test_vm("https://example.com/");- vm.force_fresh_layout_reads_for_test();vm.eval(r#"@@ -208,7 +207,7 @@ fn element_scroll_into_view_if_needed_updates_observable_window_scroll() {"#,).expect("scrollIntoViewIfNeeded fixture should initialize");- refresh_layout_for_test(&mut vm);+ publish_layout_for_test(&mut vm);let result = vm.eval(@@ -251,7 +250,16 @@ fn element_scroll_into_view_if_needed_updates_observable_window_scroll() {.as_f64().is_some_and(|value| value > 0.0));- assert_eq!(result["scrollingElementScroll"], result["standardScroll"]);+ assert_eq!(+ result["scrollingElementScroll"], 0,+ "element metrics retain the published scroll position"+ );+ publish_layout_for_test(&mut vm);+ assert_eq!(+ vm.eval("String(document.scrollingElement.scrollTop)")+ .unwrap(),+ result["standardScroll"].to_string()+ );}#[test]@@ -280,7 +288,7 @@ fn wheel_default_action_scrolls_unless_canceled() {"#,).expect("wheel fixture should initialize");- refresh_layout_for_test(&mut vm);+ publish_layout_for_test(&mut vm);let before = vm.eval("document.getElementById('marker').getBoundingClientRect().top")@@ -293,7 +301,7 @@ fn wheel_default_action_scrolls_unless_canceled() {assert!(outcome.handled);// Publish the scrolled geometry before checking its rendered position.- refresh_layout_for_test(&mut vm);+ publish_layout_for_test(&mut vm);let result = vm.eval(r#"@@ -360,7 +368,7 @@ fn intersection_checks_after_scroll_reuse_geometry_until_fresh_paint() {"#,).expect("intersection scroll fixture should initialize");- refresh_layout_for_test(&mut vm);+ publish_layout_for_test(&mut vm);vm.eval(r#"@@ -476,10 +484,11 @@ fn wheel_default_action_scrolls_the_innermost_container_then_chains_to_the_root("#,).expect("nested wheel fixture should initialize");- refresh_layout_for_test(&mut vm);+ publish_layout_for_test(&mut vm);vm.dispatch_mouse_event_at_point(10.0, 10.0, "wheel", -1, Some(0), 35.0, 60.0).expect("nested wheel input should dispatch");+ publish_layout_for_test(&mut vm);assert_eq!(vm.eval("JSON.stringify([document.getElementById('scroller').scrollLeft, document.getElementById('scroller').scrollTop, window.scrollX, window.scrollY])"@@ -518,7 +527,6 @@ fn transformed_constrained_iframe_routes_hover_click_and_wheel_in_child_coordina..Default::default()})).expect("iframe input viewport should update");- vm.force_fresh_layout_reads_for_test();vm.eval(r#"@@ -575,6 +583,7 @@ fn transformed_constrained_iframe_routes_hover_click_and_wheel_in_child_coordina).expect("transformed iframe input fixture should initialize");+ publish_layout_for_test(&mut vm);let geometry = vm.eval(r#"@@ -602,8 +611,7 @@ fn transformed_constrained_iframe_routes_hover_click_and_wheel_in_child_coordinaassert!((rect[2].as_f64().unwrap() - 719.94).abs() < 0.1);assert!((rect[3].as_f64().unwrap() - 499.98).abs() < 0.1);- vm.eval("document.elementFromPoint(0, 0)")- .expect("publish the composite snapshot before coordinate input");+ publish_layout_for_test(&mut vm);// Child point (240, 90) is the visible center of #hover-target. The// iframe's 0.78 transform maps it to root-frame point (287.2, 190.2).@@ -618,6 +626,7 @@ fn transformed_constrained_iframe_routes_hover_click_and_wheel_in_child_coordinavm.dispatch_mouse_event_at_point(536.8, 307.2, "wheel", -1, Some(0), 0.0, 100.0).expect("child wheel should dispatch");+ publish_layout_for_test(&mut vm);let result = vm.eval(r#"@@ -660,11 +669,13 @@ fn transformed_constrained_iframe_routes_hover_click_and_wheel_in_child_coordinaassert!((wheel["clientX"].as_f64().unwrap() - 560.0).abs() < 0.1);assert!((wheel["clientY"].as_f64().unwrap() - 240.0).abs() < 0.1);+ vm.eval("document.getElementById('input-frame-clip').style.width='624px'")+ .unwrap();+ publish_layout_for_test(&mut vm);assert_eq!(vm.eval(r#"(() => {- document.getElementById('input-frame-clip').style.width = '624px';const frame = document.getElementById('input-frame');return [frame.offsetWidth, frame.contentWindow.innerWidth].join('|');})()@@ -718,7 +729,7 @@ fn iframe_input_reuses_one_top_level_snapshot_without_parent_child_ping_pong() {assert_eq!(vm.eval("document.body.offsetWidth > 0").expect("parent geometry should evaluate"),- "true"+ "false");let passes_before = vm.layout_pass_observability_for_test().1;let error = vm@@ -731,8 +742,7 @@ fn iframe_input_reuses_one_top_level_snapshot_without_parent_child_ping_pong() {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());- vm.eval("document.elementFromPoint(140, 130)")- .expect("explicit deep geometry demand");+ publish_layout_for_test(&mut vm);let prepared = vm.layout_pass_observability_for_test().1;assert_eq!(prepared, passes_before + 1);for _ in 0..3 {@@ -796,8 +806,7 @@ fn iframe_wheel_batch_reuses_one_composite_snapshot_for_every_scroll_step() {).expect("iframe wheel snapshot fixture should initialize");- vm.eval("document.elementFromPoint(0, 0)")- .expect("publish the composite snapshot before wheel input");+ publish_layout_for_test(&mut vm);let passes_before = vm.layout_pass_observability_for_test().1;vm.begin_batched_mouse_event_dispatch();for delta_y in [10.0, 20.0, 30.0] {@@ -828,7 +837,7 @@ fn iframe_wheel_batch_reuses_one_composite_snapshot_for_every_scroll_step() {"committing derived effects must not perform another layout");- refresh_layout_for_test(&mut vm);+ publish_layout_for_test(&mut vm);assert_eq!(vm.eval("(() => { const frame = document.getElementById('wheel-frame'); return [frame.contentDocument.getElementById('wheel-scroller').scrollTop, frame.contentWindow.__wheelGeometryReads].join('|'); })()"@@ -855,7 +864,6 @@ fn focusing_visible_child_target_does_not_scroll_partially_hidden_transformed_if..Default::default()})).expect("iframe focus viewport should update");- vm.force_fresh_layout_reads_for_test();vm.eval(r#"@@ -896,8 +904,7 @@ fn focusing_visible_child_target_does_not_scroll_partially_hidden_transformed_if).expect("iframe focus fixture should initialize");- vm.eval("document.elementFromPoint(0, 0)")- .expect("publish the composite snapshot before coordinate input");+ publish_layout_for_test(&mut vm);// Child point (60, 40), the button center, maps through scale(.78) to// root-frame point (146.8, 431.2). The button is visible, while the frame@@ -972,7 +979,6 @@ fn nested_transformed_iframe_input_composes_scroll_border_padding_and_exit_coord..Default::default()})).expect("nested iframe viewport should update");- vm.force_fresh_layout_reads_for_test();vm.eval(r#"@@ -1030,12 +1036,14 @@ fn nested_transformed_iframe_input_composes_scroll_border_padding_and_exit_coord});}, true);}- parentScroller.scrollTo(50, 40);'installed'"#,).expect("nested transformed iframe fixture should initialize");+ publish_layout_for_test(&mut vm);+ vm.eval("parentScroller.scrollTo(50, 40)").unwrap();+ publish_layout_for_test(&mut vm);// The exact used content viewports exclude each frame's border and// padding: 240 - 2*(4+6) = 220, then 100 - 2*(2+3) = 90.assert_eq!(@@ -1057,8 +1065,7 @@ fn nested_transformed_iframe_input_composes_scroll_border_padding_and_exit_coord"[220,160,90,70,50,40]");- vm.eval("document.elementFromPoint(0, 0)")- .expect("publish the composite snapshot before coordinate input");+ publish_layout_for_test(&mut vm);// Nested client point (20, 20) maps through scale(.5), the inner frame's// 5px border+padding edge, scale(.75), the outer frame's 10px edge, and@@ -1090,6 +1097,7 @@ fn nested_transformed_iframe_input_composes_scroll_border_padding_and_exit_coord.expect("nested scrollbar press should dispatch");vm.dispatch_mouse_event_at_point(148.875, 120.625, "mouseup", 0, Some(0), 0.0, 0.0).expect("nested scrollbar release should dispatch");+ publish_layout_for_test(&mut vm);assert_eq!(vm.eval(r#"@@ -1105,9 +1113,6 @@ fn nested_transformed_iframe_input_composes_scroll_border_padding_and_exit_coord.expect("nested scrollbar result should evaluate"),format!("[70,{events_before_scrollbar}]"));- // The child scrollTop observation above published a child-only snapshot.- vm.eval("document.elementFromPoint(0, 0)")- .expect("publish root geometry before leaving the child frame");// Move to a top-document element. The outgoing events must still convert// this new root point through the previous nested frame chain.vm.dispatch_mouse_event_at_point(10.0, 10.0, "mousemove", -1, Some(0), 0.0, 0.0)@@ -1205,7 +1210,7 @@ fn classic_scrollbar_metrics_and_thumb_drag_match_chromium_without_dom_mouse_eve"#,).expect("scrollbar fixture should initialize");- refresh_layout_for_test(&mut vm);+ publish_layout_for_test(&mut vm);assert_eq!(vm.eval(@@ -1240,7 +1245,7 @@ fn classic_scrollbar_metrics_and_thumb_drag_match_chromium_without_dom_mouse_evevm.dispatch_mouse_event_at_point(90.0, 90.0, "mouseup", 0, Some(0), 0.0, 0.0).expect("horizontal thumb release should dispatch");- refresh_layout_for_test(&mut vm);+ publish_layout_for_test(&mut vm);let before_controls = vm.eval("scroller.scrollTop").expect("pre-control scrollTop should evaluate")@@ -1250,7 +1255,7 @@ fn classic_scrollbar_metrics_and_thumb_drag_match_chromium_without_dom_mouse_eve.expect("back button press should dispatch");vm.dispatch_mouse_event_at_point(190.0, 5.0, "mouseup", 0, Some(0), 0.0, 0.0).expect("back button release should dispatch");- refresh_layout_for_test(&mut vm);+ publish_layout_for_test(&mut vm);let after_back = vm.eval("scroller.scrollTop").expect("back-button scrollTop should evaluate")@@ -1262,7 +1267,7 @@ fn classic_scrollbar_metrics_and_thumb_drag_match_chromium_without_dom_mouse_eve.expect("forward button press should dispatch");vm.dispatch_mouse_event_at_point(190.0, 80.0, "mouseup", 0, Some(0), 0.0, 0.0).expect("forward button release should dispatch");- refresh_layout_for_test(&mut vm);+ publish_layout_for_test(&mut vm);let after_forward = vm.eval("scroller.scrollTop").expect("forward-button scrollTop should evaluate")@@ -1274,7 +1279,7 @@ fn classic_scrollbar_metrics_and_thumb_drag_match_chromium_without_dom_mouse_eve.expect("forward track press should dispatch");vm.dispatch_mouse_event_at_point(190.0, 60.0, "mouseup", 0, Some(0), 0.0, 0.0).expect("forward track release should dispatch");- refresh_layout_for_test(&mut vm);+ publish_layout_for_test(&mut vm);let after_track = vm.eval("scroller.scrollTop").expect("track scrollTop should evaluate")@@ -1326,10 +1331,10 @@ fn painted_overlay_wins_over_scrollbar_and_corner_consumes_input() {"#,).expect("painted surface fixture should initialize");- refresh_layout_for_test(&mut vm);+ publish_layout_for_test(&mut vm);vm.eval("scroller.scrollTop = 80").expect("scroller should move before the overlay probe");- refresh_layout_for_test(&mut vm);+ publish_layout_for_test(&mut vm);vm.dispatch_mouse_event_at_point(210.0, 30.0, "mousedown", 0, Some(1), 0.0, 0.0).expect("overlay press should dispatch");@@ -1349,7 +1354,7 @@ fn painted_overlay_wins_over_scrollbar_and_corner_consumes_input() {"#,).expect("overlay should be removed before the corner probe");- refresh_layout_for_test(&mut vm);+ publish_layout_for_test(&mut vm);let corner = vm._context_host.borrow()@@ -1410,7 +1415,7 @@ fn body_overflow_defines_viewport_scrolling_and_default_root_stable_gutters() {"#,).expect("viewport overflow fixture should initialize");- refresh_layout_for_test(&mut vm);+ publish_layout_for_test(&mut vm);assert_eq!(vm.eval("JSON.stringify([document.documentElement.clientWidth, document.documentElement.scrollHeight, scrollY])"@@ -1436,7 +1441,7 @@ fn body_overflow_defines_viewport_scrolling_and_default_root_stable_gutters() {vm.eval("document.body.style.overflow = 'auto'; scrollTo(0, 0)").expect("body auto should become the viewport policy");- refresh_layout_for_test(&mut vm);+ publish_layout_for_test(&mut vm);assert_eq!(vm.eval("String(document.documentElement.clientWidth)").expect("auto viewport width should evaluate"),@@ -1452,7 +1457,7 @@ fn body_overflow_defines_viewport_scrolling_and_default_root_stable_gutters() {vm.eval("document.body.style.overflow = 'clip'").expect("body clip should become hidden at the viewport boundary");- refresh_layout_for_test(&mut vm);+ publish_layout_for_test(&mut vm);vm.eval("scrollTo(0, 100)").expect("clip-derived viewport should remain script-scrollable");vm.dispatch_mouse_event_at_point(10.0, 10.0, "wheel", -1, Some(0), 0.0, 80.0)@@ -1472,7 +1477,7 @@ fn body_overflow_defines_viewport_scrolling_and_default_root_stable_gutters() {"#,).expect("stable viewport gutter fixture should initialize");- refresh_layout_for_test(&mut vm);+ publish_layout_for_test(&mut vm);assert_eq!(vm.eval(r#"@@ -1489,7 +1494,7 @@ fn body_overflow_defines_viewport_scrolling_and_default_root_stable_gutters() {vm.eval("document.documentElement.style.scrollbarGutter = 'stable both-edges'").expect("both-edge stable gutter should apply");- refresh_layout_for_test(&mut vm);+ publish_layout_for_test(&mut vm);assert_eq!(vm.eval(r#"@@ -1512,7 +1517,7 @@ fn body_overflow_defines_viewport_scrolling_and_default_root_stable_gutters() {"#,).expect("display-contents body fixture should initialize");- refresh_layout_for_test(&mut vm);+ publish_layout_for_test(&mut vm);assert_eq!(vm.eval("String(document.documentElement.getBoundingClientRect().width)").expect("display-contents viewport width should evaluate"),@@ -1522,7 +1527,7 @@ fn body_overflow_defines_viewport_scrolling_and_default_root_stable_gutters() {vm.eval("document.body.style.display = 'block'").expect("principal body fixture should initialize");- refresh_layout_for_test(&mut vm);+ publish_layout_for_test(&mut vm);assert_eq!(vm.eval("String(document.documentElement.getBoundingClientRect().width)").expect("principal-body viewport width should evaluate"),@@ -1556,7 +1561,7 @@ fn stable_both_edges_preserve_numeric_layout_and_scroll_ranges() {"#,).expect("both-edge numeric layout fixture should initialize");- refresh_layout_for_test(&mut vm);+ publish_layout_for_test(&mut vm);assert_eq!(vm.eval(@@ -1642,7 +1647,7 @@ fn physical_scrollbar_insets_cover_box_intrinsic_ratio_and_vertical_writing_layo"#,).expect("physical scrollbar inset fixture should initialize");- refresh_layout_for_test(&mut vm);+ publish_layout_for_test(&mut vm);assert_eq!(vm.eval(@@ -1728,7 +1733,7 @@ fn vertical_block_flow_uses_writing_mode_instead_of_inline_direction_for_x_ancho"#,).expect("vertical block-flow fixture should initialize");- refresh_layout_for_test(&mut vm);+ publish_layout_for_test(&mut vm);assert_eq!(vm.eval(@@ -1797,7 +1802,7 @@ fn nested_and_sibling_scrollbar_drags_stay_bound_to_the_pressed_scroller() {"#,).expect("nested scrollbar fixture should initialize");- refresh_layout_for_test(&mut vm);+ publish_layout_for_test(&mut vm);assert_eq!(vm.eval(@@ -1828,7 +1833,7 @@ fn nested_and_sibling_scrollbar_drags_stay_bound_to_the_pressed_scroller() {.expect("captured nested thumb move should dispatch");vm.dispatch_mouse_event_at_point(515.0, 115.0, "mouseup", 0, Some(0), 0.0, 0.0).expect("captured nested thumb release should dispatch");- refresh_layout_for_test(&mut vm);+ publish_layout_for_test(&mut vm);let after_nested: serde_json::Value = serde_json::from_str(&vm.eval("JSON.stringify([inner.scrollTop, outer.scrollTop, sibling.scrollTop])").expect("nested drag state should evaluate"),@@ -1885,7 +1890,7 @@ fn nested_and_sibling_scrollbar_drags_stay_bound_to_the_pressed_scroller() {// remaining visible piece of its thumb is hittable in the new space.vm.eval("outer.scrollTop = 50; inner.scrollTop = 0").expect("ancestor and nested scroll positions should reset");- refresh_layout_for_test(&mut vm);+ publish_layout_for_test(&mut vm);vm.dispatch_mouse_event_at_point(225.0, 25.0, "mousedown", 0, Some(1), 0.0, 0.0).expect("partly clipped nested thumb press should dispatch");vm.dispatch_mouse_event_at_point(700.0, 45.0, "mousemove", -1, Some(1), 0.0, 0.0)@@ -1900,7 +1905,7 @@ fn nested_and_sibling_scrollbar_drags_stay_bound_to_the_pressed_scroller() {vm.dispatch_mouse_event_at_point(295.0, 125.0, "mouseup", 0, Some(0), 0.0, 0.0).expect("outer thumb release should dispatch");- refresh_layout_for_test(&mut vm);+ publish_layout_for_test(&mut vm);let result: serde_json::Value = serde_json::from_str(&vm.eval("JSON.stringify([outer.scrollTop, inner.scrollTop, sibling.scrollTop, horizontal.scrollLeft, document.getElementById('thin-child').scrollLeft, document.getElementById('thin-child').scrollTop, document.getElementById('rtl-child').scrollLeft, document.getElementById('rtl-child').scrollTop, __nestedScrollbarDomEvents])",@@ -1946,7 +1951,7 @@ fn transformed_scrollbar_drag_uses_local_motion_clamps_and_cancels_on_button_los"#,).expect("transformed scrollbar fixture should initialize");- refresh_layout_for_test(&mut vm);+ publish_layout_for_test(&mut vm);let hit = crate::native_bridge::element::observable_scrollbar_hit_test(&vm._context_host.borrow(),@@ -1975,7 +1980,7 @@ fn transformed_scrollbar_drag_uses_local_motion_clamps_and_cancels_on_button_los);vm.dispatch_mouse_event_at_point(700.0, 420.0, "mousemove", -1, Some(1), 0.0, 0.0).expect("first scaled incremental thumb move should dispatch");- refresh_layout_for_test(&mut vm);+ publish_layout_for_test(&mut vm);let first_move = vm.eval("scaled.scrollTop").expect("first scaled scrollTop should evaluate")@@ -1989,7 +1994,7 @@ fn transformed_scrollbar_drag_uses_local_motion_clamps_and_cancels_on_button_los.expect("scaled captured thumb move should dispatch outside its element");vm.dispatch_mouse_event_at_point(700.0, 440.0, "mouseup", 0, Some(0), 0.0, 0.0).expect("scaled captured thumb release should dispatch");- refresh_layout_for_test(&mut vm);+ publish_layout_for_test(&mut vm);let moderate = vm.eval("scaled.scrollTop").expect("scaled scrollTop should evaluate")@@ -1999,14 +2004,14 @@ fn transformed_scrollbar_drag_uses_local_motion_clamps_and_cancels_on_button_losvm.eval("scaled.scrollTop = 0").expect("scaled scrollTop should reset");- refresh_layout_for_test(&mut vm);+ publish_layout_for_test(&mut vm);vm.dispatch_mouse_event_at_point(355.0, 400.0, "mousedown", 0, Some(1), 0.0, 0.0).expect("scaled lower-clamp thumb press should dispatch");vm.dispatch_mouse_event_at_point(700.0, 590.0, "mousemove", -1, Some(1), 0.0, 0.0).expect("scaled lower-clamp thumb move should dispatch");vm.dispatch_mouse_event_at_point(700.0, 590.0, "mouseup", 0, Some(0), 0.0, 0.0).expect("scaled lower-clamp thumb release should dispatch");- refresh_layout_for_test(&mut vm);+ publish_layout_for_test(&mut vm);assert_eq!(vm.eval("scaled.scrollTop").expect("maximum scaled scrollTop should evaluate"),@@ -2019,7 +2024,7 @@ fn transformed_scrollbar_drag_uses_local_motion_clamps_and_cancels_on_button_los.expect("scaled upper-clamp thumb move should dispatch");vm.dispatch_mouse_event_at_point(700.0, 300.0, "mouseup", 0, Some(0), 0.0, 0.0).expect("scaled upper-clamp thumb release should dispatch");- refresh_layout_for_test(&mut vm);+ publish_layout_for_test(&mut vm);assert_eq!(vm.eval("scaled.scrollTop").expect("minimum scaled scrollTop should evaluate"),@@ -2071,7 +2076,7 @@ fn document_replacement_cancels_old_scrollbar_capture_and_allows_a_new_drag() {"#,).expect("retiring scrollbar fixture should initialize");- refresh_layout_for_test(&mut vm);+ publish_layout_for_test(&mut vm);vm.dispatch_mouse_event_at_point(190.0, 30.0, "mousedown", 0, Some(1), 0.0, 0.0).expect("retiring thumb press should dispatch");@@ -2090,7 +2095,7 @@ fn document_replacement_cancels_old_scrollbar_capture_and_allows_a_new_drag() {"#,).expect("document.open should install the replacement input fixture");- refresh_layout_for_test(&mut vm);+ publish_layout_for_test(&mut vm);vm.dispatch_mouse_event_at_point(320.0, 20.0, "mousemove", -1, Some(1), 0.0, 0.0).expect("replacement-document move should dispatch normally");@@ -2111,6 +2116,7 @@ fn document_replacement_cancels_old_scrollbar_capture_and_allows_a_new_drag() {.expect("replacement thumb move should dispatch");vm.dispatch_mouse_event_at_point(190.0, 50.0, "mouseup", 0, Some(0), 0.0, 0.0).expect("replacement thumb release should dispatch");+ publish_layout_for_test(&mut vm);let replacement_scroll = vm.eval("replacementScroller.scrollTop").expect("replacement scroller state should evaluate")@@ -2156,7 +2162,7 @@ fn root_classic_scrollbars_stay_viewport_fixed_and_drive_window_scroll() {"#,).expect("root scrollbar fixture should initialize");- refresh_layout_for_test(&mut vm);+ publish_layout_for_test(&mut vm);assert_eq!(vm.eval("JSON.stringify([document.documentElement.clientWidth, document.documentElement.clientHeight, document.documentElement.scrollWidth, document.documentElement.scrollHeight])"@@ -2269,7 +2275,7 @@ fn closed_absolute_popover_does_not_expand_root_scrollable_overflow() {).expect("closed popover overflow fixture should initialize");- refresh_layout_for_test(&mut vm);+ publish_layout_for_test(&mut vm);assert_eq!(vm.eval("JSON.stringify([tip.getBoundingClientRect().width, document.documentElement.scrollWidth])").expect("closed popover geometry should evaluate"),@@ -2277,7 +2283,7 @@ fn closed_absolute_popover_does_not_expand_root_scrollable_overflow() {);vm.eval("tip.showPopover()").expect("popover should open");- refresh_layout_for_test(&mut vm);+ publish_layout_for_test(&mut vm);assert_eq!(vm.eval("JSON.stringify([tip.getBoundingClientRect().width, document.documentElement.scrollWidth])").expect("open popover geometry should evaluate"),@@ -2285,7 +2291,7 @@ fn closed_absolute_popover_does_not_expand_root_scrollable_overflow() {);vm.eval("tip.hidePopover()").expect("popover should close");- refresh_layout_for_test(&mut vm);+ publish_layout_for_test(&mut vm);assert_eq!(vm.eval("JSON.stringify([tip.getBoundingClientRect().width, document.documentElement.scrollWidth])").expect("reclosed popover geometry should evaluate"),@@ -2328,7 +2334,7 @@ fn root_scrollbar_gutters_size_the_initial_containing_block_once() {"#,).expect("percentage root overflow fixture should initialize");- refresh_layout_for_test(&mut vm);+ publish_layout_for_test(&mut vm);assert_eq!(vm.eval(@@ -2364,7 +2370,7 @@ fn root_scrollbar_gutters_size_the_initial_containing_block_once() {"#,).expect("stable root gutter fixture should initialize");- refresh_layout_for_test(&mut vm);+ publish_layout_for_test(&mut vm);assert_eq!(vm.eval(r#"@@ -2387,7 +2393,7 @@ fn root_scrollbar_gutters_size_the_initial_containing_block_once() {vm.eval("content.style.height = '1200px'").expect("stable root fixture should overflow vertically");- refresh_layout_for_test(&mut vm);+ publish_layout_for_test(&mut vm);assert_eq!(vm.eval(r#"@@ -2417,7 +2423,7 @@ fn root_scrollbar_gutters_size_the_initial_containing_block_once() {"#,).expect("RTL root scrollbar fixture should initialize");- refresh_layout_for_test(&mut vm);+ publish_layout_for_test(&mut vm);let right = crate::native_bridge::element::observable_scrollbar_hit_test(&vm._context_host.borrow(),vm.document_runtime.document_handle(),@@ -4063,7 +4069,7 @@ fn exec_command_select_all_targets_editing_host_and_skips_inert_text() {"##,).expect("document selectAll fixture should initialize");- refresh_layout_for_test(&mut vm);+ publish_layout_for_test(&mut vm);let document_result = vm.eval(r##"@@ -4101,7 +4107,7 @@ fn exec_command_select_all_targets_editing_host_and_skips_inert_text() {"##,).expect("editing-host selectAll fixture should initialize");- refresh_layout_for_test(&mut vm);+ publish_layout_for_test(&mut vm);let host_result = vm.eval(r##"@@ -4140,10 +4146,10 @@ fn exec_command_select_all_targets_editing_host_and_skips_inert_text() {fn exec_command_select_all_respects_modal_dialog_inertness() {let mut vm = new_storage_test_vm("https://exec-command-select-all-modal-dialog.test/");- let result = vm- .eval(- r##"-(() => {+ let result = eval_with_layout_publications(+ &mut vm,+ r##"+(function* () {const html = document.documentElement || document.appendChild(document.createElement("html"));const body = document.body || html.appendChild(document.createElement("body"));body.textContent = "";@@ -4159,6 +4165,7 @@ fn exec_command_select_all_respects_modal_dialog_inertness() {const selection = getSelection();dialog.showModal();+yield; // Publish this scene before reading its geometry.selection.selectAllChildren(body);const manualBodyText = selection.toString();selection.removeAllRanges();@@ -4179,6 +4186,7 @@ fn exec_command_select_all_respects_modal_dialog_inertness() {dialog.close();selection.selectAllChildren(body);+yield; // Publish this scene before reading its geometry.const afterCloseText = selection.toString();return JSON.stringify({@@ -4193,8 +4201,8 @@ fn exec_command_select_all_respects_modal_dialog_inertness() {});})()"##,- )- .expect("execCommand selectAll modal dialog inertness probe should evaluate");+ )+ .expect("execCommand selectAll modal dialog inertness probe should evaluate");assert_eq!(result,@@ -4361,7 +4369,7 @@ fn exec_command_insert_text_reuses_adjacent_text_at_element_boundaries() {fn selection_to_string_uses_rendered_native_range_projection() {let mut vm = new_storage_test_vm("https://selection-rendered-string.test/");- let result = vm+ vm.eval(r##"(() => {@@ -4415,6 +4423,7 @@ fn selection_to_string_uses_rendered_native_range_projection() {textContent: "\n beta\n"}), "\n gamma");root.append(basic, nested, container, contentHidden, inlineWhitespace);+globalThis.__readFixture = () => {const scriptStyleRange = document.createRange();scriptStyleRange.selectNode(p);const scriptStyle = selectedStringFor(scriptStyleRange).replace(/\r\n/g, "\n");@@ -4434,10 +4443,16 @@ fn selection_to_string_uses_rendered_native_range_projection() {selectContents(contentHidden),selectContents(inlineWhitespace)].join("|");+};})()"##,).expect("selection rendered string probe should evaluate");+ vm.publish_layout_for_test()+ .expect("publish prepared fixture");+ let result = vm+ .eval("__readFixture()")+ .expect("selection rendered string probe should evaluate");assert_eq!(result,@@ -4449,9 +4464,8 @@ fn selection_to_string_uses_rendered_native_range_projection() {fn selection_only_applies_inert_attribute_to_html_elements() {let mut vm = new_storage_test_vm("https://selection-html-inert-namespace.test/");- let result = vm- .eval(- r#"+ vm.eval(+ r#"(() => {const html = document.documentElement || document.appendChild(document.createElement('html'));const body = document.body || html.appendChild(document.createElement('body'));@@ -4494,15 +4508,22 @@ fn selection_only_applies_inert_attribute_to_html_elements() {htmlAncestor.appendChild(inherited.math);root.appendChild(htmlAncestor);+globalThis.__readFixture = () => {return [selectedText(own.math),selectedText(nested.math),selectedText(htmlChild),selectedText(htmlAncestor)].join('|');+};})()"#,- )+ )+ .expect("Selection inert namespace probe should evaluate");+ vm.publish_layout_for_test()+ .expect("publish prepared fixture");+ let result = vm+ .eval("__readFixture()").expect("Selection inert namespace probe should evaluate");assert_eq!(result, "math own|math ancestors||");@@ -4557,10 +4578,7 @@ fn month_and_week_inputs_do_not_support_variable_length_selection() {fn input_button_offset_width_reflects_label_value() {let mut vm = new_storage_test_vm("https://forms-input-button-width.test/");- let result = vm- .eval(- r#"- (() => {+ vm.eval(r#"const empty = document.createElement('input');empty.type = 'button';const labelled = document.createElement('input');@@ -4569,15 +4587,18 @@ fn input_button_offset_width_reflects_label_value() {const html = document.documentElement || document.appendChild(document.createElement('html'));const body = document.body || html.appendChild(document.createElement('body'));body.append(empty, labelled);- return [+"#).expect("prepare button label geometry");+ publish_layout_for_test(&mut vm);+ let result = vm+ .eval(+ r#"(() => { return [empty.value,labelled.value,empty.offsetWidth,labelled.offsetWidth,labelled.offsetWidth > empty.offsetWidth].join('|');- })()- "#,+ })()"#,).expect("button input intrinsic width should reflect its label");diff --git a/moli-renderer-v8/src/script_vm/tests/dom_elements/focus.rs b/moli-renderer-v8/src/script_vm/tests/dom_elements/focus.rsindex 5a560865a..b54b041d9 100644--- a/moli-renderer-v8/src/script_vm/tests/dom_elements/focus.rs+++ b/moli-renderer-v8/src/script_vm/tests/dom_elements/focus.rs@@ -3,7 +3,6 @@ use super::*;#[test]fn focus_prevent_scroll_controls_real_nested_scroll_container_reveal() {let mut vm = new_storage_test_vm("https://focus-prevent-scroll.test/");- vm.force_fresh_layout_reads_for_test();vm.eval(r#"@@ -24,9 +23,8 @@ fn focus_prevent_scroll_controls_real_nested_scroll_container_reveal() {.expect("focus scroll fixture should initialize");refresh_layout_for_test(&mut vm);- let result = vm- .eval(- r#"+ vm.eval(+ r#"(() => {const first = document.getElementById('first');const scroller = document.getElementById('scroller');@@ -37,12 +35,16 @@ fn focus_prevent_scroll_controls_real_nested_scroll_container_reveal() {const focused = document.activeElement === target;first.focus();target.focus();- return [prevented, focused, scroller.scrollLeft > 0, scroller.scrollTop > 0].join('|');+ window.beforeReveal = [prevented, focused];})()"#,- )- .expect("focus preventScroll probe should evaluate");+ )+ .expect("focus preventScroll probe should evaluate");+ publish_layout_for_test(&mut vm);+ let result = vm+ .eval("beforeReveal.concat(scroller.scrollLeft > 0, scroller.scrollTop > 0).join('|')")+ .unwrap();assert_eq!(result, "true|true|true|true");}@@ -50,10 +52,8 @@ fn focus_prevent_scroll_controls_real_nested_scroll_container_reveal() {fn focusing_contenteditable_in_child_frame_reveals_authored_frame_position() {let mut vm = new_storage_test_vm("https://focus-scroll.test/");- let result = vm- .eval(- r#"-(() => {+ vm.eval(+ r#"const root = document.documentElement ||document.appendChild(document.createElement('html'));const head = document.head || root.appendChild(document.createElement('head'));@@ -77,7 +77,13 @@ fn focusing_contenteditable_in_child_frame_reveals_authored_frame_position() {childDocument.write('<div id="target" contenteditable="true">target</div>');childDocument.close();const target = childDocument.getElementById('target');-+"#,+ )+ .expect("prepare child focus fixture");+ publish_layout_for_test(&mut vm);+ let result = vm+ .eval(+ r#"(() => {first.focus();target.focus();const firstX = window.scrollX;@@ -92,8 +98,7 @@ fn focusing_contenteditable_in_child_frame_reveals_authored_frame_position() {parentRetargeted: document.activeElement === frame,childFocused: childDocument.activeElement === target});-})()-"#,+})()"#,).expect("child contenteditable focus scroll probe should evaluate");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.rsindex 9499bd04c..f33190fe4 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@@ -4822,10 +4822,9 @@ fn computed_width_resolves_percent_against_parent_and_child_frame_viewport() {fn transformed_oversized_inline_iframe_uses_its_containing_block_percentage_basis() {let mut vm = new_storage_test_vm("https://inline-iframe-percentage-size.test/");- let result = vm- .eval(+ let result = eval_with_layout_publications(&mut vm,r#"-(() => {+(function* () {const html = document.documentElement || document.appendChild(document.createElement('html'));const body = document.body || html.appendChild(document.createElement('body'));const container = document.createElement('div');@@ -4834,6 +4833,7 @@ fn transformed_oversized_inline_iframe_uses_its_containing_block_percentage_basiframe.style.cssText = 'width:calc(100% / 0.8);height:50px;border:0;transform:scale(0.8);transform-origin:0 0';container.appendChild(frame);body.appendChild(container);+ yield; // Publish this scene before reading its geometry.const rect = frame.getBoundingClientRect();return [frame.offsetWidth,@@ -5284,12 +5284,11 @@ fn held_main_document_computed_styles_follow_repeated_viewport_surface_changes()#[test]fn cached_child_viewport_units_update_after_the_iframe_viewport_changes() {let mut vm = new_storage_test_vm("https://cached-child-viewport-units.test/");- vm.force_fresh_layout_reads_for_test();- let before = vm- .eval(- r#"-(() => {+ let before = eval_with_layout_publications(+ &mut vm,+ r#"+(function* () {const frame = document.createElement('iframe');frame.id = 'cached-viewport-unit-frame';frame.style.cssText = 'width:200px;height:160px';@@ -5313,6 +5312,7 @@ fn cached_child_viewport_units_update_after_the_iframe_viewport_changes() {childDocument.close();const target = childDocument.getElementById('target');const held = childWindow.getComputedStyle(target);+yield; // Publish this scene before reading its geometry.frame.getBoundingClientRect();globalThis.__cachedViewportUnitFixture = { frame, childWindow, target, held };return [@@ -5325,19 +5325,20 @@ fn cached_child_viewport_units_update_after_the_iframe_viewport_changes() {].join('|');})()"#,- )- .expect("the child viewport-unit style should be cached before resize");+ )+ .expect("the child viewport-unit style should be cached before resize");assert_eq!(before, "200|160|20px|16px|18px|100px");let child_document = child_document_handle_for_frame_id(&vm, "cached-viewport-unit-frame");let updates = vm.retained_style_system_update_count_for_document_for_test(child_document);- let after = vm- .eval(- r#"-(() => {+ let after = eval_with_layout_publications(+ &mut vm,+ r#"+(function* () {const { frame, childWindow, target, held } = __cachedViewportUnitFixture;frame.style.width = '100px';frame.style.height = '80px';+yield; // Publish this scene before reading its geometry.const frameWidth = frame.getBoundingClientRect().width;const heldValues = [held.width, held.height, held.paddingLeft, held.left];const fresh = childWindow.getComputedStyle(target);@@ -5351,8 +5352,8 @@ fn cached_child_viewport_units_update_after_the_iframe_viewport_changes() {].join('|');})()"#,- )- .expect("the same cached child element should observe the resized iframe viewport");+ )+ .expect("the same cached child element should observe the resized iframe viewport");assert_eq!(after, "100|100|80|10px|8px|13px|50px|10px|8px");assert_eq!(vm.retained_style_system_update_count_for_document_for_test(child_document),@@ -5364,7 +5365,6 @@ fn cached_child_viewport_units_update_after_the_iframe_viewport_changes() {#[test]fn nested_iframe_cached_viewport_units_follow_recursive_frame_resizes() {let mut vm = new_storage_test_vm("https://nested-cached-viewport-units.test/");- vm.force_fresh_layout_reads_for_test();let before = vm.eval(@@ -5671,10 +5671,10 @@ fn child_document_mixed_style_observations_do_not_churn_the_retained_world() {#[test]fn layout_publishes_authoritative_iframe_viewport_without_style_world_ping_pong() {let mut vm = new_storage_test_vm("https://authoritative-child-style-viewport.test/");- let result = vm- .eval(- r#"-(() => {+ let result = eval_with_layout_publications(+ &mut vm,+ r#"+(function* () {const frame = document.createElement('iframe');frame.id = 'authoritative-style-viewport-frame';frame.style.cssText = [@@ -5699,14 +5699,15 @@ fn layout_publishes_authoritative_iframe_viewport_without_style_world_ping_pong(childDocument.close();const beforeLayout = childWindow.getComputedStyle(childDocument.body).color;+yield; // Publish this scene before reading its geometry.const frameWidth = frame.getBoundingClientRect().width;const afterLayout = childWindow.getComputedStyle(childDocument.body).color;globalThis.__authoritativeStyleViewport = { frame, childWindow, childDocument };return [beforeLayout, frameWidth, childWindow.innerWidth, afterLayout].join('|');})()"#,- )- .expect("layout should publish an exact iframe content viewport");+ )+ .expect("layout should publish an exact iframe content viewport");assert_eq!(result, "rgb(200, 0, 0)|200|140|rgb(0, 140, 0)");let child_document =@@ -5851,10 +5852,10 @@ fn nested_child_mixed_style_observations_keep_each_document_viewport() {fn child_window_and_mock_root_geometry_use_iframe_viewport() {let mut vm = new_storage_test_vm("https://child-window-viewport.test/");- let before = vm- .eval(- r#"-(() => {+ let before = eval_with_layout_publications(+ &mut vm,+ r#"+(function* () {const frame = document.createElement('iframe');frame.id = 'viewport-frame';frame.style.width = '300px';@@ -5879,11 +5880,12 @@ fn child_window_and_mock_root_geometry_use_iframe_viewport() {root.height].join('|');};+yield; // Publish this scene before reading its geometry.return snapshot();})()"#,- )- .expect("initial child Window viewport and root geometry should evaluate");+ )+ .expect("initial child Window viewport and root geometry should evaluate");assert_eq!(before, "300|65|true|300|65|300|65");vm.eval(@@ -5897,7 +5899,7 @@ fn child_window_and_mock_root_geometry_use_iframe_viewport() {"#,).expect("child frame resize should evaluate");- refresh_layout_for_test(&mut vm);+ publish_layout_for_test(&mut vm);let after = vm.eval(r#"@@ -6665,10 +6667,8 @@ fn computed_width_preserves_values_without_used_width() {fn box_metrics_use_computed_display_and_real_used_sizes() {let mut vm = new_storage_test_vm("https://box-metrics-computed-style.test/");- let result = vm- .eval(- r#"-(() => {+ vm.eval(+ r#"const html = document.documentElement || document.appendChild(document.createElement('html'));const head = document.head || html.appendChild(document.createElement('head'));const body = document.body || html.appendChild(document.createElement('body'));@@ -6689,7 +6689,13 @@ fn box_metrics_use_computed_display_and_real_used_sizes() {const hidden = document.getElementById('hidden');const matched = document.getElementById('matched');const unmatched = document.getElementById('unmatched');- return [+"#,+ )+ .expect("prepare geometry fixture");+ publish_layout_for_test(&mut vm);+ let result = vm+ .eval(+ r#"[getComputedStyle(hidden).display,hidden.offsetWidth,hidden.offsetHeight,@@ -6706,9 +6712,7 @@ fn box_metrics_use_computed_display_and_real_used_sizes() {getComputedStyle(unmatched).height,unmatched.offsetHeight,unmatched.getBoundingClientRect().width- ].join('|');-})()-"#,+ ].join('|')"#,).expect("box metrics should consume simple computed style facts");@@ -6719,7 +6723,7 @@ fn box_metrics_use_computed_display_and_real_used_sizes() {}#[test]-fn box_metric_materializes_one_style_world_update_for_nested_resolution() {+fn box_metric_reads_published_nested_geometry_without_updating_styles() {let mut vm = new_storage_test_vm("https://box-metric-style-snapshot.test/");vm.eval(@@ -6748,6 +6752,7 @@ fn box_metric_materializes_one_style_world_update_for_nested_resolution() {"#,).expect("nested box-metric fixture should initialize");+ publish_layout_for_test(&mut vm);let update_materializations_before = vm._context_host.borrow()@@ -6764,8 +6769,8 @@ fn box_metric_materializes_one_style_world_update_for_nested_resolution() {.style_world_update_materializations_for_test().saturating_sub(update_materializations_before);assert_eq!(- update_materializations, 1,- "one synchronous box metric must materialize one style-world update"+ update_materializations, 0,+ "a geometry read must not materialize a style-world update");}@@ -6809,10 +6814,8 @@ body.appendChild(target);fn box_metrics_round_fractional_computed_px_values() {let mut vm = new_storage_test_vm("https://box-metrics-fractional-style.test/");- let result = vm- .eval(- r#"-(() => {+ vm.eval(+ r#"const html = document.documentElement || document.appendChild(document.createElement('html'));const head = document.head || html.appendChild(document.createElement('head'));const body = document.body || html.appendChild(document.createElement('body'));@@ -6823,7 +6826,13 @@ fn box_metrics_round_fractional_computed_px_values() {head.appendChild(style);body.innerHTML = `<div id="fractional"></div>`;const fractional = document.getElementById('fractional');- return [+"#,+ )+ .expect("prepare geometry fixture");+ publish_layout_for_test(&mut vm);+ let result = vm+ .eval(+ r#"[fractional.offsetWidth,fractional.clientWidth,fractional.scrollWidth,@@ -6832,9 +6841,7 @@ fn box_metrics_round_fractional_computed_px_values() {fractional.scrollHeight,fractional.getBoundingClientRect().width,fractional.getBoundingClientRect().height- ].join('|');-})()-"#,+ ].join('|')"#,).expect("box metrics should round fractional computed px values");@@ -6872,13 +6879,15 @@ fn layout_resolves_a_deep_percentage_width_chain_to_zero() {fn document_open_replacement_clears_inline_style_state() {let mut vm = new_storage_test_vm("https://document-open-style-state.test/");+ vm.eval("const fixtureRoot = document.documentElement || document.appendChild(document.createElement('html')); const fixtureBody = document.body || fixtureRoot.appendChild(document.createElement('body')); fixtureBody.innerHTML = '<div id=before style=display:block>before</div>'").expect("prepare replacement fixture");+ publish_layout_for_test(&mut vm);let result = vm.eval(r#"(() => {const html = document.documentElement || document.appendChild(document.createElement('html'));const body = document.body || html.appendChild(document.createElement('body'));- body.innerHTML = '<div id="before" style="display:none">before</div>';+const before = document.getElementById('before');before.style.display = 'block';const beforeStyle = before.style;@@ -6906,6 +6915,8 @@ fn isolated_document_open_replacement_clears_inline_style_state() {.create_isolated_world("playwright-utility-replacement", false).expect("isolated world should be created");+ vm.eval("const fixtureRoot = document.documentElement || document.appendChild(document.createElement('html')); const fixtureBody = document.body || fixtureRoot.appendChild(document.createElement('body')); fixtureBody.innerHTML = '<div id=before style=display:block>before</div>'").expect("prepare replacement fixture");+ publish_layout_for_test(&mut vm);let result = vm.eval_in_isolated_context(context_id,@@ -6913,7 +6924,7 @@ fn isolated_document_open_replacement_clears_inline_style_state() {(() => {const html = document.documentElement || document.appendChild(document.createElement('html'));const body = document.body || html.appendChild(document.createElement('body'));- body.innerHTML = '<div id="before" style="display:none">before</div>';+const before = document.getElementById('before');before.style.display = 'block';const beforeStyle = before.style;@@ -6955,6 +6966,7 @@ setTimeout(() => { document.getElementById('before').style.display = 'block'; },.await.expect("timer style mutation should drain");+ publish_layout_for_test(&mut vm);let warmed = vm.eval(r#"@@ -7541,10 +7553,8 @@ fn computed_insets_absolutize_font_relative_lengths() {fn computed_positioned_insets_resolve_percentages_against_containing_block() {let mut vm = new_storage_test_vm("https://computed-inset-percent.test/");- let result = vm- .eval(- r#"-(() => {+ vm.eval(+ r#"const wrapper = document.createElement('div');wrapper.style.cssText = 'height: 20px; width: 40px; padding: 1px 2px';const target = document.createElement('div');@@ -7552,10 +7562,12 @@ fn computed_positioned_insets_resolve_percentages_against_containing_block() {wrapper.appendChild(target);(document.body || document.documentElement || document).appendChild(wrapper);const computed = getComputedStyle(target);- return `${computed.top}|${computed.left}`;-})()"#,- )+ )+ .expect("prepare geometry fixture");+ publish_layout_for_test(&mut vm);+ let result = vm+ .eval(r#"`${computed.top}|${computed.left}`"#).expect("computed positioned insets should resolve percentages");assert_eq!(result, "2px|8px");@@ -7584,10 +7596,8 @@ fn computed_relative_auto_insets_resolve_against_opposite_side() {fn computed_absolute_auto_insets_resolve_against_containing_block() {let mut vm = new_storage_test_vm("https://computed-absolute-auto-inset.test/");- let result = vm- .eval(- r#"-(() => {+ vm.eval(+ r#"const wrapper = document.createElement('div');wrapper.style.cssText = 'position: relative; height: 20px; width: 40px';const target = document.createElement('div');@@ -7595,10 +7605,12 @@ fn computed_absolute_auto_insets_resolve_against_containing_block() {wrapper.appendChild(target);(document.body || document.documentElement || document).appendChild(wrapper);const computed = getComputedStyle(target);- return `${computed.top}|${computed.right}|${computed.bottom}|${computed.left}`;-})()"#,- )+ )+ .expect("prepare geometry fixture");+ publish_layout_for_test(&mut vm);+ let result = vm+ .eval(r#"`${computed.top}|${computed.right}|${computed.bottom}|${computed.left}`"#).expect("computed absolute auto insets should resolve against the containing block");assert_eq!(result, "17px|4px|3px|36px");@@ -10152,10 +10164,10 @@ fn shadow_styles_scope_and_inherit_host_font_size() {fn child_document_shadow_visibility_offsets_match_rendered_wpt_probe() {let mut vm = new_storage_test_vm("https://shadow-style-offset-wpt-probe.test/");- let result = vm- .eval(- r#"-(() => {+ let result = eval_with_layout_publications(+ &mut vm,+ r#"+(function* () {if (!document.documentElement) {document.appendChild(document.createElement('html'));}@@ -10191,6 +10203,7 @@ fn child_document_shadow_visibility_offsets_match_rendered_wpt_probe() {shadowHidden.className = 'shadow-only-hidden';shadowStyleRoot.appendChild(shadowHidden);+yield; // Publish this scene before reading its geometry.return JSON.stringify({documentStyleDoesNotEnterShadow:frame.contentWindow.getComputedStyle(shadowVisible).display !== 'none',@@ -10206,8 +10219,8 @@ fn child_document_shadow_visibility_offsets_match_rendered_wpt_probe() {});})()"#,- )- .expect("child document shadow style visibility offsets should evaluate");+ )+ .expect("child document shadow style visibility offsets should evaluate");assert_eq!(result,@@ -10521,7 +10534,7 @@ fn tab_key_respects_reading_flow_display_contents_items() {#[tokio::test]async fn css_transition_state_uses_final_values_without_runtime_events() {let loader = ResourceRequestClient::new(&moli_fetch::FetchConfig::default()).expect("loader");- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://move-before-transition-state.test/",r#"<html><head></head><body></body></html>"#,);@@ -10571,6 +10584,7 @@ async fn css_transition_state_uses_final_values_without_runtime_events() {.await.expect("transition timers should drain");+ publish_layout_for_test(&mut vm);let result = vm.eval(r#"@@ -10605,7 +10619,7 @@ async fn css_transition_state_uses_final_values_without_runtime_events() {#[tokio::test]async fn invalid_move_before_does_not_run_plain_transition_runtime() {let loader = ResourceRequestClient::new(&moli_fetch::FetchConfig::default()).expect("loader");- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://move-before-invalid-transition.test/",r#"<html><head></head><body></body></html>"#,);@@ -10637,6 +10651,7 @@ async fn invalid_move_before_does_not_run_plain_transition_runtime() {.await.expect("plain transition timers should drain");+ publish_layout_for_test(&mut vm);let result = vm.eval(r#"@@ -10664,7 +10679,7 @@ async fn invalid_move_before_does_not_run_plain_transition_runtime() {#[tokio::test]async fn zero_duration_transform_transition_applies_final_layout_geometry() {let loader = ResourceRequestClient::new(&moli_fetch::FetchConfig::default()).expect("loader");- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://zero-duration-transform-transition.test/",r#"<html><head></head><body></body></html>"#,);@@ -10698,6 +10713,7 @@ async fn zero_duration_transform_transition_applies_final_layout_geometry() {.await.expect("zero-duration transform transition timers should drain");+ publish_layout_for_test(&mut vm);let result = vm.eval(r#"@@ -10758,6 +10774,7 @@ async fn child_content_document_created_elements_use_transition_final_state() {.await.expect("child document transition timers should drain");+ publish_layout_for_test(&mut vm);let result = vm.eval(r#"@@ -12799,16 +12816,14 @@ fn computed_style_serializes_animation_range_shorthand() {}#[test]fn mouse_event_offsets_follow_retargeted_shadow_targets() {- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://shadow-mouse-offset.test/",r#"<html><head></head><body></body></html>"#,);- vm.force_fresh_layout_reads_for_test();- let result = vm- .eval(+ let result = eval_with_layout_publications(&mut vm,r#"-(() => {+(function* () {const pageStyle = document.createElement('style');pageStyle.textContent ='html, body { padding: 0; margin: 0; } ' +@@ -12850,6 +12865,7 @@ fn mouse_event_offsets_follow_retargeted_shadow_targets() {light.innerHTML ='<style>' + shadowStyle + '</style><div id="container"><span id="target">Click</span></div>';const lightTarget = light.querySelector('#target');+yield; // Publish this scene before reading its geometry.const lightTargetOffsetTop = lightTarget.offsetTop;const lightContainer = light.querySelector('#container');const lightLogs = attachLoggers([lightTarget, lightContainer, light, document.body], 'light-down');@@ -12892,6 +12908,7 @@ fn mouse_event_offsets_follow_retargeted_shadow_targets() {'<style>' + shadowStyle + '</style><div id="container"><span id="target">Click</span></div>';const closedTarget = root.querySelector('#target');const closedContainer = root.querySelector('#container');+yield; // Publish this scene before reading its geometry.const closedLogs = attachLoggers([closedTarget, closedContainer, root, closed, document.body], 'closed-down');closedTarget.dispatchEvent(new MouseEvent('closed-down', {clientX: 51.4,@@ -12913,6 +12930,7 @@ fn mouse_event_offsets_follow_retargeted_shadow_targets() {'<style>' + shadowStyle + '</style><div id="target">Click</div>';const slottedTarget = slotted.querySelector('#target');const slottedContainer = slottedRoot.querySelector('#container');+ yield; // Publish the slotted scene before dispatching geometry-dependent events.const slottedLogs = attachLoggers([slottedTarget,slottedContainer,diff --git a/moli-renderer-v8/src/script_vm/tests/dom_xhr/computed_style/child_list.rs b/moli-renderer-v8/src/script_vm/tests/dom_xhr/computed_style/child_list.rsindex b5ba44485..cc5e6c5d0 100644--- a/moli-renderer-v8/src/script_vm/tests/dom_xhr/computed_style/child_list.rs+++ b/moli-renderer-v8/src/script_vm/tests/dom_xhr/computed_style/child_list.rs@@ -2,7 +2,7 @@ use super::*;#[test]fn removed_source_with_moved_old_neighbor_invalidates_remaining_target() {- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://moved-old-neighbor.test/",r#"<!doctype html><style>.target { color: blue; }@@ -28,18 +28,18 @@ fn removed_source_with_moved_old_neighbor_invalidates_remaining_target() {#[test]fn sibling_move_between_shadow_roots_invalidates_both_style_scopes() {- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://cross-shadow-sibling-move.test/","<!doctype html><div id=old></div><div id=new></div>",);- let result = vm- .eval(- r#"(() => {+ let result = eval_with_layout_publications(&mut vm,+ r#"(function* () {const oldRoot = document.getElementById('old').attachShadow({mode:'open'});const newRoot = document.getElementById('new').attachShadow({mode:'open'});const css = '<style>.target { color: blue; } .source ~ .target { color: red; }</style>';oldRoot.innerHTML = css + '<span class=source>A</span><span class=target>B</span>';newRoot.innerHTML = css + '<span class=target>C</span>';+yield; // Publish this scene before reading its geometry.const oldTarget = oldRoot.querySelector('.target');const newTarget = newRoot.querySelector('.target');const oldStyle = getComputedStyle(oldTarget);@@ -59,7 +59,7 @@ fn sibling_move_between_shadow_roots_invalidates_both_style_scopes() {#[test]fn detached_then_reinserted_sibling_does_not_reuse_queued_old_links() {- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://two-step-sibling-move.test/",r#"<!doctype html><style>.target { color: blue; }@@ -85,7 +85,7 @@ fn detached_then_reinserted_sibling_does_not_reuse_queued_old_links() {#[test]fn inner_text_and_held_style_update_after_sibling_reorder() {- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://sibling-reorder.test/",r#"<!doctype html><style>.target { color: blue; }@@ -112,7 +112,7 @@ fn inner_text_and_held_style_update_after_sibling_reorder() {#[test]fn relative_selector_updates_after_backward_sibling_reorder() {- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://backward-sibling-reorder.test/",r#"<!doctype html><style>.source { color: blue; }@@ -139,7 +139,7 @@ fn relative_selector_updates_after_backward_sibling_reorder() {#[test]fn sibling_move_between_parents_invalidates_old_and_new_targets() {- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://cross-parent-sibling-move.test/",r#"<!doctype html><style>.target { color: blue; }@@ -171,7 +171,7 @@ fn sibling_move_between_parents_invalidates_old_and_new_targets() {#[test]fn batched_sibling_reorders_update_adjacent_and_general_sibling_styles() {- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://batched-sibling-reorder.test/",r#"<!doctype html><style>.target { color: blue; background-color: white; }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.rsindex 1a1b8c3a8..b83fbaac3 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@@ -2327,7 +2327,7 @@ fn dom_parser_detached_event_handler_properties_dispatch_through_local_events()}#[test]fn document_point_queries_use_real_paint_order_geometry() {- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://document-point-query.test/path/index.html",r#"<html><body><div id="target" style="width:100px;height:50px">target</div>@@ -2353,34 +2353,35 @@ fn document_point_queries_use_real_paint_order_geometry() {#[test]fn parser_coalesced_style_text_updates_main_and_child_hit_tests() {- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://parser-style-hit-test.test/","<!doctype html><body></body>",);- let result = vm- .eval(- r#"-(() => {- function exercise(w) {+ let result = eval_with_layout_publications(+ &mut vm,+ r#"+(function* () {+ function* exercise(w) {const d = w.document;d.open();d.write('<!doctype html><style>\n');d.write('html, body {margin:0;padding:0} #target {width:100px;height:100px}');d.write('</style><body><div id=target></div>');+yield; // Publish this scene before reading its geometry.const rect = d.getElementById('target').getBoundingClientRect();const result = {rect:[rect.x,rect.y,rect.width,rect.height],hits:d.elementsFromPoint(1,1).map(e => e.id || e.localName)};d.close();return result;}- const main = exercise(window);+ const main = yield* exercise(window);const frame = document.body.appendChild(document.createElement('iframe'));- const child = exercise(frame.contentWindow);+ const child = yield* exercise(frame.contentWindow);return JSON.stringify([main,child]);})()"#,- )- .expect("coalesced parser text must update its stylesheet before layout queries");+ )+ .expect("coalesced parser text must update its stylesheet before layout queries");let expected = serde_json::json!({"rect":[0,0,100,100], "hits":["target","body","html"]});assert_eq!(serde_json::from_str::<serde_json::Value>(&result).unwrap(),@@ -2422,10 +2423,10 @@ fn parser_coalesced_text_notifies_main_and_child_mutation_observers() {);}#[test]-fn point_queries_refresh_geometry_only_when_viewport_changes() {+fn point_queries_only_follow_explicit_viewport_publication() {use moli_layout::{- GeometryProvider, LayoutFlushReason, LayoutPoint, LayoutQuery, LayoutQueryAnswer,- LayoutQueryBatch, LayoutViewport,+ GeometryProvider, LayoutPoint, LayoutQuery, LayoutQueryAnswer, LayoutQueryBatch,+ LayoutViewport,};let mut vm = new_parsed_test_vm(@@ -2464,13 +2465,12 @@ fn point_queries_refresh_geometry_only_when_viewport_changes() {(100, false, 2),(320, true, 3),] {- let answers = GeometryProvider::answer(- &mut *vm,- LayoutFlushReason::HitTest,- LayoutViewport::new(width, 200, 1.0),- &batch,- )- .expect("point query batch");+ if vm.layout_pass_observability_for_test().1 < before + expected_passes {+ vm.screenshot_layout_snapshot(LayoutViewport::new(width, 200, 1.0))+ .unwrap()+ .unwrap();+ }+ let answers = GeometryProvider::answer(&mut *vm, &batch).expect("point query batch");assert_eq!(answers.answers[0], LayoutQueryAnswer::HitTest(None));assert_eq!(answers.answers[1],@@ -2492,16 +2492,16 @@ fn point_queries_refresh_geometry_only_when_viewport_changes() {assert_eq!(vm.layout_pass_observability_for_test().1,before + expected_passes,- "viewport changes refresh geometry; same-viewport queries reuse it"+ "only explicit output publishes the changed viewport");}}#[test]-fn point_queries_refresh_geometry_when_viewport_expands() {+fn point_queries_follow_explicit_output_when_viewport_expands() {use moli_layout::{- GeometryProvider, LayoutFlushReason, LayoutPoint, LayoutQuery, LayoutQueryAnswer,- LayoutQueryBatch, LayoutViewport,+ GeometryProvider, LayoutPoint, LayoutQuery, LayoutQueryAnswer, LayoutQueryBatch,+ LayoutViewport,};for (initial_size, expanded_size, point) in [@@ -2530,13 +2530,13 @@ fn point_queries_refresh_geometry_when_viewport_expands() {(expanded_size, true, 2),(expanded_size, true, 2),] {- let answers = GeometryProvider::answer(- &mut *vm,- LayoutFlushReason::HitTest,- LayoutViewport::new(width, height, 1.0),- &batch,- )- .expect("point query batch after viewport expansion");+ if vm.layout_pass_observability_for_test().1 < before + expected_passes {+ vm.screenshot_layout_snapshot(LayoutViewport::new(width, height, 1.0))+ .unwrap()+ .unwrap();+ }+ let answers = GeometryProvider::answer(&mut *vm, &batch)+ .expect("point query batch after viewport expansion");assert_eq!(matches!(answers.answers[0], LayoutQueryAnswer::HitTest(Some(_))),expect_hit,@@ -2553,20 +2553,26 @@ fn point_queries_refresh_geometry_when_viewport_expands() {assert_eq!(vm.layout_pass_observability_for_test().1,before + expected_passes,- "expansion must rebuild once; repeated queries reuse the expanded tree"+ "the explicit output builds once; repeated queries consume its tree");}}}#[test]-fn document_point_queries_refresh_responsive_geometry_after_viewport_resize() {+fn document_point_queries_retain_published_geometry_after_viewport_resize() {let mut vm = new_parsed_test_vm("https://document-point-query-viewport-expansion.test/","<html><body style='margin:0'><div id='target' style='width:50vw;height:100px'></div></body></html>",);let before = vm.layout_pass_observability_for_test().1;let mut completed_passes = before;+ let mut published = "[false,false,0]".to_owned();+ let query = r#"JSON.stringify([+ document.elementFromPoint(75, 20)?.id === 'target',+ document.elementsFromPoint(75, 20).some(element => element.id === 'target'),+ document.getElementById('target').getBoundingClientRect().width+ ])"#;for (width, expected, expected_passes) in [(100, "[false,false,50]", 1),(320, "[true,true,160]", 2),@@ -2586,27 +2592,29 @@ fn document_point_queries_refresh_responsive_geometry_after_viewport_resize() {completed_passes,"changing the viewport alone must not trigger layout");+ 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))+ .unwrap()+ .unwrap();+ }let result = vm- .eval(- r#"JSON.stringify([- document.elementFromPoint(75, 20)?.id === 'target',- document.elementsFromPoint(75, 20).some(element => element.id === 'target'),- document.getElementById('target').getBoundingClientRect().width- ])"#,- )+ .eval(query).expect("document point queries after viewport resize");assert_eq!(result, expected, "viewport width {width}");assert_eq!(vm.layout_pass_observability_for_test().1,before + expected_passes,- "both expanding and shrinking refresh the viewport-dependent geometry"+ "only explicit output refreshes the viewport-dependent geometry");completed_passes = before + expected_passes;+ published = result;}}#[test]-fn geometry_queries_refresh_after_screen_and_resolution_environment_changes() {+fn geometry_queries_retain_published_screen_and_resolution_environment() {// Exercise each entry point without first warming the other layout mode.for hit_test in [false, true] {let mut vm = new_parsed_test_vm(@@ -2626,6 +2634,7 @@ fn geometry_queries_refresh_after_screen_and_resolution_environment_changes() {..Default::default()};let before = vm.layout_pass_observability_for_test().1;+ let mut published_width = "0".to_owned();for (screen_width, screen_height, dpr, expected_width, expected_passes) in [(1920, 1080, 1.0, 100, 1),(1280, 1080, 1.0, 200, 2),@@ -2653,6 +2662,19 @@ fn geometry_queries_refresh_after_screen_and_resolution_environment_changes() {passes,"an environment update alone must not trigger layout");+ 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 {+ vm.screenshot_layout_snapshot(moli_layout::LayoutViewport::new(+ 800, 600, dpr as f32,+ ))+ .unwrap()+ .unwrap();+ }let result = vm.eval(if hit_test {r#"JSON.stringify([@@ -2664,6 +2686,7 @@ fn geometry_queries_refresh_after_screen_and_resolution_environment_changes() {"String(document.getElementById('target').getBoundingClientRect().width)"}).expect("geometry query after screen environment update");+ published_width = expected_width.to_string();let hit = expected_width == 200;let expected = if hit_test {format!("[{hit},{hit},{expected_width}]")@@ -2677,14 +2700,14 @@ fn geometry_queries_refresh_after_screen_and_resolution_environment_changes() {assert_eq!(vm.layout_pass_observability_for_test().1,before + expected_passes,- "screen/resolution changes refresh once; unchanged style inputs reuse the tree"+ "screen/resolution changes become visible only after explicit output");}}}#[test]-fn geometry_queries_refresh_after_media_environment_changes() {+fn geometry_queries_retain_published_media_environment() {use crate::protocol_types::EmulatedMediaOverrides;for overrides in [@@ -2713,6 +2736,7 @@ fn geometry_queries_refresh_after_media_environment_changes() {);let defaults = EmulatedMediaOverrides::default();let before = vm.layout_pass_observability_for_test().1;+ let mut published_width = "0".to_owned();for (environment, expected_width, expected_passes) in [(&defaults, 100, 1),(&overrides, 200, 2),@@ -2722,6 +2746,17 @@ fn geometry_queries_refresh_after_media_environment_changes() {let passes = vm.layout_pass_observability_for_test().1;vm.set_emulated_media(environment);assert_eq!(vm.layout_pass_observability_for_test().1, passes);+ 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 {+ vm.screenshot_layout_snapshot(moli_layout::LayoutViewport::new(800, 600, 1.0))+ .unwrap()+ .unwrap();+ }let result = vm.eval(r#"JSON.stringify([@@ -2730,6 +2765,7 @@ fn geometry_queries_refresh_after_media_environment_changes() {])"#,).expect("geometry query after media environment update");+ published_width = expected_width.to_string();assert_eq!(result,format!("[{},{}]", expected_width == 200, expected_width)@@ -2737,7 +2773,7 @@ fn geometry_queries_refresh_after_media_environment_changes() {assert_eq!(vm.layout_pass_observability_for_test().1,before + expected_passes,- "media changes refresh once; repeated queries reuse the new environment"+ "media changes become visible only after explicit output");}}@@ -2745,7 +2781,7 @@ fn geometry_queries_refresh_after_media_environment_changes() {#[test]fn document_point_queries_parse_webidl_coordinates() {- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://document-point-query-webidl.test/path/index.html",r#"<html><body><div id="target" style="width:100px;height:50px">target</div>@@ -2795,7 +2831,7 @@ fn document_point_queries_parse_webidl_coordinates() {}#[test]fn shadow_root_point_queries_retarget_real_layout_hits_to_the_tree_scope() {- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://shadow-root-point-query.test/path/index.html",r#"<html><head><style>html, body { margin: 0; }@@ -2803,13 +2839,14 @@ fn shadow_root_point_queries_retarget_real_layout_hits_to_the_tree_scope() {</style></head><body><div id="host"></div></body></html>"#,);- let result = vm- .eval(- r#"-(() => {+ let result = eval_with_layout_publications(+ &mut vm,+ r#"+(function* () {const host = document.getElementById('host');const shadow = host.attachShadow({ mode: 'closed' });shadow.innerHTML = '<span id="inside">text</span>';+yield; // Publish this scene before reading its geometry.return [document.elementFromPoint(1, 1)?.id,document.elementsFromPoint(1, 1).map(element => element.id || element.localName).join(','),@@ -2818,8 +2855,8 @@ fn shadow_root_point_queries_retarget_real_layout_hits_to_the_tree_scope() {].join('|');})()"#,- )- .expect("shadow root point queries should evaluate");+ )+ .expect("shadow root point queries should evaluate");assert_eq!(result, "host|host,body,html|inside|inside,host,body,html");}@@ -4660,7 +4697,7 @@ fn data_transfer_declared_slots_ignore_prototype_spoofing() {fn data_transfer_directory_entries_use_private_slots_for_reflection_and_spoofing() {use crate::runtime::{RendererDragData, RendererDraggedDirectory, RendererDraggedFile};- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://data-transfer-directory-slots.test/",r#"<html><body><div id="drop" style="width: 100px; height: 100px">drop</div></body></html>"#,);@@ -5047,7 +5084,7 @@ fn data_transfer_file_list_reference_tracks_item_mutations() {#[test]fn mouse_dragstart_bubbles_to_window_once() {- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://dragstart-bubbles-once.test/",r#"<html><body><div id="drag" draggable="true">drag</div></body></html>"#,);@@ -5069,7 +5106,7 @@ fn mouse_dragstart_bubbles_to_window_once() {).expect("dragstart listener setup should evaluate");- vm.eval("document.elementFromPoint(0, 0)")+ vm.publish_layout_for_test().expect("publish geometry before coordinate input");vm.dispatch_mouse_event_at_point(20.0, 20.0, "mousedown", 0, None, 0.0, 0.0)@@ -5089,7 +5126,7 @@ fn mouse_dragstart_bubbles_to_window_once() {#[test]fn mouse_drop_requires_prevented_dragover() {- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://drop-requires-prevented-dragover.test/",r#"<html><body><div id="drag" draggable="true">drag</div></body></html>"#,);@@ -5118,7 +5155,7 @@ fn mouse_drop_requires_prevented_dragover() {).expect("drag listener setup should evaluate");- vm.eval("document.elementFromPoint(0, 0)")+ vm.publish_layout_for_test().expect("publish geometry before coordinate input");vm.dispatch_mouse_event_at_point(20.0, 20.0, "mousedown", 0, None, 0.0, 0.0)@@ -5161,7 +5198,7 @@ fn mouse_drop_requires_prevented_dragover() {#[test]fn mouse_dragstart_prevent_default_cancels_drag_session() {- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://dragstart-prevent-default-cancels.test/",r#"<html><body><div id="drag" draggable="true">drag</div></body></html>"#,);@@ -5188,7 +5225,7 @@ fn mouse_dragstart_prevent_default_cancels_drag_session() {).expect("drag cancel listener setup should evaluate");- vm.eval("document.elementFromPoint(0, 0)")+ vm.publish_layout_for_test().expect("publish geometry before coordinate input");vm.dispatch_mouse_event_at_point(20.0, 20.0, "mousedown", 0, None, 0.0, 0.0)@@ -5210,7 +5247,7 @@ fn mouse_dragstart_prevent_default_cancels_drag_session() {#[test]fn mouse_dispatch_emits_pointer_event_properties() {- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://pointer-event-properties.test/",r#"<html><body><button id="target">tap</button></body></html>"#,);@@ -5240,7 +5277,7 @@ fn mouse_dispatch_emits_pointer_event_properties() {).expect("pointer listener setup should evaluate");- vm.eval("document.elementFromPoint(0, 0)")+ vm.publish_layout_for_test().expect("publish geometry before coordinate input");vm.dispatch_mouse_event_at_point_with_pointer(@@ -5295,7 +5332,7 @@ fn mouse_dispatch_emits_pointer_event_properties() {#[test]fn canceled_pointerdown_suppresses_compat_mouse_events_but_keeps_click() {- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://pointerdown-suppresses-compat-mouse.test/",r#"<html><body><button id="target">tap</button></body></html>"#,);@@ -5317,7 +5354,7 @@ fn canceled_pointerdown_suppresses_compat_mouse_events_but_keeps_click() {).expect("compat suppression listener setup should evaluate");- vm.eval("document.elementFromPoint(0, 0)")+ vm.publish_layout_for_test().expect("publish geometry before coordinate input");vm.dispatch_mouse_event_at_point(20.0, 20.0, "mousedown", 0, None, 0.0, 0.0)@@ -5333,7 +5370,7 @@ fn canceled_pointerdown_suppresses_compat_mouse_events_but_keeps_click() {#[test]fn pointer_capture_routes_mouse_pointer_until_pointerup() {- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://pointer-capture-routes-mouse.test/",r#"<html><body><div id="target0">first</div><div id="target1">second</div></body></html>"#,);@@ -5367,7 +5404,7 @@ fn pointer_capture_routes_mouse_pointer_until_pointerup() {).expect("pointer capture listener setup should evaluate");- vm.eval("document.elementFromPoint(0, 0)")+ vm.publish_layout_for_test().expect("publish geometry before coordinate input");vm.dispatch_mouse_event_at_point(10.0, 11.0, "mousedown", 0, None, 0.0, 0.0)@@ -5388,7 +5425,7 @@ fn pointer_capture_routes_mouse_pointer_until_pointerup() {#[test]fn pointer_capture_lost_dispatches_before_compat_mouseup() {- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://pointer-capture-lost-before-mouseup.test/",r#"<html><body><div id="target0">capture</div></body></html>"#,);@@ -5410,7 +5447,7 @@ fn pointer_capture_lost_dispatches_before_compat_mouseup() {).expect("pointer capture mouseup order listener setup should evaluate");- vm.eval("document.elementFromPoint(0, 0)")+ vm.publish_layout_for_test().expect("publish geometry before coordinate input");vm.dispatch_mouse_event_at_point(10.0, 11.0, "mousedown", 0, None, 0.0, 0.0)@@ -5429,7 +5466,7 @@ fn pointer_capture_lost_dispatches_before_compat_mouseup() {#[test]fn pointer_capture_mouse_events_preserve_modifiers() {- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://pointer-capture-mouse-modifiers.test/",r#"<html><body><div id="target0">capture</div></body></html>"#,);@@ -5451,7 +5488,7 @@ fn pointer_capture_mouse_events_preserve_modifiers() {).expect("pointer capture modifier listener setup should evaluate");- vm.eval("document.elementFromPoint(0, 0)")+ vm.publish_layout_for_test().expect("publish geometry before coordinate input");vm.dispatch_mouse_event_at_point_with_pointer_and_modifiers(@@ -5492,7 +5529,7 @@ fn pointer_capture_mouse_events_preserve_modifiers() {#[test]fn touch_pointer_implicit_capture_routes_until_pointerup() {- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://touch-pointer-implicit-capture.test/",r#"<html><body><div id="target0">first</div><div id="target1">second</div></body></html>"#,);@@ -5535,7 +5572,7 @@ fn touch_pointer_implicit_capture_routes_until_pointerup() {#[test]fn touch_pointer_capture_lost_dispatches_before_touchend() {- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://touch-pointer-lost-before-touchend.test/",r#"<html><body><div id="target0">capture</div></body></html>"#,);@@ -5570,7 +5607,7 @@ fn touch_pointer_capture_lost_dispatches_before_touchend() {#[test]fn touch_pointer_capture_can_route_to_explicit_capture_target() {- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://touch-pointer-explicit-capture.test/",r#"<html><body><div id="button">button</div><div id="target0">capture</div></body></html>"#,);@@ -5623,7 +5660,7 @@ fn touch_pointer_capture_can_route_to_explicit_capture_target() {#[test]fn pointer_raw_update_dispatches_after_pointer_boundary_before_mouse_boundary() {- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://pointer-raw-update-order.test/",r#"<html><body><div id="init">init</div><div id="target">target</div></body></html>"#,);@@ -5647,7 +5684,7 @@ fn pointer_raw_update_dispatches_after_pointer_boundary_before_mouse_boundary()).expect("pointer raw update listener setup should evaluate");- vm.eval("document.elementFromPoint(0, 0)")+ vm.publish_layout_for_test().expect("publish geometry before coordinate input");vm.dispatch_mouse_event_at_point(10.0, 11.0, "mousemove", -1, None, 0.0, 0.0)@@ -5666,7 +5703,7 @@ fn pointer_raw_update_dispatches_after_pointer_boundary_before_mouse_boundary()#[test]fn pointer_raw_update_flushes_capture_before_pointermove() {- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://pointer-raw-update-capture.test/",r#"<html><body><div id="target0">first</div><div id="target1">second</div></body></html>"#,);@@ -5701,7 +5738,7 @@ fn pointer_raw_update_flushes_capture_before_pointermove() {).expect("pointer raw update capture listener setup should evaluate");- vm.eval("document.elementFromPoint(0, 0)")+ vm.publish_layout_for_test().expect("publish geometry before coordinate input");vm.dispatch_mouse_event_at_point(10.0, 11.0, "mousedown", 0, None, 0.0, 0.0)@@ -5722,7 +5759,7 @@ fn pointer_raw_update_flushes_capture_before_pointermove() {#[test]fn release_pointer_capture_clears_pending_capture_before_got_event() {- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://pointer-capture-release-pending.test/",r#"<html><body><div id="target0">first</div><div id="target1">second</div></body></html>"#,);@@ -5759,7 +5796,7 @@ fn release_pointer_capture_clears_pending_capture_before_got_event() {).expect("release capture listener setup should evaluate");- vm.eval("document.elementFromPoint(0, 0)")+ vm.publish_layout_for_test().expect("publish geometry before coordinate input");vm.dispatch_mouse_event_at_point(10.0, 11.0, "mousedown", 0, None, 0.0, 0.0)@@ -5780,7 +5817,7 @@ fn release_pointer_capture_clears_pending_capture_before_got_event() {#[test]fn removing_got_pointer_capture_target_dispatches_lost_on_document() {- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://pointer-capture-got-removal.test/",r#"<html><body><div id="button">button</div><div id="target0">capture</div></body></html>"#,);@@ -5817,7 +5854,7 @@ fn removing_got_pointer_capture_target_dispatches_lost_on_document() {).expect("capture removal listener setup should evaluate");- vm.eval("document.elementFromPoint(0, 0)")+ vm.publish_layout_for_test().expect("publish geometry before coordinate input");vm.dispatch_mouse_event_at_point(10.0, 11.0, "mousedown", 0, None, 0.0, 0.0)@@ -5836,7 +5873,7 @@ fn removing_got_pointer_capture_target_dispatches_lost_on_document() {#[test]fn lost_pointer_capture_can_remove_pending_target_before_got() {- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://pointer-capture-lost-removes-pending.test/",r#"<html><body><div id="button">button</div><div id="target0">capture0</div><div id="target1">capture1</div></body></html>"#,);@@ -5873,7 +5910,7 @@ fn lost_pointer_capture_can_remove_pending_target_before_got() {).expect("pending capture removal listener setup should evaluate");- vm.eval("document.elementFromPoint(0, 0)")+ vm.publish_layout_for_test().expect("publish geometry before coordinate input");vm.dispatch_mouse_event_at_point(10.0, 11.0, "mousedown", 0, None, 0.0, 0.0)@@ -5894,7 +5931,7 @@ fn lost_pointer_capture_can_remove_pending_target_before_got() {#[test]fn removed_pending_pointer_capture_target_is_cleared_immediately() {- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://pointer-capture-pending-removal-hook.test/",r#"<html><body><div id="button">button</div><div id="target0">capture</div></body></html>"#,);@@ -5926,7 +5963,7 @@ fn removed_pending_pointer_capture_target_is_cleared_immediately() {).expect("pending capture hook listener setup should evaluate");- vm.eval("document.elementFromPoint(0, 0)")+ vm.publish_layout_for_test().expect("publish geometry before coordinate input");vm.dispatch_mouse_event_at_point(10.0, 11.0, "mousedown", 0, None, 0.0, 0.0)@@ -5942,7 +5979,7 @@ fn removed_pending_pointer_capture_target_is_cleared_immediately() {#[test]fn removed_active_pointer_capture_target_loses_capture_on_next_event() {- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://pointer-capture-active-removal-hook.test/",r#"<html><body><div id="button">button</div><div id="target0">capture</div></body></html>"#,);@@ -5980,7 +6017,7 @@ fn removed_active_pointer_capture_target_loses_capture_on_next_event() {).expect("active capture hook listener setup should evaluate");- vm.eval("document.elementFromPoint(0, 0)")+ vm.publish_layout_for_test().expect("publish geometry before coordinate input");vm.dispatch_mouse_event_at_point(10.0, 11.0, "mousedown", 0, None, 0.0, 0.0)@@ -6001,7 +6038,7 @@ fn removed_active_pointer_capture_target_loses_capture_on_next_event() {#[test]fn mouse_hover_dispatches_pointer_boundary_before_mouse_boundary() {- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://pointer-boundary-order.test/",r#"<html><body><div id="a">a</div><div id="b">b</div></body></html>"#,);@@ -6041,7 +6078,7 @@ fn mouse_hover_dispatches_pointer_boundary_before_mouse_boundary() {twist: 0.0,};- vm.eval("document.elementFromPoint(0, 0)")+ vm.publish_layout_for_test().expect("publish geometry before coordinate input");vm.dispatch_mouse_event_at_point_with_pointer(10.0,@@ -6079,7 +6116,7 @@ fn mouse_hover_dispatches_pointer_boundary_before_mouse_boundary() {#[test]fn mouse_hover_persists_stylo_state_and_reflows_dropdown_on_fresh_paint() {- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://hover-dropdown.test/",r#"<!doctype html>@@ -6139,7 +6176,7 @@ fn mouse_hover_persists_stylo_state_and_reflows_dropdown_on_fresh_paint() {"false|none");- vm.eval("document.elementFromPoint(0, 0)")+ vm.publish_layout_for_test().expect("publish geometry before coordinate input");vm.dispatch_mouse_event_at_point(10.0, 10.0, "mousemove", -1, Some(0), 0.0, 0.0)@@ -8137,7 +8174,7 @@ fn dom_parser_inner_text_is_html_only() {#[test]fn live_inner_text_applies_inline_text_transform() {- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://inner-text-transform.test/",r#"<!doctype html><html><body><a id="upper" style="text-transform: uppercase">link<br>text</a>@@ -8170,7 +8207,7 @@ fn live_inner_text_applies_inline_text_transform() {#[test]fn live_inner_text_preserves_breaks_and_private_use_text_during_normalization() {- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://inner-text-single-pass.test/",r#"<!doctype html><html><body><div id="target" style="text-transform: uppercase">@@ -8189,12 +8226,12 @@ fn live_inner_text_preserves_breaks_and_private_use_text_during_normalization()#[test]fn inner_text_matches_chromium_structural_and_white_space_rules() {- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://inner-text-structure.test/","<!doctype html><html><body></body></html>",);- let result = vm+ vm.eval(r#"(() => {@@ -8257,13 +8294,20 @@ fn inner_text_matches_chromium_structural_and_white_space_rules() {canvas: read('<div id="x">a<canvas>b</canvas>c</div>'),svgStop: read('<div id="x"><svg><stop>abc</stop></svg></div>')};+globalThis.__readFixture = () => {return JSON.stringify(Object.fromEntries(Object.entries(cases).map(([name, index]) => [name, targets[index].innerText])));+};})()"#,).expect("Chromium-shaped structural innerText cases should evaluate");+ vm.publish_layout_for_test()+ .expect("publish prepared fixture");+ let result = vm+ .eval("__readFixture()")+ .expect("Chromium-shaped structural innerText cases should evaluate");assert_eq!(result,@@ -8273,12 +8317,12 @@ fn inner_text_matches_chromium_structural_and_white_space_rules() {#[test]fn inner_text_matches_chromium_table_and_select_rules() {- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://inner-text-table-select.test/","<!doctype html><html><body></body></html>",);- let result = vm+ vm.eval(r#"(() => {@@ -8311,13 +8355,20 @@ fn inner_text_matches_chromium_table_and_select_rules() {outsideOptgroup: read('<div id="x">a<optgroup>ignored</optgroup>bc</div>'),outsideOption: read('<div id="x">a<option>one</option>bc</div>')};+globalThis.__readFixture = () => {return JSON.stringify(Object.fromEntries(Object.entries(cases).map(([name, index]) => [name, targets[index].innerText])));+};})()"#,).expect("Chromium-shaped table/select innerText cases should evaluate");+ vm.publish_layout_for_test()+ .expect("publish prepared fixture");+ let result = vm+ .eval("__readFixture()")+ .expect("Chromium-shaped table/select innerText cases should evaluate");assert_eq!(result,@@ -8327,7 +8378,7 @@ fn inner_text_matches_chromium_table_and_select_rules() {#[test]fn inner_text_projects_closed_details_rendered_subtree() {- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://inner-text-details.test/",r#"<!doctype html><html><body><details id="target"><summary><span id="summary-child">first</span></summary><summary id="second">second</summary><div id="hidden-child">details</div></details>@@ -8370,7 +8421,7 @@ fn inner_text_projects_closed_details_rendered_subtree() {#[test]fn check_visibility_and_inner_text_use_computed_rendered_state() {- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://rendered-state.test/",r#"<!doctype html><html><head><style>.hidden { display: none; }@@ -8457,7 +8508,7 @@ fn check_visibility_and_inner_text_use_computed_rendered_state() {#[test]fn content_visibility_only_locks_chromium_eligible_boxes() {- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://content-visibility-applicability.test/",r#"<!doctype html><html><body><span id="inline" style="content-visibility: hidden">inline visible</span>@@ -8497,7 +8548,7 @@ fn content_visibility_only_locks_chromium_eligible_boxes() {#[test]fn rendered_style_facts_refresh_after_synchronous_mutations() {- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://rendered-style-mutation.test/",r#"<!doctype html><html><head><style>.hidden { display: none; }@@ -8572,6 +8623,7 @@ for (let index = 0; index < 128; index++) {.borrow().style_world_full_snapshots_for_test();let layout_before = vm.layout_pass_observability_for_test();+ publish_layout_for_test(&mut vm);let first = vm.eval("(() => { const text = target.innerText; return [text.length, text[0], text[127]].join('|'); })()",@@ -8692,7 +8744,7 @@ for (let index = 0; index < 128; index++) {#[test]fn inner_text_new_sources_wait_for_a_fresh_paint_layout() {- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://inner-text-latest-layout.test/","<!doctype html><html><body><div id=target><span>a</span></div></body></html>",);@@ -8708,10 +8760,10 @@ fn inner_text_new_sources_wait_for_a_fresh_paint_layout() {assert_eq!(vm.eval("document.getElementById('target').innerText")- .expect("the cold innerText read should evaluate"),+ .expect("the published innerText read should evaluate"),"a");- assert_eq!(vm.layout_pass_observability_for_test().1, passes_before + 1);+ assert_eq!(vm.layout_pass_observability_for_test().1, passes_before);assert_eq!(vm.eval(@@ -8721,23 +8773,23 @@ fn inner_text_new_sources_wait_for_a_fresh_paint_layout() {"a","a text source absent from the latest frozen layout tree remains unrendered until refresh");- assert_eq!(vm.layout_pass_observability_for_test().1, passes_before + 1);+ assert_eq!(vm.layout_pass_observability_for_test().1, passes_before);vm.screenshot_layout_snapshot(moli_layout::PaintViewport::new(320, 200, 1.0)).expect("fresh paint layout should succeed").expect("the fixture should have a layout root");- assert_eq!(vm.layout_pass_observability_for_test().1, passes_before + 2);+ assert_eq!(vm.layout_pass_observability_for_test().1, passes_before + 1);assert_eq!(vm.eval("target.innerText").expect("innerText should read the refreshed geometry snapshot"),"ab");- assert_eq!(vm.layout_pass_observability_for_test().1, passes_before + 2);+ assert_eq!(vm.layout_pass_observability_for_test().1, passes_before + 1);let cache_after = vm.layout_snapshot_cache_observability_for_test();- assert_eq!(cache_after.0, cache_before.0 + 2);- assert_eq!(cache_after.1, cache_before.1 + 1);- assert_eq!(cache_after.2, cache_before.2 + 2);+ assert_eq!(cache_after.0, cache_before.0 + 3);+ assert_eq!(cache_after.1, cache_before.1);+ assert_eq!(cache_after.2, cache_before.2 + 1);}#[test]@@ -8757,6 +8809,7 @@ fn inner_text_updates_device_in_place_without_full_style_world_snapshots() {._context_host.borrow().style_world_full_snapshots_for_test();+ publish_layout_for_test(&mut vm);assert_eq!(vm.eval("document.getElementById('target').innerText").expect("screen innerText read should evaluate"),@@ -8834,7 +8887,7 @@ fn inner_text_updates_device_in_place_without_full_style_world_snapshots() {#[test]fn same_document_history_url_mutations_preserve_style_world() {- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://inner-text-document-url-style-world.test/start/index.html",r#"<!doctype html><html><head><style>#target { text-transform: uppercase; background-image: url(asset.png); }@@ -8989,6 +9042,7 @@ host.attachShadow({mode: 'open'}).innerHTML =.borrow().style_world_full_snapshots_for_test();let layout_before = vm.layout_pass_observability_for_test();+ publish_layout_for_test(&mut vm);let first_text = vm.eval("host.innerText")@@ -9458,10 +9512,10 @@ fn dom_parser_elements_expose_dataset_has_attribute_and_element_traversal() {fn child_shadow_root_legacy_wpt_attributes_and_methods() {let mut vm = new_storage_test_vm("https://child-shadow-root-legacy-wpt.test/");- let result = vm- .eval(- r#"-(() => {+ let result = eval_with_layout_publications(+ &mut vm,+ r#"+(function* () {const frame = document.createElement('iframe');(document.body || document.documentElement || document).appendChild(frame);const doc = frame.contentWindow.document;@@ -9499,6 +9553,7 @@ fn child_shadow_root_legacy_wpt_attributes_and_methods() {const selection = selectionRoot.getSelection();selection.removeAllRanges();selection.addRange(range);+yield; // Publish this scene before reading its geometry.const selectedText = selectionRoot.getSelection().toString();let cloneError = '';@@ -9520,8 +9575,8 @@ fn child_shadow_root_legacy_wpt_attributes_and_methods() {].join('|');})()"#,- )- .expect("child ShadowRoot legacy WPT surface should evaluate");+ )+ .expect("child ShadowRoot legacy WPT surface should evaluate");assert_eq!(result,diff --git a/moli-renderer-v8/src/script_vm/tests/dom_xhr/forms.rs b/moli-renderer-v8/src/script_vm/tests/dom_xhr/forms.rsindex e3753f008..3d9c7a22d 100644--- a/moli-renderer-v8/src/script_vm/tests/dom_xhr/forms.rs+++ b/moli-renderer-v8/src/script_vm/tests/dom_xhr/forms.rs@@ -3704,7 +3704,7 @@ fn anchor_download_synthetic_click_records_pending_download_without_navigation()#[test]fn trusted_alt_click_downloads_an_anchor_without_a_download_attribute() {- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://anchor-alt-download.test/path/index.html",r#"<!doctype html><html><head><style>body { margin: 0; }@@ -3714,7 +3714,7 @@ fn trusted_alt_click_downloads_an_anchor_without_a_download_attribute() {</body></html>"#,);- vm.eval("document.elementFromPoint(0, 0)")+ vm.publish_layout_for_test().expect("publish geometry before coordinate input");vm.dispatch_mouse_event_at_point_with_pointer_and_modifiers(@@ -3774,7 +3774,7 @@ fn alt_input_does_not_turn_window_open_into_a_download_or_background_popup() {).expect("Alt window.open fixture should initialize");- vm.eval("document.elementFromPoint(0, 0)")+ vm.publish_layout_for_test().expect("publish geometry before coordinate input");vm.dispatch_mouse_event_at_point_with_pointer_and_modifiers(@@ -3843,7 +3843,7 @@ fn window_open_in_click_listener_uses_current_input_event() {.expect("trusted window.open fixture should initialize");trusted- .eval("document.elementFromPoint(0, 0)")+ .publish_layout_for_test().expect("publish geometry before coordinate input");trusted.dispatch_mouse_event_at_point_with_pointer_and_modifiers(@@ -3946,7 +3946,7 @@ fn current_mouseup_input_covers_pointer_mouse_click_and_microtask_callbacks() {).expect("current input scope fixture should initialize");- vm.eval("document.elementFromPoint(0, 0)")+ vm.publish_layout_for_test().expect("publish geometry before coordinate input");vm.dispatch_mouse_event_at_point_with_pointer_and_modifiers(@@ -4025,7 +4025,7 @@ fn middle_auxclick_runs_the_anchor_default_action_in_the_background() {).expect("auxclick listener should install");- vm.eval("document.elementFromPoint(0, 0)")+ vm.publish_layout_for_test().expect("publish geometry before coordinate input");vm.dispatch_mouse_event_at_point(20.0, 20.0, "mousedown", 1, None, 0.0, 0.0)@@ -4075,7 +4075,7 @@ fn canceling_middle_auxclick_suppresses_the_anchor_default_action() {).expect("canceling auxclick listener should install");- vm.eval("document.elementFromPoint(0, 0)")+ vm.publish_layout_for_test().expect("publish geometry before coordinate input");vm.dispatch_mouse_event_at_point(20.0, 20.0, "mousedown", 1, None, 0.0, 0.0)@@ -4202,7 +4202,7 @@ fn keyboard_activation_click_preserves_modifiers() {#[test]fn image_submit_click_coordinates_use_live_layout_geometry() {- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://image-submit-coordinates.test/path/index.html",r#"<!doctype html><html><head><style>body { margin: 0; }@@ -4232,7 +4232,7 @@ form.addEventListener('submit', event => {).expect("image submit coordinate fixture should initialize");- vm.eval("document.elementFromPoint(0, 0)")+ vm.publish_layout_for_test().expect("publish geometry before coordinate input");vm.dispatch_mouse_event_at_point(125.4, 68.6, "mousedown", 0, None, 0.0, 0.0)@@ -4250,14 +4250,14 @@ form.addEventListener('submit', event => {#[test]fn button_click_listener_window_open_self_reports_top_level_navigation() {- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://button-open-self-outcome.test/path/index.html",r#"<html><body><button id="go" type="button" onclick="window.open('/next', '_self')">go</button></body></html>"#,);- vm.eval("document.elementFromPoint(0, 0)")+ vm.publish_layout_for_test().expect("publish geometry before coordinate input");vm.dispatch_mouse_event_at_point(20.0, 20.0, "mousedown", 0, None, 0.0, 0.0)@@ -4360,7 +4360,7 @@ fn file_input_click_returns_pending_file_chooser_activation() {const FILE_INPUT_HIT_X: f64 = 20.0;const FILE_INPUT_HIT_Y: f64 = 20.0;- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://file-input-click.test/path/index.html",r#"<html><body><input id="picker" type="file" multiple>@@ -4372,7 +4372,7 @@ fn file_input_click_returns_pending_file_chooser_activation() {let source_document = lifecycle.identity();vm.set_root_document_lifecycle(lifecycle);- vm.eval("document.elementFromPoint(0, 0)")+ vm.publish_layout_for_test().expect("publish geometry before coordinate input");vm.dispatch_mouse_event_at_point(FILE_INPUT_HIT_X,@@ -4553,7 +4553,7 @@ fn label_click_for_file_input_returns_pending_file_chooser_activation() {const LABEL_HIT_X: f64 = 20.0;const LABEL_HIT_Y: f64 = 20.0;- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://file-label-click.test/path/index.html",r#"<html><body><label for="picker" style="display:block;width:120px;height:40px">Choose file</label>@@ -4566,7 +4566,7 @@ fn label_click_for_file_input_returns_pending_file_chooser_activation() {let source_document = lifecycle.identity();vm.set_root_document_lifecycle(lifecycle);- vm.eval("document.elementFromPoint(0, 0)")+ vm.publish_layout_for_test().expect("publish geometry before coordinate input");vm.dispatch_mouse_event_at_point(LABEL_HIT_X, LABEL_HIT_Y, "mousedown", 0, None, 0.0, 0.0).expect("label mousedown should dispatch");@@ -4709,7 +4709,7 @@ fn pointer_click_enters_shadow_root_for_label_activation() {// this fixture. Hit inside the label rather than the intervening margin.const LABEL_HIT_Y: f64 = 35.0;- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://shadow-label-click.test/path/index.html",r#"<html><body><div id="host" class="h-screen"></div></body></html>"#,);@@ -4730,7 +4730,7 @@ root.appendChild(label);).expect("shadow label setup should evaluate");- vm.eval("document.elementFromPoint(0, 0)")+ vm.publish_layout_for_test().expect("publish geometry before coordinate input");vm.dispatch_mouse_event_at_point(LABEL_HIT_X, LABEL_HIT_Y, "mousedown", 0, None, 0.0, 0.0)diff --git a/moli-renderer-v8/src/script_vm/tests/dom_xhr/forms/event_activation.rs b/moli-renderer-v8/src/script_vm/tests/dom_xhr/forms/event_activation.rsindex 43e566841..c74dfd10b 100644--- a/moli-renderer-v8/src/script_vm/tests/dom_xhr/forms/event_activation.rs+++ b/moli-renderer-v8/src/script_vm/tests/dom_xhr/forms/event_activation.rs@@ -118,7 +118,7 @@ fn pointer_release_does_not_reapply_canceled_mouse_focus() {for canceled_event in ["none", "mousedown", "pointerdown"] {for label in [false, true] {let target = if label { "label" } else { "button" };- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://pointer-focus-ownership.test/",r#"<html><body><input id="origin" style="position:absolute;left:200px;top:100px"><button id="button" type="button" style="position:absolute;left:10px;top:10px;width:100px;height:40px">Button</button>diff --git a/moli-renderer-v8/src/script_vm/tests/dom_xhr/misc.rs b/moli-renderer-v8/src/script_vm/tests/dom_xhr/misc.rsindex c0cd87c37..3a2ea2cd9 100644--- a/moli-renderer-v8/src/script_vm/tests/dom_xhr/misc.rs+++ b/moli-renderer-v8/src/script_vm/tests/dom_xhr/misc.rs@@ -830,12 +830,11 @@ fn node_move_before_dispatches_custom_element_move_reactions() {#[test]fn node_move_before_updates_shadow_flat_tree_geometry() {let mut vm = new_storage_test_vm("https://node-move-before-shadow-geometry.test/");- vm.force_fresh_layout_reads_for_test();- let result = vm- .eval(- r#"-(() => {+ let result = eval_with_layout_publications(+ &mut vm,+ r#"+(function* () {if (!document.documentElement) {document.appendChild(document.createElement('html'));}@@ -852,9 +851,11 @@ fn node_move_before_updates_shadow_flat_tree_geometry() {const span = document.createElement('span');span.textContent = 'Text in light DOM';document.body.append(host, span);- const beforeSlotWidth = span.getBoundingClientRect().width;+ yield; // Publish this scene before reading its geometry.+const beforeSlotWidth = span.getBoundingClientRect().width;host.moveBefore(span, null);- const afterSlotWidth = span.getBoundingClientRect().width;+ yield; // Publish this scene before reading its geometry.+const afterSlotWidth = span.getBoundingClientRect().width;const style = document.createElement('style');style.textContent = `@@ -878,7 +879,8 @@ fn node_move_before_updates_shadow_flat_tree_geometry() {<div></div>`;section2.moveBefore(item, null);- const innerWidth = itemShadow.querySelector('div').getBoundingClientRect().width;+ yield; // Publish this scene before reading its geometry.+const innerWidth = itemShadow.querySelector('div').getBoundingClientRect().width;return [beforeSlotWidth > 0,afterSlotWidth,@@ -888,8 +890,8 @@ fn node_move_before_updates_shadow_flat_tree_geometry() {].join('|');})()"#,- )- .expect("moveBefore shadow flat-tree geometry should evaluate");+ )+ .expect("moveBefore shadow flat-tree geometry should evaluate");assert_eq!(result, "true|0|300|300|300");}@@ -1159,16 +1161,14 @@ fn offscreen_canvas_webgl_surface_matches_html_canvas_surface() {}#[test]fn offset_parent_and_offsets_cross_shadow_scopes_like_chromium() {- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://shadow-offset-parent.test/",r#"<html><body><div id="container" style="position: relative"></div></body></html>"#,);- vm.force_fresh_layout_reads_for_test();- let result = vm- .eval(+ let result = eval_with_layout_publications(&mut vm,r#"-(() => {+(function* () {const container = document.getElementById('container');const internalHost = document.createElement('div');@@ -1180,7 +1180,8 @@ fn offset_parent_and_offsets_cross_shadow_scopes_like_chromium() {'</div>';const relativeParent = internalShadow.getElementById('relativeParent');const internalTarget = internalShadow.getElementById('target');- const internalResult = [+ yield; // Publish this scene before reading its geometry.+const internalResult = [internalTarget.offsetParent === relativeParent,internalTarget.offsetLeft,internalTarget.offsetTop@@ -1196,7 +1197,8 @@ fn offset_parent_and_offsets_cross_shadow_scopes_like_chromium() {'<slot></slot>' +'</div>';const slottedTarget = slottedHost.querySelector('#target');- const slottedResult = [+ yield; // Publish this scene before reading its geometry.+const slottedResult = [slottedTarget.offsetParent === container,slottedTarget.offsetLeft,slottedTarget.offsetTop@@ -1213,7 +1215,8 @@ fn offset_parent_and_offsets_cross_shadow_scopes_like_chromium() {'</div>';const fixedTarget = fixedHost.querySelector('#target');const fixed = fixedShadow.getElementById('fixed');- const fixedResult = [+ yield; // Publish this scene before reading its geometry.+const fixedResult = [fixedTarget.offsetParent === null,fixedTarget.offsetLeft,85 + fixed.offsetLeft,@@ -1233,7 +1236,8 @@ fn offset_parent_and_offsets_cross_shadow_scopes_like_chromium() {'</div>' +'</div>';const transformedFixedTarget = transformedFixedHost.querySelector('#target');- const transformedFixedResult = [+ yield; // Publish this scene before reading its geometry.+const transformedFixedResult = [transformedFixedTarget.offsetParent === container,transformedFixedTarget.offsetLeft,transformedFixedTarget.offsetTop@@ -1251,7 +1255,8 @@ fn offset_parent_and_offsets_cross_shadow_scopes_like_chromium() {'<div style="position: absolute; top: 10px; left: 10px;"><slot></slot></div>' +'</section>';const nestedTarget = nestedHost.querySelector('#target');- const nestedResult = [+ yield; // Publish this scene before reading its geometry.+const nestedResult = [nestedTarget.offsetParent === container,nestedTarget.offsetLeft,nestedTarget.offsetTop@@ -1264,7 +1269,8 @@ fn offset_parent_and_offsets_cross_shadow_scopes_like_chromium() {unassignedHost.attachShadow({ mode: 'open' }).innerHTML ='<section style="position: absolute; top: 50px; left: 50px;">content</section>';const unassignedTarget = unassignedHost.querySelector('#target');- const unassignedResult = [+ yield; // Publish this scene before reading its geometry.+const unassignedResult = [unassignedTarget.offsetParent === null,unassignedTarget.offsetLeft,unassignedTarget.offsetTop@@ -1293,10 +1299,10 @@ fn offset_parent_and_offsets_cross_shadow_scopes_like_chromium() {fn shadow_host_unassigned_children_are_empty_and_slotted_text_has_layout() {let mut vm = new_storage_test_vm("https://shadow-unassigned-geometry.test/");- let result = vm- .eval(- r#"-(() => {+ let result = eval_with_layout_publications(+ &mut vm,+ r#"+(function* () {if (!document.documentElement) {document.appendChild(document.createElement('html'));}@@ -1318,6 +1324,7 @@ fn shadow_host_unassigned_children_are_empty_and_slotted_text_has_layout() {slottedHost.appendChild(slotted);document.body.appendChild(slottedHost);slottedHost.attachShadow({mode: 'open'}).innerHTML = '<slot></slot>';+yield; // Publish this scene before reading its geometry.const hiddenRect = hidden.getBoundingClientRect();const slottedRect = slotted.getBoundingClientRect();@@ -1330,8 +1337,8 @@ fn shadow_host_unassigned_children_are_empty_and_slotted_text_has_layout() {});})()"#,- )- .expect("shadow unassigned light geometry should evaluate");+ )+ .expect("shadow unassigned light geometry should evaluate");let result: serde_json::Value =serde_json::from_str(&result).expect("shadow geometry should be JSON");@@ -1354,9 +1361,10 @@ fn shadow_host_unassigned_children_are_empty_and_slotted_text_has_layout() {fn shadow_flat_tree_offsets_match_chromium_layout_order() {let mut vm = new_storage_test_vm("https://shadow-offset-wpt.test/");- let result = vm- .eval(- r#"+ let result = eval_with_layout_publications(+ &mut vm,+ r#"+(function* () {if (!document.documentElement) {document.appendChild(document.createElement('html'));}@@ -1441,14 +1449,16 @@ body.setHTMLUnsafe(`<div id=target3 style="position: absolute" class=box></div></div>`);-[+yield; // Publish this scene before reading its geometry.+return [target1.offsetTop,target2.offsetLeft,target3.offsetTop-].join('|')+].join('|');+})()"#,- )- .expect("headless mock shadow boundary offsets should evaluate");+ )+ .expect("headless mock shadow boundary offsets should evaluate");assert_eq!(result, "38|8|88");}@@ -1463,10 +1473,10 @@ fn geometry_getters_reuse_latest_layout_across_nodes_and_mutation() {.1;let cache_before = vm.layout_snapshot_cache_observability_for_test();- let result = vm- .eval(- r#"-(() => {+ let result = eval_with_layout_publications(+ &mut vm,+ r#"+(function* () {if (!document.documentElement) {document.appendChild(document.createElement('html'));}@@ -1481,6 +1491,7 @@ fn geometry_getters_reuse_latest_layout_across_nodes_and_mutation() {targets.push(target);}+yield; // Publish this scene before reading its geometry.const initialLast = targets[3].offsetTop;const first = targets.map(target => target.offsetTop);const second = targets.map(target => target.offsetTop);@@ -1500,8 +1511,8 @@ fn geometry_getters_reuse_latest_layout_across_nodes_and_mutation() {].join('|');})()"#,- )- .expect("latest layout snapshot reads should evaluate");+ )+ .expect("latest layout snapshot reads should evaluate");assert_eq!(result, "38|8|38|8|38|38|0");let passes = vm@@ -1510,10 +1521,13 @@ fn geometry_getters_reuse_latest_layout_across_nodes_and_mutation() {.layout_pass_observability_for_test().1.saturating_sub(passes_before);- assert_eq!(passes, 1, "only the cold getter may build layout");+ assert_eq!(+ passes, 1,+ "only the explicit fixture publication builds layout"+ );let cache_after = vm.layout_snapshot_cache_observability_for_test();- assert_eq!(cache_after.0, cache_before.0 + 10);- assert_eq!(cache_after.1, cache_before.1 + 1);+ assert_eq!(cache_after.0, cache_before.0 + 11);+ assert_eq!(cache_after.1, cache_before.1);assert_eq!(cache_after.2, cache_before.2 + 1);assert!(cache_after.3.is_some());}@@ -1525,8 +1539,8 @@ fn switching_to_mock_geometry_drops_the_latest_real_layout_snapshot() {"document.appendChild(document.createElement('html')).appendChild(document.createElement('body')); 'installed'",).expect("the geometry fixture should initialize");- vm.eval("document.body.offsetTop")- .expect("the real geometry read should populate the latest snapshot");+ vm.publish_layout_for_test()+ .expect("publish the real geometry fixture");assert!(vm.layout_snapshot_cache_observability_for_test().3@@ -1641,10 +1655,10 @@ fn body_default_geometry_tracks_each_css_margin_axis() {fn child_content_document_created_elements_expose_geometry_methods() {let mut vm = new_storage_test_vm("https://child-created-geometry.test/");- let result = vm- .eval(- r#"-(() => {+ let result = eval_with_layout_publications(+ &mut vm,+ r#"+(function* () {const frame = document.createElement('iframe');(document.body || document.documentElement || document).appendChild(frame);const doc = frame.contentDocument;@@ -1652,7 +1666,8 @@ fn child_content_document_created_elements_expose_geometry_methods() {const item = doc.createElement('div');item.id = 'item';doc.body.append(item);- const rect = item.getBoundingClientRect();+ yield; // Publish this scene before reading its geometry.+const rect = item.getBoundingClientRect();return [typeof item.getBoundingClientRect,typeof item.getClientRects,@@ -1661,14 +1676,14 @@ fn child_content_document_created_elements_expose_geometry_methods() {].join('|');})()"#,- )- .expect("child document created geometry should evaluate");+ )+ .expect("child document created geometry should evaluate");assert_eq!(result, "function|function|0|true");}#[test]fn geometry_rect_objects_expose_domrect_to_json() {- let mut vm = new_parsed_test_vm(+ let mut vm = new_rendered_test_vm("https://geometry-domrect-shape.test/","<!doctype html><body><div id='node'>text</div></body>",);@@ -1960,12 +1975,11 @@ fn geometry_domrect_private_slots_ignore_reflection_and_spoofing() {#[test]fn fragment_anchor_scroll_ignores_shadow_tree_targets() {let mut vm = new_storage_test_vm("https://fragment-shadow-scroll.test/");- vm.force_fresh_layout_reads_for_test();- let result = vm- .eval(- r##"-(() => {+ let result = eval_with_layout_publications(+ &mut vm,+ r##"+(function* () {if (!document.documentElement) {document.appendChild(document.createElement('html'));}@@ -1979,13 +1993,15 @@ fn fragment_anchor_scroll_ignores_shadow_tree_targets() {}container.innerHTML = tall('doc-target') + '<div id="doc-target">target</div>';- container.querySelector('a').click();+ yield; // Publish this scene before reading its geometry.+container.querySelector('a').click();const documentTargetScrolls = window.pageYOffset > 0;window.scrollTo(0, 0);container.innerHTML = tall('shadow-target') + '<div id="host"></div>';container.querySelector('#host').attachShadow({ mode: 'open' }).innerHTML ='<div id="shadow-target">shadow</div>';+ yield;container.querySelector('a').click();const shadowTargetIgnored = window.pageYOffset === 0;@@ -1998,14 +2014,15 @@ fn fragment_anchor_scroll_ignores_shadow_tree_targets() {const host = container.querySelector('#host');host.attachShadow({ mode: 'open' }).innerHTML ='<div id="duplicate-target">shadow</div>';+ yield;container.querySelector('a').click();const duplicateUsesDocumentTree = window.pageYOffset > host.offsetTop;return [documentTargetScrolls, shadowTargetIgnored, duplicateUsesDocumentTree].join('|');})()"##,- )- .expect("fragment anchor scroll should evaluate");+ )+ .expect("fragment anchor scroll should evaluate");assert_eq!(result, "true|true|true");}diff --git a/moli-renderer-v8/src/script_vm/tests/dom_xhr/shadow_dom.rs b/moli-renderer-v8/src/script_vm/tests/dom_xhr/shadow_dom.rsindex 1f636adad..9087c1900 100644--- a/moli-renderer-v8/src/script_vm/tests/dom_xhr/shadow_dom.rs+++ b/moli-renderer-v8/src/script_vm/tests/dom_xhr/shadow_dom.rs@@ -2521,12 +2521,11 @@ async fn focused_display_none_blur_listener_sees_updated_focus_state() {#[test]fn scroll_container_focusability_tracks_current_layout() {let mut vm = new_storage_test_vm("https://scroll-focusability.test/");- vm.force_fresh_layout_reads_for_test();- let result = vm- .eval(- r#"-(() => {+ let result = eval_with_layout_publications(+ &mut vm,+ r#"+(function* () {if (!document.documentElement) {document.appendChild(document.createElement('html'));}@@ -2544,19 +2543,21 @@ fn scroll_container_focusability_tracks_current_layout() {const button = document.getElementById('button');const scroller = document.getElementById('scroller');const horizontal = document.getElementById('horizontal');- scroller.focus();+ yield; // Publish this scene before reading its geometry.+scroller.focus();const initiallyScrollable = document.activeElement === scroller;button.focus();horizontal.focus();const horizontallyScrollable = document.activeElement === horizontal;button.focus();scroller.style.height = '200px';+yield; // Publish this scene before reading its geometry.scroller.focus();return [initiallyScrollable, horizontallyScrollable, document.activeElement === button].join('|');})()"#,- )- .expect("scroll container focusability should evaluate");+ )+ .expect("scroll container focusability should evaluate");assert_eq!(result, "true|true|true");}@@ -2564,10 +2565,10 @@ fn scroll_container_focusability_tracks_current_layout() {fn tab_key_keeps_focused_scroller_until_focus_leaves_interactive_child() {let mut vm = new_storage_test_vm("https://scroll-tab-focusability.test/");- let result = vm- .eval(- r#"-(() => {+ let result = eval_with_layout_publications(+ &mut vm,+ r#"+(function* () {if (!document.documentElement) {document.appendChild(document.createElement('html'));}@@ -2586,7 +2587,8 @@ fn tab_key_keeps_focused_scroller_until_focus_leaves_interactive_child() {}const start = document.getElementById('start');const submit = document.getElementById('submit');- start.focus();+ yield; // Publish this scene before reading its geometry.+start.focus();pressTab();const first = document.activeElement.id;submit.disabled = false;@@ -2601,8 +2603,8 @@ fn tab_key_keeps_focused_scroller_until_focus_leaves_interactive_child() {return [first, second, third, fourth, fifth].join('|');})()"#,- )- .expect("Tab default action should drop scroller after focus leaves it");+ )+ .expect("Tab default action should drop scroller after focus leaves it");assert_eq!(result, "scroller|submit|end|submit|start");}@@ -2647,15 +2649,16 @@ fn caret_position_get_client_rect_declared_prototype_method() {fn caret_position_backing_slots_ignore_reflection_and_spoofing() {let mut vm = new_storage_test_vm("https://caret-position-private-slots.test/");- let result = vm- .eval(- r#"-(() => {+ let result = eval_with_layout_publications(+ &mut vm,+ r#"+(function* () {const root = document.documentElement || document.appendChild(document.createElement('html'));const body = document.body || root.appendChild(document.createElement('body'));body.innerHTML = '<span id="target">hello</span>';const span = document.getElementById('target');- const rect = span.getBoundingClientRect();+ yield; // Publish this scene before reading its geometry.+const rect = span.getBoundingClientRect();const charWidth = rect.width / span.textContent.length;const pos = document.caretPositionFromPoint(rect.left + charWidth * 2,@@ -2695,8 +2698,8 @@ fn caret_position_backing_slots_ignore_reflection_and_spoofing() {});})()"#,- )- .expect("CaretPosition private backing slots should ignore public spoofing");+ )+ .expect("CaretPosition private backing slots should ignore public spoofing");assert_eq!(result,@@ -2707,12 +2710,10 @@ fn caret_position_backing_slots_ignore_reflection_and_spoofing() {#[test]fn document_caret_position_from_point_handles_shadow_root_allowlist() {let mut vm = new_storage_test_vm("https://shadow-caret-position.test/");- vm.force_fresh_layout_reads_for_test();- let result = vm- .eval(+ let result = eval_with_layout_publications(&mut vm,r#"-(() => {+(function* () {if (!document.documentElement) {document.appendChild(document.createElement('html'));}@@ -2743,7 +2744,8 @@ fn document_caret_position_from_point_handles_shadow_root_allowlist() {container.setHTMLUnsafe('<span>hello, world</span>');{const span = container.firstChild;- const rect = span.getBoundingClientRect();+ yield; // Publish this scene before reading its geometry.+const rect = span.getBoundingClientRect();const pos = document.caretPositionFromPoint(rect.left + rect.width / span.textContent.length * 2, rect.top + rect.height / 2, {});const posRect = pos.getClientRect();check('light-text', pos instanceof CaretPosition && pos.offsetNode === span.firstChild && pos.offset === 2);@@ -2753,6 +2755,7 @@ fn document_caret_position_from_point_handles_shadow_root_allowlist() {container.setHTMLUnsafe('<div id="textDiv" style="display:inline-block">aaa</div>');{const textDiv = document.getElementById('textDiv');+ yield;const rect = textDiv.getBoundingClientRect();const characterWidth = rect.width / textDiv.textContent.length;const pos = document.caretPositionFromPoint(rect.left + characterWidth * 2, rect.top + rect.height / 2);@@ -2767,6 +2770,7 @@ fn document_caret_position_from_point_handles_shadow_root_allowlist() {container.setHTMLUnsafe('<div id="textDivFromSheet">aaa</div>');{const textDiv = document.getElementById('textDivFromSheet');+ yield;const rect = textDiv.getBoundingClientRect();const characterWidth = rect.width / textDiv.textContent.length;const pos = document.caretPositionFromPoint(rect.left + characterWidth * 2, rect.top + rect.height / 2);@@ -2777,6 +2781,7 @@ fn document_caret_position_from_point_handles_shadow_root_allowlist() {container.setHTMLUnsafe('<script>const ignored = true;</script><svg width="100" height="100"><circle cx="50" cy="50" r="50"></circle></svg>');{const circle = container.querySelector('circle');+ yield;const rect = circle.getBoundingClientRect();const pos = document.caretPositionFromPoint(50, 50);check('svg-circle', pos instanceof CaretPosition && pos.offsetNode === circle && pos.offset === 0, `${labelNode(pos && pos.offsetNode)},${circle.namespaceURI},${rect.left},${rect.top},${rect.width},${rect.height}`);@@ -2785,6 +2790,7 @@ fn document_caret_position_from_point_handles_shadow_root_allowlist() {container.setHTMLUnsafe('<div id="textDivAfterSvg">aaa</div>');{const textDiv = document.getElementById('textDivAfterSvg');+ yield;const rect = textDiv.getBoundingClientRect();const characterWidth = rect.width / textDiv.textContent.length;const pos = document.caretPositionFromPoint(rect.left + characterWidth * 2, rect.top + rect.height / 2);@@ -2795,6 +2801,7 @@ fn document_caret_position_from_point_handles_shadow_root_allowlist() {container.setHTMLUnsafe("<input value='text inside input' />");{const input = container.firstChild;+ yield;const rect = input.getBoundingClientRect();const pos = document.caretPositionFromPoint(rect.left + 1, rect.top + rect.height / 2);check('input', pos.offsetNode === input && pos.offset === 0);@@ -2803,6 +2810,7 @@ fn document_caret_position_from_point_handles_shadow_root_allowlist() {container.setHTMLUnsafe('<textarea rows="3" cols="4">12345678\n901234567890</textarea>');{const textarea = container.firstChild;+ yield;const rect = textarea.getBoundingClientRect();const fontMatch = getComputedStyle(textarea).fontSize.match(/\d+/);const fontSize = fontMatch ? parseInt(fontMatch[0]) : rect.width / 4;@@ -2818,6 +2826,7 @@ fn document_caret_position_from_point_handles_shadow_root_allowlist() {const root = host.attachShadow({ mode: 'closed' });root.setHTMLUnsafe('<span>hello, world</span>');const span = root.firstChild;+ yield;const rect = span.getBoundingClientRect();const pos = document.caretPositionFromPoint(rect.left + rect.width / span.textContent.length * 2, rect.top + rect.height / 2, { shadowRoots: [root] });check('closed-allowed', pos.offsetNode === span.firstChild && pos.offset === 2);@@ -2827,6 +2836,7 @@ fn document_caret_position_from_point_handles_shadow_root_allowlist() {{const root = document.getElementById('host').shadowRoot;const span = root.querySelector('span');+ yield;const rect = span.getBoundingClientRect();const pos = document.caretPositionFromPoint(rect.left + rect.width / span.textContent.length * 2, rect.top + rect.height / 2);const posAllowed = document.caretPositionFromPoint(rect.left + rect.width / span.textContent.length * 2, rect.top + rect.height / 2, { shadowRoots: [root] });@@ -2842,6 +2852,7 @@ fn document_caret_position_from_point_handles_shadow_root_allowlist() {const outerRoot = document.getElementById('outerHost').shadowRoot;const innerRoot = outerRoot.getElementById('innerHost').shadowRoot;const span = innerRoot.querySelector('span');+ yield;const rect = span.getBoundingClientRect();const x = rect.left + rect.width / span.textContent.length * 2;const y = rect.top + rect.height / 2;@@ -2868,12 +2879,11 @@ fn document_caret_position_from_point_handles_shadow_root_allowlist() {#[test]fn document_caret_position_from_point_retargets_media_controls_to_parent() {let mut vm = new_storage_test_vm("https://caret-position-media.test/");- vm.force_fresh_layout_reads_for_test();- let result = vm- .eval(- r#"-(() => {+ let result = eval_with_layout_publications(+ &mut vm,+ r#"+(function* () {const root = document.documentElement || document.appendChild(document.createElement('html'));const body = document.body || root.appendChild(document.createElement('body'));body.innerHTML = '<div id="container"></div>';@@ -2882,7 +2892,8 @@ fn document_caret_position_from_point_retargets_media_controls_to_parent() {for (const tag of ['audio', 'video']) {container.innerHTML = `<${tag} controls></${tag}>`;const media = container.firstElementChild;- const rect = media.getBoundingClientRect();+ yield; // Publish this scene before reading its geometry.+const rect = media.getBoundingClientRect();const pos = document.caretPositionFromPoint(rect.left + rect.width / 2,rect.top + rect.height / 2@@ -2892,8 +2903,8 @@ fn document_caret_position_from_point_retargets_media_controls_to_parent() {return out.join('|');})()"#,- )- .expect("media caret position should evaluate");+ )+ .expect("media caret position should evaluate");assert_eq!(result, "audio:true:0|video:true:0");}@@ -2921,6 +2932,7 @@ fn child_document_caret_position_uses_srcdoc_geometry() {"the srcdoc Document must commit on its own owner turn");+ publish_layout_for_test(&mut vm);let result = vm.eval(r#"@@ -4166,7 +4178,10 @@ fn attach_shadow_reuses_declarative_shadow_root() {}#[test]fn child_document_snapshots_expose_declarative_shadow_roots() {- let mut vm = new_storage_test_vm("https://shadow-root-child-documents.test/");+ let mut vm = new_parsed_test_vm(+ "https://shadow-root-child-documents.test/",+ "<!doctype html><html><body></body></html>",+ );vm.eval(r#"@@ -4215,6 +4230,7 @@ fn child_document_snapshots_expose_declarative_shadow_roots() {"the srcdoc snapshot Document must commit on its own owner turn");+ publish_layout_for_test(&mut vm);let result = vm.eval(r#"@@ -5797,12 +5813,11 @@ fn radio_groups_are_scoped_to_shadow_root_tree() {#[test]fn highlight_registry_hits_shadow_and_light_dom_text_ranges() {let mut vm = new_storage_test_vm("https://highlight-registry-shadow.test/");- vm.force_fresh_layout_reads_for_test();- let result = vm- .eval(- r#"-(() => {+ let result = eval_with_layout_publications(+ &mut vm,+ r#"+(function* () {if (!document.documentElement) {document.appendChild(document.createElement('html'));}@@ -5824,7 +5839,8 @@ fn highlight_registry_hits_shadow_and_light_dom_text_ranges() {range.setEnd(spanInShadowDOM.childNodes[0], 10);const highlight = new Highlight(range);CSS.highlights.set('example-highlight', highlight);- const rect = spanInShadowDOM.getBoundingClientRect();+ yield; // Publish this scene before reading its geometry.+const rect = spanInShadowDOM.getBoundingClientRect();const x = rect.left + 3 * (rect.width / spanInShadowDOM.textContent.length);const y = rect.top + rect.height / 2;const shadowResults = CSS.highlights.highlightsFromPoint(x, y, { shadowRoots: [shadowRoot] });@@ -5841,7 +5857,8 @@ fn highlight_registry_hits_shadow_and_light_dom_text_ranges() {</div>0123456789`);const nestedShadowRoot = container.querySelector('#host').shadowRoot;const nestedSpan = nestedShadowRoot.querySelector('span');- const nestedRect = nestedSpan.getBoundingClientRect();+ yield; // Publish this scene before reading its geometry.+const nestedRect = nestedSpan.getBoundingClientRect();const nestedCharacterWidth = nestedRect.width / nestedSpan.textContent.length;const nestedX = nestedRect.left + nestedCharacterWidth;const textPoint = (node) => {@@ -5881,8 +5898,8 @@ fn highlight_registry_hits_shadow_and_light_dom_text_ranges() {});})()"#,- )- .expect("HighlightRegistry hit testing should evaluate");+ )+ .expect("HighlightRegistry hit testing should evaluate");assert_eq!(result,@@ -5894,10 +5911,10 @@ fn highlight_registry_hits_shadow_and_light_dom_text_ranges() {fn highlight_registry_hits_cross_text_node_range_and_static_range() {let mut vm = new_storage_test_vm("https://highlight-registry-range-static-range.test/");- let result = vm- .eval(- r#"-(() => {+ let result = eval_with_layout_publications(+ &mut vm,+ r#"+(function* () {if (!document.documentElement) {document.appendChild(document.createElement('html'));}@@ -5925,7 +5942,8 @@ fn highlight_registry_hits_cross_text_node_range_and_static_range() {const highlight = new Highlight(liveRange, staticRange);CSS.highlights.set('example-highlight', highlight);- const rect = span1.getBoundingClientRect();+ yield; // Publish this scene before reading its geometry.+const rect = span1.getBoundingClientRect();const characterWidth = rect.width / span1.textContent.length;const characterHeight = rect.height;const names = new Map([[liveRange, 'live'], [staticRange, 'static']]);@@ -5943,8 +5961,8 @@ fn highlight_registry_hits_cross_text_node_range_and_static_range() {].join('|');})()"#,- )- .expect("HighlightRegistry Range/StaticRange hit testing should evaluate");+ )+ .expect("HighlightRegistry Range/StaticRange hit testing should evaluate");assert_eq!(result, "1:static|1:live,static|1:static|0");}@@ -6146,10 +6164,10 @@ fn highlight_and_registry_collection_surfaces_use_live_webidl_iteration() {fn highlight_setlike_add_and_registry_reset_preserve_order() {let mut vm = new_storage_test_vm("https://highlight-setlike.test/");- let result = vm- .eval(- r#"-(() => {+ let result = eval_with_layout_publications(+ &mut vm,+ r#"+(function* () {if (!document.documentElement) {document.appendChild(document.createElement('html'));}@@ -6177,7 +6195,8 @@ fn highlight_setlike_add_and_registry_reset_preserve_order() {CSS.highlights.set('fourth', fourth);CSS.highlights.set('replace-me', replacement);- const rect = span.getBoundingClientRect();+ yield; // Publish this scene before reading its geometry.+const rect = span.getBoundingClientRect();const names = new Map([[first, 'first'],[replacement, 'replacement'],@@ -6197,8 +6216,8 @@ fn highlight_setlike_add_and_registry_reset_preserve_order() {});})()"#,- )- .expect("Highlight setlike and registry order probe should evaluate");+ )+ .expect("Highlight setlike and registry order probe should evaluate");assert_eq!(result,diff --git a/moli-renderer-v8/src/script_vm/tests/element_click.rs b/moli-renderer-v8/src/script_vm/tests/element_click.rsindex 02a1940a7..eec5923a8 100644--- a/moli-renderer-v8/src/script_vm/tests/element_click.rs+++ b/moli-renderer-v8/src/script_vm/tests/element_click.rs@@ -2,36 +2,31 @@ use super::*;use crate::runtime::{RendererElementClickTarget, RendererPointerEventProperties};#[test]-fn native_element_click_cold_preparation_keeps_existing_layout_cost() {- let markup = r#"<!doctype html><html><body>- <button id='target' style='position:absolute;left:40px;top:40px;width:120px;height:70px'>go</button>- </body></html>"#;- let mut reference = new_parsed_test_vm("https://click-js-geometry.test/", markup);- let before = reference.layout_pass_observability_for_test().1;- // The previous preflight's public geometry operations define the budget.- reference- .eval(- r#"(() => {- const target=document.getElementById('target');- target.scrollIntoView({block:'center',inline:'center',behavior:'instant'});- const rect=target.getClientRects()[0];- return document.elementFromPoint((rect.left+rect.right)/2,(rect.top+rect.bottom)/2).id;- })()"#,- )- .expect("existing geometry preparation");- let existing_passes = reference.layout_pass_observability_for_test().1 - before;-- let mut vm = new_parsed_test_vm("https://click-native-geometry.test/", markup);+fn native_element_click_requires_explicit_layout_without_building_it() {+ 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.printToPDF",+ "Page.startScreencast",+ ] {+ assert!(message.contains(command), "{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!(- vm.layout_pass_observability_for_test().1 - before <= existing_passes,- "native preparation must not increase the existing cold layout cost"- );+ assert_eq!(vm.layout_pass_observability_for_test().1, before + 1);}#[test]@@ -58,8 +53,7 @@ fn native_element_click_reuses_frozen_layout_after_dom_and_style_changes() {.expect("install click listener");let target = vm.document_runtime.get_element_by_id("target").unwrap();let before = vm.layout_pass_observability_for_test().1;- vm.eval("document.elementFromPoint(100,75)")- .expect("populate the existing hit-test snapshot");+ publish_layout_for_test(&mut vm);assert_eq!(vm.layout_pass_observability_for_test().1, before + 1);let RendererElementClickTarget::Pointer(first) =vm.prepare_element_click(target).unwrap()@@ -134,3 +128,24 @@ fn native_element_click_mock_preparation_does_not_build_layout() {);assert_eq!(vm.layout_pass_observability_for_test().1, before);}++#[test]+fn native_element_click_does_not_publish_after_scrolling_an_offscreen_target() {+ let mut vm = new_rendered_test_vm(+ "https://click-offscreen.test/",+ "<!doctype html><button id=target style='position:absolute;top:3000px'>go</button>",+ );+ let target = vm.document_runtime.get_element_by_id("target").unwrap();+ let before = vm.layout_pass_observability_for_test().1;+ assert!(matches!(+ vm.prepare_element_click(target),+ Err(crate::runtime::RendererElementClickError::NoClickableRect)+ ));+ 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);+}diff --git a/moli-renderer-v8/src/script_vm/tests/mod.rs b/moli-renderer-v8/src/script_vm/tests/mod.rsindex 990f48189..cca3de55d 100644--- a/moli-renderer-v8/src/script_vm/tests/mod.rs+++ b/moli-renderer-v8/src/script_vm/tests/mod.rs@@ -544,6 +544,32 @@ fn refresh_layout_for_test(vm: &mut StandaloneScriptVmHarness) {);}+fn publish_layout_for_test(vm: &mut StandaloneScriptVmHarness) {+ vm.publish_layout_for_test()+ .expect("fixture screenshot should succeed");+}++// Fixture generators yield only at explicit visual publication boundaries.+// This lets multi-scene probes retain their JS bindings while all ordinary+// evaluate and input helpers remain read-only with respect to layout.+fn eval_with_layout_publications(+ vm: &mut StandaloneScriptVmHarness,+ fixture: &str,+) -> anyhow::Result<String> {+ vm.eval(&format!("globalThis.__layoutFixture = {fixture}"))?;+ while vm.eval("globalThis.__layoutStep = __layoutFixture.next(); __layoutStep.done")? == "false"+ {+ vm.publish_layout_for_test()?;+ }+ vm.eval("__layoutStep.value")+}++fn new_rendered_test_vm(url: &str, markup: &str) -> StandaloneScriptVmHarness {+ let mut vm = new_parsed_test_vm(url, markup);+ publish_layout_for_test(&mut vm);+ vm+}+fn new_storage_test_vm_without_page_residence(url: &str) -> StandaloneScriptVmHarness {let resource_completion_queue = RendererResourceCompletionTestHarness::new();new_storage_test_vm_with_resource_mode_and_residence(diff --git a/moli-renderer-v8/src/script_vm/tests/mouse_snapshot.rs b/moli-renderer-v8/src/script_vm/tests/mouse_snapshot.rsindex a43afa6e4..e7177bdab 100644--- a/moli-renderer-v8/src/script_vm/tests/mouse_snapshot.rs+++ b/moli-renderer-v8/src/script_vm/tests/mouse_snapshot.rs@@ -35,7 +35,13 @@ fn mouse_input_rejects_missing_snapshot_without_layout_or_input_state_changes()assert!(vm.pending_mouse_press.is_none());}assert_eq!(vm.eval("JSON.stringify(events)").unwrap(), "[]");- vm.eval("target.getBoundingClientRect()").unwrap();+ assert_eq!(+ vm.eval("String(target.getBoundingClientRect().width)")+ .unwrap(),+ "0"+ );+ 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();@@ -49,7 +55,9 @@ fn mouse_input_rejects_a_snapshot_from_a_replaced_document() {"https://mouse-snapshot.test/","<!doctype html><button>old</button>",);- vm.eval("document.body.getBoundingClientRect();document.open();document.write('<button>new</button>');document.close()").unwrap();+ refresh_layout_for_test(&mut vm);+ vm.eval("document.open();document.write('<button>new</button>');document.close()")+ .unwrap();let before = vm.layout_pass_observability_for_test().1;let error = mouse(&mut vm, "mousedown").unwrap_err();assert_eq!(@@ -84,9 +92,10 @@ fn mouse_click_consumes_snapshot_through_hover_focus_and_dom_mutation() {veil.style.cssText='position:fixed;inset:0;z-index:999';document.body.appendChild(veil);});- target.getBoundingClientRect();"#,+ "#,).unwrap();+ refresh_layout_for_test(&mut vm);let before = vm.layout_pass_observability_for_test().1;for event in ["mousemove", "mousedown", "mouseup"] {mouse(&mut vm, event).unwrap();@@ -116,7 +125,11 @@ fn mouse_and_geometry_reuse_the_snapshot_until_fresh_paint() {r#"<!doctype html><style>body{min-height:100px}</style><button id=target style='position:absolute;left:20px;top:20px;width:100px;height:100px'>go</button>"#,);- vm.eval("window.hits=[];document.onmousemove=e=>hits.push(e.target.id);target.getBoundingClientRect();target.style.left='300px'").unwrap();+ refresh_layout_for_test(&mut vm);+ vm.eval(+ "window.hits=[];document.onmousemove=e=>hits.push(e.target.id);target.style.left='300px'",+ )+ .unwrap();let before = vm.layout_pass_observability_for_test().1;mouse(&mut vm, "mousemove").unwrap();assert_eq!(vm.eval("JSON.stringify(hits)").unwrap(), r#"["target"]"#);@@ -149,7 +162,8 @@ fn mouse_handler_geometry_reads_reuse_the_published_snapshot() {r#"<!doctype html><button id=target style='position:absolute;left:20px;top:20px;width:100px;height:100px'>go</button>"#,);- vm.eval("target.getBoundingClientRect();target.onmousemove=()=>{target.style.left='300px';window.observedLeft=target.getBoundingClientRect().left}").unwrap();+ refresh_layout_for_test(&mut vm);+ vm.eval("target.onmousemove=()=>{target.style.left='300px';window.observedLeft=target.getBoundingClientRect().left}").unwrap();let before = vm.layout_pass_observability_for_test().1;mouse(&mut vm, "mousemove").unwrap();assert_eq!(vm.eval("String(observedLeft)").unwrap(), "20");@@ -165,7 +179,7 @@ fn mouse_wheel_updates_scroll_without_refreshing_the_rendered_world() {<div style='height:1000px'>content</div></div>"#,);- vm.eval("target.getBoundingClientRect()").unwrap();+ refresh_layout_for_test(&mut vm);let before = vm.layout_pass_observability_for_test().1;for _ in 0..3 {vm.dispatch_mouse_event_at_point(60.0, 60.0, "wheel", -1, Some(0), 0.0, 50.0)diff --git a/moli-renderer-v8/src/script_vm/tests/webidl_fetch.rs b/moli-renderer-v8/src/script_vm/tests/webidl_fetch.rsindex 59f8d35cd..4f275e20e 100644--- a/moli-renderer-v8/src/script_vm/tests/webidl_fetch.rs+++ b/moli-renderer-v8/src/script_vm/tests/webidl_fetch.rs@@ -6484,15 +6484,16 @@ fn resize_observer_callbacks_apply_webidl_conversion() {fn resize_observer_entries_expose_box_size_arrays() {let mut vm = new_storage_test_vm("https://resize-observer-box-size.test/");- let result = vm- .eval(- r#"-(() => {+ let result = eval_with_layout_publications(+ &mut vm,+ r#"+(function* () {const html = document.documentElement || document.appendChild(document.createElement('html'));const body = document.body || html.appendChild(document.createElement('body'));const target = document.createElement('div');target.style.cssText = 'width: 41px; height: 23px';body.appendChild(target);+yield; // Publish this scene before reading its geometry.const observer = new ResizeObserver(() => {});observer.observe(target, { box: 'border-box' });const first = observer.takeRecords()[0];@@ -6514,8 +6515,8 @@ fn resize_observer_entries_expose_box_size_arrays() {].join('|');})()"#,- )- .expect("ResizeObserver box-size entries should evaluate");+ )+ .expect("ResizeObserver box-size entries should evaluate");assert_eq!(result,@@ -6615,10 +6616,9 @@ fn resize_observer_declared_slots_ignore_prototype_spoofing() {fn resize_observer_observed_records_ignore_public_spoofing() {let mut vm = new_storage_test_vm("https://resize-observer-record-slots.test/");- let result = vm- .eval(+ let result = eval_with_layout_publications(&mut vm,r#"-(() => {+(function* () {const html = document.documentElement || document.appendChild(document.createElement('html'));const body = document.body || html.appendChild(document.createElement('body'));const target = document.createElement('div');@@ -6632,6 +6632,7 @@ fn resize_observer_observed_records_ignore_public_spoofing() {target.__moliResizeObserverRecordTarget = other;target.__moliResizeObserverRecordBox = 'border-box';+yield; // Publish this scene before reading its geometry.const observer = new ResizeObserver(() => {});observer.observe(target, { box: 'content-box' });observer.observe(target, { box: 'border-box' });diff --git a/moli-renderer-v8/src/window_host.rs b/moli-renderer-v8/src/window_host.rsindex 0d37e7404..a71df877f 100644--- a/moli-renderer-v8/src/window_host.rs+++ b/moli-renderer-v8/src/window_host.rs@@ -1313,7 +1313,6 @@ fn mouse_event_offset_getter(unsafe { &*runtime_ptr },handle,moli_layout::LayoutPoint::new(client_x as f32, client_y as f32),- moli_layout::LayoutFlushReason::SynchronousGeometry,) {Ok(offset) => offset,Err(error) => {diff --git a/moli/tests/fetch_cli/eval.rs b/moli/tests/fetch_cli/eval.rsindex f14289cc3..4ed8d1e32 100644--- a/moli/tests/fetch_cli/eval.rs+++ b/moli/tests/fetch_cli/eval.rs@@ -164,29 +164,15 @@ fn eval_computed_sizes_only_use_existing_geometry_with_or_without_css() -> Resulserde_json::json!(["auto", "auto", "auto", "auto"]),"width/height must not initiate layout: {args:?}: {value}");+ assert_eq!(+ value["after"], value["before"],+ "geometry reads cannot publish used sizes: {args:?}: {value}"+ );if args.contains(&"--layout") {- let expected = value["geometry"]- .as_array()- .expect("geometry array")- .iter()- .map(|value| format!("{}px", value.as_i64().expect("integer offset size")))- .collect::<Vec<_>>();- assert_eq!(- value["after"],- serde_json::json!(expected),- "{args:?}: {value}"- );- if args.contains(&"--disable-css") {- assert!(value["geometry"][0].as_i64().expect("block width") > 20);- assert_eq!(value["geometry"][2], 300);- assert_eq!(value["geometry"][3], 150);- } else {- assert_eq!(value["geometry"], serde_json::json!([20, 0, 40, 20]));- }- } else {assert_eq!(- value["after"], value["before"],- "Mock geometry must not manufacture a real layout snapshot"+ value["geometry"],+ serde_json::json!([0, 0, 0, 0]),+ "real geometry is empty before an explicit output");}}