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(renderer): make lifecycle document ids opaque
ldm03ad7dfda809d
diff --git a/moli-protocol-server/src/cdp_scheduler/tests.rs b/moli-protocol-server/src/cdp_scheduler/tests.rsindex 13e50eeff..b372b749f 100644--- a/moli-protocol-server/src/cdp_scheduler/tests.rs+++ b/moli-protocol-server/src/cdp_scheduler/tests.rs@@ -428,10 +428,7 @@ fn renderer_output_record(page_id: PageId, sequence: u64) -> RendererOutputRecorRendererOutputRecord::new_for_test(RendererOutputItem::Observation(RendererProtocolObservation::DocumentLifecycle(RendererDocumentLifecycleEvent {frame: RendererFrameToken { page_id },- document: RendererDocumentToken {- page_id,- generation: 1,- },+ document: RendererDocumentToken::new_for_testing(page_id, 1),epoch: RendererLifecycleEpoch(1),sequence,timestamp_micros: sequence,@@ -462,9 +459,9 @@ fn unconstrained_renderer_publication(page_id: PageId) -> RendererOutputTransporfn post_load_renderer_publication(page_id: PageId,- document_generation: u64,+ lifecycle_document_id: u64,) -> RendererOutputTransportMessage {- let source_document = root_document_lifecycle_identity(page_id, document_generation);+ let source_document = root_document_lifecycle_identity(page_id, lifecycle_document_id);renderer_publication(page_id,1,@@ -481,15 +478,12 @@ fn publication_cursor(publication: &RendererOutputTransportMessage) -> RendererOfn root_document_lifecycle_identity(page_id: PageId,- generation: u64,+ identity_value: u64,) -> RendererDocumentLifecycleIdentity {RendererDocumentLifecycleIdentity {frame: RendererFrameToken { page_id },- document: RendererDocumentToken {- page_id,- generation,- },- epoch: RendererLifecycleEpoch(generation),+ document: RendererDocumentToken::new_for_testing(page_id, identity_value),+ epoch: RendererLifecycleEpoch(identity_value),}}diff --git a/moli-protocol/src/conn/output.rs b/moli-protocol/src/conn/output.rsindex a29ad54fd..95e1f8410 100644--- a/moli-protocol/src/conn/output.rs+++ b/moli-protocol/src/conn/output.rs@@ -4483,10 +4483,7 @@ mod tests {#[test]fn renderer_page_load_matches_wait_key_by_document_and_epoch() {let page_id = PageId::new_for_testing(902);- let document = RendererDocumentToken {- page_id,- generation: 3,- };+ let document = RendererDocumentToken::new_for_testing(page_id, 3);let event = NavigationLifecycleEvent {target_id: DevToolsTargetId::from("FRAME"),frame_id: DevToolsFrameId::from("FRAME"),diff --git a/moli-protocol/src/conn/state/javascript_dialog.rs b/moli-protocol/src/conn/state/javascript_dialog.rsindex bfe66031a..2a6a019fa 100644--- a/moli-protocol/src/conn/state/javascript_dialog.rs+++ b/moli-protocol/src/conn/state/javascript_dialog.rs@@ -391,10 +391,7 @@ mod tests {let page_id = PageId::new_for_testing(1);let source_document = RendererDocumentLifecycleIdentity {frame: RendererFrameToken { page_id },- document: RendererDocumentToken {- page_id,- generation: 1,- },+ document: RendererDocumentToken::new_for_testing(page_id, 1),epoch: RendererLifecycleEpoch(1),};let completion = RendererJavaScriptDialogCompletion::pending();diff --git a/moli-protocol/src/conn/state/page_slot.rs b/moli-protocol/src/conn/state/page_slot.rsindex a761f46eb..3ee27ba80 100644--- a/moli-protocol/src/conn/state/page_slot.rs+++ b/moli-protocol/src/conn/state/page_slot.rs@@ -943,8 +943,7 @@ impl TargetPageSlot {}tracing::trace!(target: "moli_renderer_document_lifecycle",- renderer_page_id = active_document.page_id.as_u64(),- renderer_document_generation = active_document.generation,+ renderer_document = ?active_document,renderer_lifecycle_epoch = active_epoch.0,frame_id = binding.frame_id,loader_id = binding.loader_id,@@ -1648,10 +1647,7 @@ mod renderer_document_lifecycle_tests {#[test]fn lifecycle_binding_requires_and_tracks_the_current_page_attachment() {let page_id = moli_core::PageId::new_for_testing(8);- let document = RendererDocumentToken {- page_id,- generation: 1,- };+ let document = RendererDocumentToken::new_for_testing(page_id, 1);let epoch = RendererLifecycleEpoch(1);let started = event(document,@@ -1713,10 +1709,7 @@ mod renderer_document_lifecycle_tests {#[test]fn binding_accepts_current_identity_and_rejects_stale_document() {let page_id = moli_core::PageId::new_for_testing(9);- let document = RendererDocumentToken {- page_id,- generation: 1,- };+ let document = RendererDocumentToken::new_for_testing(page_id, 1);let epoch = RendererLifecycleEpoch(1);let started = event(document,@@ -1786,10 +1779,7 @@ mod renderer_document_lifecycle_tests {);let stale = event(- RendererDocumentToken {- generation: 2,- ..document- },+ document.successor_for_testing(),epoch,3,RendererDocumentLifecycleEventKind::Milestone(RendererDocumentLifecycleMilestone::Load),@@ -1809,10 +1799,7 @@ mod renderer_document_lifecycle_tests {#[test]fn load_visibility_barrier_exposes_dcl_and_defers_only_load_delivery() {let page_id = moli_core::PageId::new_for_testing(10);- let document = RendererDocumentToken {- page_id,- generation: 1,- };+ let document = RendererDocumentToken::new_for_testing(page_id, 1);let epoch = RendererLifecycleEpoch(1);let started = event(document,@@ -1953,10 +1940,7 @@ mod renderer_document_lifecycle_tests {#[test]fn cancelling_load_visibility_barrier_discards_tail_without_revealing_it() {let page_id = moli_core::PageId::new_for_testing(16);- let document = RendererDocumentToken {- page_id,- generation: 1,- };+ let document = RendererDocumentToken::new_for_testing(page_id, 1);let epoch = RendererLifecycleEpoch(1);let started = event(document,@@ -2021,10 +2005,7 @@ mod renderer_document_lifecycle_tests {#[test]fn load_visibility_barrier_keeps_later_epoch_behind_deferred_load_tail() {let page_id = moli_core::PageId::new_for_testing(11);- let document = RendererDocumentToken {- page_id,- generation: 1,- };+ let document = RendererDocumentToken::new_for_testing(page_id, 1);let first_epoch = RendererLifecycleEpoch(1);let second_epoch = RendererLifecycleEpoch(2);let started = event(@@ -2156,10 +2137,7 @@ mod renderer_document_lifecycle_tests {#[test]fn same_document_restart_advances_epoch_without_rebinding_loader() {let page_id = moli_core::PageId::new_for_testing(10);- let document = RendererDocumentToken {- page_id,- generation: 1,- };+ let document = RendererDocumentToken::new_for_testing(page_id, 1);let first_epoch = RendererLifecycleEpoch(1);let started = event(document,@@ -2239,10 +2217,7 @@ mod renderer_document_lifecycle_tests {#[test]fn creation_handoff_preserves_completed_epochs_before_the_active_epoch() {let page_id = moli_core::PageId::new_for_testing(11);- let document = RendererDocumentToken {- page_id,- generation: 1,- };+ let document = RendererDocumentToken::new_for_testing(page_id, 1);let first_epoch = RendererLifecycleEpoch(1);let second_epoch = RendererLifecycleEpoch(2);let first_started = event(@@ -2332,10 +2307,7 @@ mod renderer_document_lifecycle_tests {#[test]fn successor_document_binding_discards_deferred_tail_but_preserves_reached_waiter() {let page_id = moli_core::PageId::new_for_testing(14);- let document = RendererDocumentToken {- page_id,- generation: 1,- };+ let document = RendererDocumentToken::new_for_testing(page_id, 1);let epoch = RendererLifecycleEpoch(1);let started = event(document,@@ -2413,10 +2385,7 @@ mod renderer_document_lifecycle_tests {.is_some_and(|snapshot| snapshot.load.is_none()));- let successor = RendererDocumentToken {- page_id,- generation: 2,- };+ let successor = RendererDocumentToken::new_for_testing(page_id, 2);let successor_epoch = RendererLifecycleEpoch(2);let successor_started = event(successor,@@ -2482,10 +2451,7 @@ mod renderer_document_lifecycle_tests {#[test]fn post_load_observers_are_armed_once_and_bound_to_the_loaded_document() {let page_id = moli_core::PageId::new_for_testing(12);- let document = RendererDocumentToken {- page_id,- generation: 1,- };+ let document = RendererDocumentToken::new_for_testing(page_id, 1);let epoch = RendererLifecycleEpoch(1);let started = event(document,diff --git a/moli-protocol/src/conn/state/runtime_slot.rs b/moli-protocol/src/conn/state/runtime_slot.rsindex 6552344b8..8df55d07d 100644--- a/moli-protocol/src/conn/state/runtime_slot.rs+++ b/moli-protocol/src/conn/state/runtime_slot.rs@@ -1484,10 +1484,7 @@ mod tests {page_attachment_id: TargetPageAttachmentId::from_raw_for_test(1),binding: CommittedRendererDocumentBinding {renderer_frame: RendererFrameToken { page_id },- renderer_document: RendererDocumentToken {- page_id,- generation: 1,- },+ renderer_document: RendererDocumentToken::new_for_testing(page_id, 1),renderer_epoch: RendererLifecycleEpoch(1),navigation: None,frame_id: "FRAME-old".to_owned(),diff --git a/moli-protocol/src/conn/tests/resource_runtime.rs b/moli-protocol/src/conn/tests/resource_runtime.rsindex 5d54957b1..d60ac5c03 100644--- a/moli-protocol/src/conn/tests/resource_runtime.rs+++ b/moli-protocol/src/conn/tests/resource_runtime.rs@@ -1460,10 +1460,7 @@ fn devtools_document_lifecycle_wait_key_observes_interruption_and_target_loss()let page_id = moli_core::PageId::new_for_testing(901);let frame = moli_core::page::RendererFrameToken { page_id };- let document = moli_core::page::RendererDocumentToken {- page_id,- generation: 1,- };+ let document = moli_core::page::RendererDocumentToken::new_for_testing(page_id, 1);let epoch = moli_core::page::RendererLifecycleEpoch(1);let started = moli_core::page::RendererDocumentLifecycleEvent {frame,diff --git a/moli-protocol/src/domains/activity/main_document.rs b/moli-protocol/src/domains/activity/main_document.rsindex 20054e6df..acc978d72 100644--- a/moli-protocol/src/domains/activity/main_document.rs+++ b/moli-protocol/src/domains/activity/main_document.rs@@ -998,10 +998,7 @@ mod tests {let page_id = moli_core::PageId::new_for_testing(71);let frame = RendererFrameToken { page_id };- let document = RendererDocumentToken {- page_id,- generation: 1,- };+ let document = RendererDocumentToken::new_for_testing(page_id, 1);let epoch = RendererLifecycleEpoch(1);let started = RendererDocumentLifecycleEvent {frame,@@ -1345,10 +1342,7 @@ mod tests {let mut output = CommandOutputBuffer::default();let page_id = moli_core::PageId::new_for_testing(17);let renderer_frame = RendererFrameToken { page_id };- let renderer_document = RendererDocumentToken {- page_id,- generation: 1,- };+ let renderer_document = RendererDocumentToken::new_for_testing(page_id, 1);let renderer_epoch = RendererLifecycleEpoch(1);let renderer_document_binding = CommittedRendererDocumentBinding {renderer_frame,diff --git a/moli-protocol/src/domains/activity/output_ingress/ordered_stream.rs b/moli-protocol/src/domains/activity/output_ingress/ordered_stream.rsindex 0ff561263..24549d222 100644--- a/moli-protocol/src/domains/activity/output_ingress/ordered_stream.rs+++ b/moli-protocol/src/domains/activity/output_ingress/ordered_stream.rs@@ -477,10 +477,10 @@ mod tests {frame: RendererFrameToken {page_id: PageId::new_for_testing(1),},- document: RendererDocumentToken {- page_id: PageId::new_for_testing(1),- generation: 1,- },+ document: RendererDocumentToken::new_for_testing(+ PageId::new_for_testing(1),+ 1,+ ),epoch: RendererLifecycleEpoch(1),sequence,timestamp_micros: sequence,diff --git a/moli-protocol/src/domains/activity/runtime_command_barrier.rs b/moli-protocol/src/domains/activity/runtime_command_barrier.rsindex 14e0f35eb..ecb3f89fa 100644--- a/moli-protocol/src/domains/activity/runtime_command_barrier.rs+++ b/moli-protocol/src/domains/activity/runtime_command_barrier.rs@@ -518,10 +518,7 @@ mod tests {.renderer_page_id();RendererDocumentLifecycleIdentity {frame: RendererFrameToken { page_id },- document: RendererDocumentToken {- page_id,- generation: 1,- },+ document: RendererDocumentToken::new_for_testing(page_id, 1),epoch: RendererLifecycleEpoch(1),}}diff --git a/moli-protocol/src/domains/input.rs b/moli-protocol/src/domains/input.rsindex 11944be95..3c04d7c13 100644--- a/moli-protocol/src/domains/input.rs+++ b/moli-protocol/src/domains/input.rs@@ -1997,16 +1997,13 @@ mod producer_tests {use crate::domains::activity::ProtocolOutputPayloads;fn renderer_document_identity_for_test(- document_generation: u64,+ lifecycle_document_id: u64,epoch: u64,) -> RendererDocumentLifecycleIdentity {let page_id = moli_core::PageId::new_for_testing(31);RendererDocumentLifecycleIdentity {frame: RendererFrameToken { page_id },- document: RendererDocumentToken {- page_id,- generation: document_generation,- },+ document: RendererDocumentToken::new_for_testing(page_id, lifecycle_document_id),epoch: RendererLifecycleEpoch(epoch),}}diff --git a/moli-protocol/src/domains/page.rs b/moli-protocol/src/domains/page.rsindex 63cab4d13..ff219e4b1 100644--- a/moli-protocol/src/domains/page.rs+++ b/moli-protocol/src/domains/page.rs@@ -2457,16 +2457,13 @@ mod producer_tests {use crate::testing::TestContext;fn renderer_document_identity_for_test(- document_generation: u64,+ lifecycle_document_id: u64,epoch: u64,) -> RendererDocumentLifecycleIdentity {let page_id = moli_core::PageId::new_for_testing(1);RendererDocumentLifecycleIdentity {frame: RendererFrameToken { page_id },- document: RendererDocumentToken {- page_id,- generation: document_generation,- },+ document: RendererDocumentToken::new_for_testing(page_id, lifecycle_document_id),epoch: RendererLifecycleEpoch(epoch),}}diff --git a/moli-protocol/src/domains/page/lifecycle.rs b/moli-protocol/src/domains/page/lifecycle.rsindex ee86834cb..26ef94073 100644--- a/moli-protocol/src/domains/page/lifecycle.rs+++ b/moli-protocol/src/domains/page/lifecycle.rs@@ -882,10 +882,7 @@ mod tests {&mut events,Some("SID-page"),true,- moli_core::page::RendererDocumentToken {- page_id,- generation: 1,- },+ moli_core::page::RendererDocumentToken::new_for_testing(page_id, 1),moli_core::page::RendererLifecycleEpoch(1),"FRAME-page","LOADER-page",diff --git a/moli-protocol/src/domains/page/popup.rs b/moli-protocol/src/domains/page/popup.rsindex e49de6216..d8eb781a9 100644--- a/moli-protocol/src/domains/page/popup.rs+++ b/moli-protocol/src/domains/page/popup.rs@@ -218,10 +218,7 @@ mod tests {let page_id = PageId::new_for_testing(1);RendererDocumentLifecycleIdentity {frame: RendererFrameToken { page_id },- document: RendererDocumentToken {- page_id,- generation: 3,- },+ document: RendererDocumentToken::new_for_testing(page_id, 3),epoch: RendererLifecycleEpoch(5),}}diff --git a/moli-protocol/src/domains/page/tests/mod.rs b/moli-protocol/src/domains/page/tests/mod.rsindex 9c235b9e6..2926e750d 100644--- a/moli-protocol/src/domains/page/tests/mod.rs+++ b/moli-protocol/src/domains/page/tests/mod.rs@@ -38,10 +38,7 @@ fn renderer_dialog_source_document_for_test() -> RendererDocumentLifecycleIdentilet page_id = moli_core::PageId::new_for_testing(77);RendererDocumentLifecycleIdentity {frame: RendererFrameToken { page_id },- document: RendererDocumentToken {- page_id,- generation: 1,- },+ document: RendererDocumentToken::new_for_testing(page_id, 1),epoch: RendererLifecycleEpoch(1),}}diff --git a/moli-renderer-v8/src/page_task_queue/child_frame_task.rs b/moli-renderer-v8/src/page_task_queue/child_frame_task.rsindex 070b85cfb..631553d4a 100644--- a/moli-renderer-v8/src/page_task_queue/child_frame_task.rs+++ b/moli-renderer-v8/src/page_task_queue/child_frame_task.rs@@ -723,10 +723,7 @@ mod tests {};fn root_document() -> RendererDocumentToken {- RendererDocumentToken {- page_id: PageId::new_for_testing(7),- generation: 11,- }+ RendererDocumentToken::new_for_testing(PageId::new_for_testing(7), 11)}fn parser_root_task(diff --git a/moli-renderer-v8/src/page_task_queue/dynamic_import_owner_action.rs b/moli-renderer-v8/src/page_task_queue/dynamic_import_owner_action.rsindex 9bf1947a0..3b114d8b8 100644--- a/moli-renderer-v8/src/page_task_queue/dynamic_import_owner_action.rs+++ b/moli-renderer-v8/src/page_task_queue/dynamic_import_owner_action.rs@@ -278,11 +278,8 @@ mod tests {RendererPageTaskTestResidence,};- fn document_token(page_id: PageId, generation: u64) -> RendererDocumentToken {- RendererDocumentToken {- page_id,- generation,- }+ fn document_token(page_id: PageId, lifecycle_document_id: u64) -> RendererDocumentToken {+ RendererDocumentToken::new_for_testing(page_id, lifecycle_document_id)}fn prepared_action(diff --git a/moli-renderer-v8/src/page_task_queue/main_document_runtime.rs b/moli-renderer-v8/src/page_task_queue/main_document_runtime.rsindex 7edfa9c2e..556e0e605 100644--- a/moli-renderer-v8/src/page_task_queue/main_document_runtime.rs+++ b/moli-renderer-v8/src/page_task_queue/main_document_runtime.rs@@ -923,11 +923,8 @@ mod tests {)}- fn document_token(generation: u64) -> RendererDocumentToken {- RendererDocumentToken {- page_id: PageId::new_for_testing(7),- generation,- }+ fn document_token(lifecycle_document_id: u64) -> RendererDocumentToken {+ RendererDocumentToken::new_for_testing(PageId::new_for_testing(7), lifecycle_document_id)}fn prepared_script() -> PreparedScript {diff --git a/moli-renderer-v8/src/page_task_queue/main_parser_continuation.rs b/moli-renderer-v8/src/page_task_queue/main_parser_continuation.rsindex 79da26cd1..fef3c3ff7 100644--- a/moli-renderer-v8/src/page_task_queue/main_parser_continuation.rs+++ b/moli-renderer-v8/src/page_task_queue/main_parser_continuation.rs@@ -202,10 +202,8 @@ mod tests {RendererPageNetworkingSource,RendererPageMainParserContinuationProducer,) {- let root_document = RendererDocumentToken {- page_id: crate::PageId::new_for_testing(11),- generation: 7,- };+ let root_document =+ RendererDocumentToken::new_for_testing(crate::PageId::new_for_testing(11), 7);let (wake_tx, _wake_rx) = tokio::sync::mpsc::unbounded_channel();let source = RendererPageNetworkingSource::new_owner_attached(PageRuntimeWakeSignal::default(),diff --git a/moli-renderer-v8/src/page_task_queue/media_element_event.rs b/moli-renderer-v8/src/page_task_queue/media_element_event.rsindex dbbf8a5fe..f75e96a1f 100644--- a/moli-renderer-v8/src/page_task_queue/media_element_event.rs+++ b/moli-renderer-v8/src/page_task_queue/media_element_event.rs@@ -72,10 +72,7 @@ mod tests {};fn root_document() -> RendererDocumentToken {- RendererDocumentToken {- page_id: PageId::new_for_testing(81),- generation: 4,- }+ RendererDocumentToken::new_for_testing(PageId::new_for_testing(81), 4)}fn target(document_id: u64) -> WindowDocumentTaskTarget {diff --git a/moli-renderer-v8/src/page_task_queue/modulepreload_start.rs b/moli-renderer-v8/src/page_task_queue/modulepreload_start.rsindex 8cb556a17..1e477a680 100644--- a/moli-renderer-v8/src/page_task_queue/modulepreload_start.rs+++ b/moli-renderer-v8/src/page_task_queue/modulepreload_start.rs@@ -265,11 +265,8 @@ mod tests {RendererPageTaskTestResidence,};- fn document_token(page_id: PageId, generation: u64) -> RendererDocumentToken {- RendererDocumentToken {- page_id,- generation,- }+ fn document_token(page_id: PageId, lifecycle_document_id: u64) -> RendererDocumentToken {+ RendererDocumentToken::new_for_testing(page_id, lifecycle_document_id)}fn start_task(@@ -306,7 +303,7 @@ mod tests {}#[test]- fn page_generation_senders_share_one_route_but_stamp_distinct_root_documents() {+ fn lifecycle_document_senders_share_one_route_but_stamp_distinct_root_documents() {let page_id = PageId::new_for_testing(41);let (wake_tx, mut wake_rx) = tokio::sync::mpsc::unbounded_channel();let wake =diff --git a/moli-renderer-v8/src/page_task_queue/owner_sources.rs b/moli-renderer-v8/src/page_task_queue/owner_sources.rsindex 18fa17b39..6637ee016 100644--- a/moli-renderer-v8/src/page_task_queue/owner_sources.rs+++ b/moli-renderer-v8/src/page_task_queue/owner_sources.rs@@ -2404,11 +2404,8 @@ mod tests {types::{ChildDocumentLoadCompletion, DocumentWriteExternalScriptLoadCompletion},};- fn document_token(generation: u64) -> RendererDocumentToken {- RendererDocumentToken {- page_id: PageId::new_for_testing(9001),- generation,- }+ fn document_token(lifecycle_document_id: u64) -> RendererDocumentToken {+ RendererDocumentToken::new_for_testing(PageId::new_for_testing(9001), lifecycle_document_id)}fn resource_completion(load_id: u64) -> RendererPageResourceCompletion {diff --git a/moli-renderer-v8/src/page_task_queue/owner_sources/conformance_tests.rs b/moli-renderer-v8/src/page_task_queue/owner_sources/conformance_tests.rsindex 97e2169de..8db05f462 100644--- a/moli-renderer-v8/src/page_task_queue/owner_sources/conformance_tests.rs+++ b/moli-renderer-v8/src/page_task_queue/owner_sources/conformance_tests.rs@@ -178,11 +178,8 @@ fn assert_fifo_replacement_and_route_retirement(mut lane: impl TypedPageSourceCo);}-fn document_token(generation: u64) -> RendererDocumentToken {- RendererDocumentToken {- page_id: PageId::new_for_testing(9101),- generation,- }+fn document_token(lifecycle_document_id: u64) -> RendererDocumentToken {+ RendererDocumentToken::new_for_testing(PageId::new_for_testing(9101), lifecycle_document_id)}struct ResourceCompletionLane {diff --git a/moli-renderer-v8/src/page_task_queue/rendering_update.rs b/moli-renderer-v8/src/page_task_queue/rendering_update.rsindex e2f8b10a9..cd3121c2f 100644--- a/moli-renderer-v8/src/page_task_queue/rendering_update.rs+++ b/moli-renderer-v8/src/page_task_queue/rendering_update.rs@@ -79,10 +79,7 @@ mod tests {};fn root_document() -> RendererDocumentToken {- RendererDocumentToken {- page_id: PageId::new_for_testing(71),- generation: 3,- }+ RendererDocumentToken::new_for_testing(PageId::new_for_testing(71), 3)}fn target(document_id: u64) -> WindowDocumentTaskTarget {diff --git a/moli-renderer-v8/src/page_task_queue/resource_completions.rs b/moli-renderer-v8/src/page_task_queue/resource_completions.rsindex 4286b81d7..aa748f74a 100644--- a/moli-renderer-v8/src/page_task_queue/resource_completions.rs+++ b/moli-renderer-v8/src/page_task_queue/resource_completions.rs@@ -868,10 +868,7 @@ mod tests {owner_attached_page_queue(RendererPageToken::new_for_testing(page_id), wake_tx);let sender = RendererResourceCompletionSender::for_page_resource_test(page_queue.sender(),- RendererDocumentToken {- page_id,- generation: 1,- },+ RendererDocumentToken::new_for_testing(page_id, 1),);sender@@ -1306,10 +1303,7 @@ mod tests {let token =crate::runtime::RendererPageToken::new_for_testing(crate::PageId::new_for_testing(19));let mut page_queue = owner_attached_page_queue(token, wake_tx);- let root_document = RendererDocumentToken {- page_id: token.page_id(),- generation: 7,- };+ let root_document = RendererDocumentToken::new_for_testing(token.page_id(), 7);let sender = RendererResourceCompletionSender::for_page_resource_test(page_queue.sender(),root_document,@@ -1349,10 +1343,7 @@ mod tests {let token =crate::runtime::RendererPageToken::new_for_testing(crate::PageId::new_for_testing(20));let mut page_queue = owner_attached_page_queue(token, wake_tx);- let root_document = RendererDocumentToken {- page_id: token.page_id(),- generation: 8,- };+ let root_document = RendererDocumentToken::new_for_testing(token.page_id(), 8);let sender = RendererResourceCompletionSender::for_page_resource_test(page_queue.sender(),root_document,@@ -1394,10 +1385,7 @@ mod tests {let page_queue = owner_attached_page_queue(token, wake_tx);let sender = RendererResourceCompletionSender::for_page_resource_test(page_queue.sender(),- RendererDocumentToken {- page_id: token.page_id(),- generation: 2,- },+ RendererDocumentToken::new_for_testing(token.page_id(), 2),);drop(page_queue);@@ -1420,10 +1408,7 @@ mod tests {let token =crate::runtime::RendererPageToken::new_for_testing(crate::PageId::new_for_testing(25));let mut page_queue = owner_attached_page_queue(token, wake_tx);- let root_document = RendererDocumentToken {- page_id: token.page_id(),- generation: 11,- };+ let root_document = RendererDocumentToken::new_for_testing(token.page_id(), 11);let sender = RendererResourceCompletionSender::for_page_resource_test(page_queue.sender(),root_document,@@ -1465,10 +1450,7 @@ mod tests {let page_queue = owner_attached_page_queue(token, wake_tx);let sender = RendererResourceCompletionSender::for_page_resource_test(page_queue.sender(),- RendererDocumentToken {- page_id: token.page_id(),- generation: 12,- },+ RendererDocumentToken::new_for_testing(token.page_id(), 12),);drop(page_queue);@@ -1491,10 +1473,7 @@ mod tests {let token =crate::runtime::RendererPageToken::new_for_testing(crate::PageId::new_for_testing(29));let mut page_queue = owner_attached_page_queue(token, wake_tx);- let root_document = RendererDocumentToken {- page_id: token.page_id(),- generation: 15,- };+ let root_document = RendererDocumentToken::new_for_testing(token.page_id(), 15);let sender = RendererResourceCompletionSender::for_page_resource_test(page_queue.sender(),root_document,@@ -1537,10 +1516,7 @@ mod tests {let page_queue = owner_attached_page_queue(token, wake_tx);let sender = RendererResourceCompletionSender::for_page_resource_test(page_queue.sender(),- RendererDocumentToken {- page_id: token.page_id(),- generation: 16,- },+ RendererDocumentToken::new_for_testing(token.page_id(), 16),);drop(page_queue);@@ -1563,10 +1539,7 @@ mod tests {let token =crate::runtime::RendererPageToken::new_for_testing(crate::PageId::new_for_testing(27));let mut page_queue = owner_attached_page_queue(token, wake_tx);- let root_document = RendererDocumentToken {- page_id: token.page_id(),- generation: 13,- };+ let root_document = RendererDocumentToken::new_for_testing(token.page_id(), 13);let sender = RendererResourceCompletionSender::for_page_resource_test(page_queue.sender(),root_document,@@ -1605,10 +1578,7 @@ mod tests {let page_queue = owner_attached_page_queue(token, wake_tx);let sender = RendererResourceCompletionSender::for_page_resource_test(page_queue.sender(),- RendererDocumentToken {- page_id: token.page_id(),- generation: 14,- },+ RendererDocumentToken::new_for_testing(token.page_id(), 14),);drop(page_queue);@@ -1631,10 +1601,7 @@ mod tests {let token =crate::runtime::RendererPageToken::new_for_testing(crate::PageId::new_for_testing(21));let mut page_queue = owner_attached_page_queue(token, wake_tx);- let root_document = RendererDocumentToken {- page_id: token.page_id(),- generation: 9,- };+ let root_document = RendererDocumentToken::new_for_testing(token.page_id(), 9);let sender = RendererResourceCompletionSender::for_page_resource_test(page_queue.sender(),root_document,@@ -1677,10 +1644,7 @@ mod tests {let page_queue = owner_attached_page_queue(token, wake_tx);let sender = RendererResourceCompletionSender::for_page_resource_test(page_queue.sender(),- RendererDocumentToken {- page_id: token.page_id(),- generation: 1,- },+ RendererDocumentToken::new_for_testing(token.page_id(), 1),);drop(page_queue);@@ -1702,14 +1666,8 @@ mod tests {let token =crate::runtime::RendererPageToken::new_for_testing(crate::PageId::new_for_testing(23));let mut page_queue = owner_attached_page_queue(token, wake_tx);- let old_root_document = RendererDocumentToken {- page_id: token.page_id(),- generation: 1,- };- let replacement_root_document = RendererDocumentToken {- page_id: token.page_id(),- generation: 2,- };+ let old_root_document = RendererDocumentToken::new_for_testing(token.page_id(), 1);+ let replacement_root_document = RendererDocumentToken::new_for_testing(token.page_id(), 2);let stable_route = page_queue.sender();let old_document_sender = RendererResourceCompletionSender::for_page_resource_test(stable_route.clone(),@@ -1764,10 +1722,7 @@ mod tests {let token =crate::runtime::RendererPageToken::new_for_testing(crate::PageId::new_for_testing(29));let mut page_queue = owner_attached_page_queue(token, wake_tx);- let root_document = RendererDocumentToken {- page_id: token.page_id(),- generation: 5,- };+ let root_document = RendererDocumentToken::new_for_testing(token.page_id(), 5);let sender = RendererResourceCompletionSender::for_page_resource_test(page_queue.sender(),root_document,@@ -1812,10 +1767,7 @@ mod tests {let token =crate::runtime::RendererPageToken::new_for_testing(crate::PageId::new_for_testing(31));let mut page_queue = owner_attached_page_queue(token, wake_tx);- let root_document = RendererDocumentToken {- page_id: token.page_id(),- generation: 6,- };+ let root_document = RendererDocumentToken::new_for_testing(token.page_id(), 6);let sender = RendererResourceCompletionSender::for_page_resource_test(page_queue.sender(),root_document,@@ -1858,10 +1810,7 @@ mod tests {crate::runtime::RendererPageToken::new_for_testing(crate::PageId::new_for_testing(32));let page_queue = owner_attached_page_queue(token, wake_tx);let page_route = page_queue.sender();- let root_document = RendererDocumentToken {- page_id: token.page_id(),- generation: 7,- };+ let root_document = RendererDocumentToken::new_for_testing(token.page_id(), 7);let sender =RendererResourceCompletionSender::for_page_resource_test(page_route, root_document);drop(page_queue);@@ -1887,10 +1836,7 @@ mod tests {let token =crate::runtime::RendererPageToken::new_for_testing(crate::PageId::new_for_testing(33));let mut page_queue = owner_attached_page_queue(token, wake_tx);- let root_document = RendererDocumentToken {- page_id: token.page_id(),- generation: 11,- };+ let root_document = RendererDocumentToken::new_for_testing(token.page_id(), 11);let sender = RendererResourceCompletionSender::for_page_resource_test(page_queue.sender(),root_document,@@ -1933,10 +1879,7 @@ mod tests {crate::runtime::RendererPageToken::new_for_testing(crate::PageId::new_for_testing(34));let page_queue = owner_attached_page_queue(token, wake_tx);let page_route = page_queue.sender();- let root_document = RendererDocumentToken {- page_id: token.page_id(),- generation: 13,- };+ let root_document = RendererDocumentToken::new_for_testing(token.page_id(), 13);let sender =RendererResourceCompletionSender::for_page_resource_test(page_route, root_document);drop(page_queue);@@ -1959,10 +1902,7 @@ mod tests {let token =crate::runtime::RendererPageToken::new_for_testing(crate::PageId::new_for_testing(35));let mut page_queue = owner_attached_page_queue(token, wake_tx);- let root_document = RendererDocumentToken {- page_id: token.page_id(),- generation: 17,- };+ let root_document = RendererDocumentToken::new_for_testing(token.page_id(), 17);let sender = RendererResourceCompletionSender::for_page_resource_test(page_queue.sender(),root_document,@@ -2005,10 +1945,7 @@ mod tests {crate::runtime::RendererPageToken::new_for_testing(crate::PageId::new_for_testing(36));let page_queue = owner_attached_page_queue(token, wake_tx);let page_route = page_queue.sender();- let root_document = RendererDocumentToken {- page_id: token.page_id(),- generation: 19,- };+ let root_document = RendererDocumentToken::new_for_testing(token.page_id(), 19);let sender =RendererResourceCompletionSender::for_page_resource_test(page_route, root_document);drop(page_queue);@@ -2031,10 +1968,7 @@ mod tests {let token =crate::runtime::RendererPageToken::new_for_testing(crate::PageId::new_for_testing(37));let mut page_queue = owner_attached_page_queue(token, wake_tx);- let root_document = RendererDocumentToken {- page_id: token.page_id(),- generation: 11,- };+ let root_document = RendererDocumentToken::new_for_testing(token.page_id(), 11);let sender = RendererResourceCompletionSender::for_page_resource_test(page_queue.sender(),root_document,@@ -2121,10 +2055,7 @@ mod tests {crate::runtime::RendererPageToken::new_for_testing(crate::PageId::new_for_testing(41));let page_queue = owner_attached_page_queue(token, wake_tx);let page_route = page_queue.sender();- let root_document = RendererDocumentToken {- page_id: token.page_id(),- generation: 13,- };+ let root_document = RendererDocumentToken::new_for_testing(token.page_id(), 13);let sender =RendererResourceCompletionSender::for_page_resource_test(page_route, root_document);drop(page_queue);diff --git a/moli-renderer-v8/src/page_task_queue/senders.rs b/moli-renderer-v8/src/page_task_queue/senders.rsindex 0a95505dd..bc78b7c37 100644--- a/moli-renderer-v8/src/page_task_queue/senders.rs+++ b/moli-renderer-v8/src/page_task_queue/senders.rs@@ -556,10 +556,10 @@ impl RendererPageTaskTestResidence {runtime_source.bind_page_task_producer_routes(routes).expect("fresh test Page residence must accept its producer routes");- let root_document = crate::runtime::RendererDocumentToken {- page_id: crate::PageId::new_for_testing(runtime_source.identity_key() as u64),- generation: 1,- };+ let root_document = crate::runtime::RendererDocumentToken::new_for_testing(+ crate::PageId::new_for_testing(runtime_source.identity_key() as u64),+ 1,+ );Self {standalone_runtime,resource_task_runner,diff --git a/moli-renderer-v8/src/page_task_queue/stylesheet_task.rs b/moli-renderer-v8/src/page_task_queue/stylesheet_task.rsindex 37bdf90e8..8cf070b68 100644--- a/moli-renderer-v8/src/page_task_queue/stylesheet_task.rs+++ b/moli-renderer-v8/src/page_task_queue/stylesheet_task.rs@@ -201,10 +201,8 @@ impl RendererPageStylesheetTaskTestResidence {static NEXT_PAGE_ID: AtomicU64 = AtomicU64::new(1);let page_id = NEXT_PAGE_ID.fetch_add(1, Ordering::Relaxed);- let root_document = RendererDocumentToken {- page_id: crate::PageId::new_for_testing(page_id),- generation: 1,- };+ let root_document =+ RendererDocumentToken::new_for_testing(crate::PageId::new_for_testing(page_id), 1);let page_token = crate::runtime::RendererPageToken::new_for_testing(root_document.page_id);let (owner_wake_tx, owner_wake_rx) = tokio::sync::mpsc::unbounded_channel();let owner_wake = RendererOwnerWakeSender::new(owner_wake_tx, page_token);diff --git a/moli-renderer-v8/src/page_task_queue/websocket_event.rs b/moli-renderer-v8/src/page_task_queue/websocket_event.rsindex 118b6821a..ae890acca 100644--- a/moli-renderer-v8/src/page_task_queue/websocket_event.rs+++ b/moli-renderer-v8/src/page_task_queue/websocket_event.rs@@ -415,11 +415,8 @@ mod tests {use super::*;use crate::{PageId, page_task_queue::RendererOwnerWakeSource, runtime::RendererPageToken};- fn root_document(generation: u64) -> RendererDocumentToken {- RendererDocumentToken {- page_id: PageId::new_for_testing(1),- generation,- }+ fn root_document(lifecycle_document_id: u64) -> RendererDocumentToken {+ RendererDocumentToken::new_for_testing(PageId::new_for_testing(1), lifecycle_document_id)}fn close_event(socket_id: u64) -> WebSocketEvent {diff --git a/moli-renderer-v8/src/page_task_queue/worker_host_bridge.rs b/moli-renderer-v8/src/page_task_queue/worker_host_bridge.rsindex a23680f9a..26dcbe46e 100644--- a/moli-renderer-v8/src/page_task_queue/worker_host_bridge.rs+++ b/moli-renderer-v8/src/page_task_queue/worker_host_bridge.rs@@ -198,11 +198,11 @@ mod tests {use super::{RendererWorkerHostBridgeEventSender, RendererWorkerHostBridgeTarget};- fn root_document(generation: u64) -> RendererDocumentToken {- RendererDocumentToken {- page_id: crate::PageId::new_for_testing(71),- generation,- }+ fn root_document(lifecycle_document_id: u64) -> RendererDocumentToken {+ RendererDocumentToken::new_for_testing(+ crate::PageId::new_for_testing(71),+ lifecycle_document_id,+ )}fn dedicated_worker_id(raw: u64) -> DedicatedWorkerId {diff --git a/moli-renderer-v8/src/runtime/document_lifecycle.rs b/moli-renderer-v8/src/runtime/document_lifecycle.rsindex d33e1888a..6bd5eac52 100644--- a/moli-renderer-v8/src/runtime/document_lifecycle.rs+++ b/moli-renderer-v8/src/runtime/document_lifecycle.rs@@ -14,15 +14,68 @@ impl RendererFrameToken {}}+/// Identifies one cross-document root lifecycle within a Page.+///+/// `document.open()` keeps this token and advances [`RendererLifecycleEpoch`];+/// a cross-document commit allocates a new opaque lifecycle Document id.#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]pub struct RendererDocumentToken {pub page_id: PageId,- pub generation: u64,+ lifecycle_document_id: RendererLifecycleDocumentId,+}++#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]+struct RendererLifecycleDocumentId(u64);++impl RendererLifecycleDocumentId {+ const INITIAL: Self = Self(1);++ const fn successor(self) -> Self {+ match self.0.checked_add(1) {+ Some(value) => Self(value),+ None => panic!("renderer lifecycle Document id overflow"),+ }+ }+}++impl RendererDocumentToken {+ const fn initial(page_id: PageId) -> Self {+ Self {+ page_id,+ lifecycle_document_id: RendererLifecycleDocumentId::INITIAL,+ }+ }++ const fn with_id(page_id: PageId, lifecycle_document_id: RendererLifecycleDocumentId) -> Self {+ Self {+ page_id,+ lifecycle_document_id,+ }+ }++ #[doc(hidden)]+ pub const fn new_for_testing(page_id: PageId, lifecycle_document_id: u64) -> Self {+ Self::with_id(page_id, RendererLifecycleDocumentId(lifecycle_document_id))+ }++ #[doc(hidden)]+ pub const fn successor_for_testing(self) -> Self {+ Self::with_id(self.page_id, self.lifecycle_document_id.successor())+ }}#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]pub struct RendererLifecycleEpoch(pub u64);+impl RendererLifecycleEpoch {+ const fn successor(self) -> Self {+ match self.0.checked_add(1) {+ Some(value) => Self(value),+ None => panic!("renderer lifecycle epoch overflow"),+ }+ }+}+#[derive(Clone, Copy, Debug, Eq, PartialEq)]pub enum RendererLifecycleStartReason {InitialDocument,@@ -241,7 +294,7 @@ pub(crate) enum RendererDocumentLifecycleTransition {pub(crate) struct RendererDocumentLifecycleJournal {frame: RendererFrameToken,current_snapshot: RendererDocumentLifecycleSnapshot,- next_document_generation: u64,+ next_document_id: RendererLifecycleDocumentId,next_sequence: u64,initial_handoff_complete: bool,initial_events: VecDeque<RendererDocumentLifecycleEvent>,@@ -487,10 +540,7 @@ impl RendererDocumentLifecycleJournalHandle {impl RendererDocumentLifecycleJournal {fn new_initial_at(page_id: PageId, timestamp_micros: u64) -> Self {let frame = RendererFrameToken::root(page_id);- let document = RendererDocumentToken {- page_id,- generation: 1,- };+ let document = RendererDocumentToken::initial(page_id);let epoch = RendererLifecycleEpoch(1);let started = RendererLifecycleEventStamp {sequence: 1,@@ -518,7 +568,7 @@ impl RendererDocumentLifecycleJournal {load: None,terminated: None,},- next_document_generation: 2,+ next_document_id: RendererLifecycleDocumentId::INITIAL.successor(),next_sequence: 2,initial_handoff_complete: false,initial_events: VecDeque::from([event]),@@ -772,7 +822,7 @@ impl RendererDocumentLifecycleJournal {break;}}- let epoch = RendererLifecycleEpoch(self.current_snapshot.epoch.0 + 1);+ let epoch = self.current_snapshot.epoch.successor();match self.start_lifecycle(self.current_snapshot.document,epoch,@@ -911,11 +961,9 @@ impl RendererDocumentLifecycleJournal {if self.current_snapshot.terminated.is_none() {return Err(RendererDocumentLifecycleTransition::RejectedOutOfOrder);}- let document = RendererDocumentToken {- page_id: self.frame.page_id,- generation: self.next_document_generation,- };- self.next_document_generation += 1;+ let document_id = self.next_document_id;+ self.next_document_id = document_id.successor();+ let document = RendererDocumentToken::with_id(self.frame.page_id, document_id);self.start_lifecycle(document,RendererLifecycleEpoch(1),@@ -936,7 +984,7 @@ impl RendererDocumentLifecycleJournal {| RendererDocumentLifecycleTransition::Duplicate => {}transition => return Err(transition),}- let epoch = RendererLifecycleEpoch(self.current_snapshot.epoch.0 + 1);+ let epoch = self.current_snapshot.epoch.successor();let to = self.start_lifecycle(self.current_snapshot.document,epoch,@@ -1022,7 +1070,10 @@ impl RendererDocumentLifecycleJournal {fn next_sequence(&mut self) -> u64 {let sequence = self.next_sequence;- self.next_sequence += 1;+ self.next_sequence = self+ .next_sequence+ .checked_add(1)+ .expect("renderer lifecycle event sequence overflow");sequence}@@ -1055,7 +1106,7 @@ fn trace_lifecycle_transition(event: &RendererDocumentLifecycleEvent) {trace!(target: "moli_renderer_document_lifecycle",page_id = event.document.page_id.as_u64(),- document_generation = event.document.generation,+ lifecycle_document_id = event.document.lifecycle_document_id.0,lifecycle_epoch = event.epoch.0,sequence = event.sequence,timestamp_micros = event.timestamp_micros,@@ -1072,6 +1123,26 @@ mod tests {RendererDocumentLifecycleJournal::new_initial_at(PageId::new_for_testing(7), 10)}+ #[test]+ #[should_panic(expected = "renderer lifecycle Document id overflow")]+ fn lifecycle_document_id_allocator_rejects_overflow() {+ let _ = RendererLifecycleDocumentId(u64::MAX).successor();+ }++ #[test]+ #[should_panic(expected = "renderer lifecycle epoch overflow")]+ fn lifecycle_epoch_allocator_rejects_overflow() {+ let _ = RendererLifecycleEpoch(u64::MAX).successor();+ }++ #[test]+ #[should_panic(expected = "renderer lifecycle event sequence overflow")]+ fn lifecycle_event_sequence_allocator_rejects_overflow() {+ let mut journal = journal();+ journal.next_sequence = u64::MAX;+ let _ = journal.next_sequence();+ }+fn finish(journal: &mut RendererDocumentLifecycleJournal,milestone: RendererDocumentLifecycleMilestone,@@ -1506,10 +1577,7 @@ mod tests {);let stale = RendererDocumentLifecycleEvent {- document: RendererDocumentToken {- generation: snapshot.document.generation + 1,- ..snapshot.document- },+ document: snapshot.document.successor_for_testing(),kind: RendererDocumentLifecycleEventKind::Milestone(RendererDocumentLifecycleMilestone::DomContentLoaded,),diff --git a/moli-renderer-v8/src/runtime/javascript_dialog.rs b/moli-renderer-v8/src/runtime/javascript_dialog.rsindex 9870a31bd..bddae7701 100644--- a/moli-renderer-v8/src/runtime/javascript_dialog.rs+++ b/moli-renderer-v8/src/runtime/javascript_dialog.rs@@ -221,10 +221,7 @@ mod tests {crate::runtime::RendererJavaScriptDialogId::new(1),crate::runtime::RendererDocumentLifecycleIdentity {frame: crate::runtime::RendererFrameToken { page_id },- document: crate::runtime::RendererDocumentToken {- page_id,- generation: 1,- },+ document: crate::runtime::RendererDocumentToken::new_for_testing(page_id, 1),epoch: crate::runtime::RendererLifecycleEpoch(1),},crate::runtime::RendererJavaScriptDialogSource::RootFrame,diff --git a/moli-renderer-v8/src/runtime/page_turn_scheduler.rs b/moli-renderer-v8/src/runtime/page_turn_scheduler.rsindex 325d23f69..c4c37d4e6 100644--- a/moli-renderer-v8/src/runtime/page_turn_scheduler.rs+++ b/moli-renderer-v8/src/runtime/page_turn_scheduler.rs@@ -526,10 +526,7 @@ mod tests {ready: ready_metadata(ready_at, order),owner: RendererPageDomManipulationOwner::BroadcastChannel(RendererPageBroadcastChannelDeliveryOwner::new(- RendererDocumentToken {- page_id: crate::PageId::new_for_testing(1),- generation: 1,- },+ RendererDocumentToken::new_for_testing(crate::PageId::new_for_testing(1), 1),WindowExecutionContextIdentity::new(WindowExecutionContextOwner::Frame(LocalWindowId(7)),OwnerDispatchScope::Top,@@ -545,10 +542,7 @@ mod tests {RendererPageReadyDescriptor::UserInteraction {ready: ready_metadata(ready_at, order),owner: RendererPageUserInteractionOwner::new(- RendererDocumentToken {- page_id: crate::PageId::new_for_testing(1),- generation: 1,- },+ RendererDocumentToken::new_for_testing(crate::PageId::new_for_testing(1), 1),WindowDocumentTaskTarget::new(WindowDocumentOwner::Frame(FrameDocumentTaskOwner::new(FrameSchedulerLaneId(order),@@ -565,10 +559,7 @@ mod tests {RendererPageReadyDescriptor::FileReading {ready: ready_metadata(ready_at, order),owner: RendererPageFileReadingOwner::new(- RendererDocumentToken {- page_id: crate::PageId::new_for_testing(1),- generation: 1,- },+ RendererDocumentToken::new_for_testing(crate::PageId::new_for_testing(1), 1),WindowDocumentTaskTarget::new(WindowDocumentOwner::Frame(FrameDocumentTaskOwner::new(FrameSchedulerLaneId(order),@@ -585,10 +576,7 @@ mod tests {RendererPageReadyDescriptor::MiscPlatformApi {ready: ready_metadata(ready_at, order),owner: RendererPageMiscPlatformApiOwner::new(- RendererDocumentToken {- page_id: crate::PageId::new_for_testing(1),- generation: 1,- },+ RendererDocumentToken::new_for_testing(crate::PageId::new_for_testing(1), 1),WindowDocumentTaskTarget::new(WindowDocumentOwner::Frame(FrameDocumentTaskOwner::new(FrameSchedulerLaneId(order),@@ -618,10 +606,7 @@ mod tests {ready: ready_metadata(ready_at, order),head: RendererPageNavigationAndTraversalHead::HistoryTraversal {owner: RendererPageHistoryTraversalOwner::new(- RendererDocumentToken {- page_id: crate::PageId::new_for_testing(1),- generation: 1,- },+ RendererDocumentToken::new_for_testing(crate::PageId::new_for_testing(1), 1),execution_context,crate::native_bridge::WindowTaskTarget::new(OwnerDispatchScope::Top,@@ -639,10 +624,7 @@ mod tests {ready: ready_metadata(ready_at, order),head: RendererPageRenderingUpdateHead::new(RendererPageRenderingUpdateOwner::new(- RendererDocumentToken {- page_id: crate::PageId::new_for_testing(1),- generation: 1,- },+ RendererDocumentToken::new_for_testing(crate::PageId::new_for_testing(1), 1),WindowDocumentTaskTarget::new(WindowDocumentOwner::Frame(FrameDocumentTaskOwner::new(FrameSchedulerLaneId(order),@@ -665,10 +647,7 @@ mod tests {RendererPageReadyDescriptor::MediaElementEvent {ready: ready_metadata(ready_at, order),owner: RendererPageMediaElementEventOwner::new(- RendererDocumentToken {- page_id: crate::PageId::new_for_testing(1),- generation: 1,- },+ RendererDocumentToken::new_for_testing(crate::PageId::new_for_testing(1), 1),WindowDocumentTaskTarget::new(WindowDocumentOwner::Frame(FrameDocumentTaskOwner::new(FrameSchedulerLaneId(order),@@ -688,10 +667,7 @@ mod tests {RendererPageReadyDescriptor::DedicatedWorkerClientEvent {ready: ready_metadata(ready_at, order),owner: RendererPageDedicatedWorkerClientEventOwner::new(- RendererDocumentToken {- page_id: crate::PageId::new_for_testing(1),- generation: 1,- },+ RendererDocumentToken::new_for_testing(crate::PageId::new_for_testing(1), 1),WindowExecutionContextIdentity::new(WindowExecutionContextOwner::Frame(LocalWindowId(7)),OwnerDispatchScope::Top,@@ -726,10 +702,7 @@ mod tests {RendererPageReadyDescriptor::SharedWorkerClientEvent {ready: ready_metadata(ready_at, order),owner: RendererPageSharedWorkerClientEventOwner::new(- RendererDocumentToken {- page_id: crate::PageId::new_for_testing(1),- generation: 1,- },+ RendererDocumentToken::new_for_testing(crate::PageId::new_for_testing(1), 1),WindowExecutionContextIdentity::new(WindowExecutionContextOwner::Frame(LocalWindowId(7)),OwnerDispatchScope::Top,@@ -747,10 +720,10 @@ mod tests {) -> RendererPageReadyDescriptor {RendererPageReadyDescriptor::ServiceWorkerInternal {ready: ready_metadata(ready_at, order),- root_document: RendererDocumentToken {- page_id: crate::PageId::new_for_testing(1),- generation: 1,- },+ root_document: RendererDocumentToken::new_for_testing(+ crate::PageId::new_for_testing(1),+ 1,+ ),}}@@ -761,10 +734,7 @@ mod tests {RendererPageReadyDescriptor::ServiceWorkerClientMessage {ready: ready_metadata(ready_at, order),owner: crate::page_task_queue::RendererPageServiceWorkerClientMessageOwner::new(- RendererDocumentToken {- page_id: crate::PageId::new_for_testing(1),- generation: 1,- },+ RendererDocumentToken::new_for_testing(crate::PageId::new_for_testing(1), 1),crate::types::ServiceWorkerWindowClientTarget {client_id:crate::service_worker_runtime::ServiceWorkerClientId::from_u64_for_test(@@ -780,10 +750,7 @@ mod tests {RendererPageReadyDescriptor::WindowMessage {ready: ready_metadata(ready_at, order),owner: RendererPageWindowMessageOwner::new(- RendererDocumentToken {- page_id: crate::PageId::new_for_testing(1),- generation: 1,- },+ RendererDocumentToken::new_for_testing(crate::PageId::new_for_testing(1), 1),crate::native_bridge::WindowTaskTarget::new(crate::native_bridge::OwnerDispatchScope::Top,WindowExecutionContextOwner::Frame(LocalWindowId(7)),@@ -797,10 +764,7 @@ mod tests {RendererPageReadyDescriptor::WebCryptoTask {ready: ready_metadata(ready_at, order),owner: RendererPageWebCryptoTaskOwner::new(- RendererDocumentToken {- page_id: crate::PageId::new_for_testing(1),- generation: 1,- },+ RendererDocumentToken::new_for_testing(crate::PageId::new_for_testing(1), 1),WindowExecutionContextIdentity::new(WindowExecutionContextOwner::Frame(LocalWindowId(7)),OwnerDispatchScope::Top,@@ -816,10 +780,7 @@ mod tests {RendererPageReadyDescriptor::IndexedDbTask {ready: ready_metadata(ready_at, order),owner: RendererPageIndexedDbTaskOwner::new(- RendererDocumentToken {- page_id: crate::PageId::new_for_testing(1),- generation: 1,- },+ RendererDocumentToken::new_for_testing(crate::PageId::new_for_testing(1), 1),WindowExecutionContextIdentity::new(WindowExecutionContextOwner::Frame(LocalWindowId(7)),OwnerDispatchScope::Top,@@ -834,10 +795,7 @@ mod tests {RendererPageReadyDescriptor::OpfsTask {ready: ready_metadata(ready_at, order),owner: RendererPageOpfsTaskOwner::new(- RendererDocumentToken {- page_id: crate::PageId::new_for_testing(1),- generation: 1,- },+ RendererDocumentToken::new_for_testing(crate::PageId::new_for_testing(1), 1),WindowExecutionContextIdentity::new(WindowExecutionContextOwner::Frame(LocalWindowId(7)),OwnerDispatchScope::Top,@@ -856,10 +814,7 @@ mod tests {RendererPageReadyDescriptor::ChildFrameTask {ready: ready_metadata(ready_at, order),owner: RendererPageChildFrameTaskOwner::new(- RendererDocumentToken {- page_id: crate::PageId::new_for_testing(1),- generation: 1,- },+ RendererDocumentToken::new_for_testing(crate::PageId::new_for_testing(1), 1),RendererPageChildFrameTaskTarget::RealmMaterialization(RendererPageChildRealmMaterializationTarget::new(DomHandle::new(order as usize + 100),@@ -878,10 +833,7 @@ mod tests {RendererPageReadyDescriptor::MessagePortDelivery {ready: ready_metadata(ready_at, order),owner: RendererPageMessagePortDeliveryOwner::new(- RendererDocumentToken {- page_id: crate::PageId::new_for_testing(1),- generation: 1,- },+ RendererDocumentToken::new_for_testing(crate::PageId::new_for_testing(1), 1),WindowExecutionContextIdentity::new(WindowExecutionContextOwner::Frame(LocalWindowId(7)),OwnerDispatchScope::Top,@@ -898,10 +850,7 @@ mod tests {ready: ready_metadata(ready_at, order),owner: RendererPageNetworkingOwner::ResourceCompletion(RendererPageResourceCompletionOwner::child_document(- RendererDocumentToken {- page_id: crate::PageId::new_for_testing(1),- generation: 1,- },+ RendererDocumentToken::new_for_testing(crate::PageId::new_for_testing(1), 1),DomHandle::new(99),FrameDocumentTaskOwner::new(FrameSchedulerLaneId(99),@@ -917,10 +866,7 @@ mod tests {RendererPageReadyDescriptor::WebSocket {ready: ready_metadata(ready_at, order),owner: RendererPageWebSocketOwner::new_for_test(- RendererDocumentToken {- page_id: crate::PageId::new_for_testing(1),- generation: 1,- },+ RendererDocumentToken::new_for_testing(crate::PageId::new_for_testing(1), 1),order,),readiness: RendererPageWebSocketReadiness::Ready,@@ -942,10 +888,10 @@ mod tests {RendererPageReadyDescriptor::ModuleReaction {ready: ready_metadata(ready_at, order),owner: crate::page_task_queue::RendererPageModuleReactionOwner::new(- crate::runtime::RendererDocumentToken {- page_id: crate::PageId::new_for_testing(1),- generation: 1,- },+ crate::runtime::RendererDocumentToken::new_for_testing(+ crate::PageId::new_for_testing(1),+ 1,+ ),crate::page_task_queue::RendererPageModuleReactionTarget::DocumentModuleScript {document_owner: FrameDocumentTaskOwner::new(FrameSchedulerLaneId(1),@@ -961,10 +907,10 @@ mod tests {RendererPageReadyDescriptor::InternalLoading {ready: ready_metadata(ready_at, order),owner: crate::page_task_queue::RendererPageInternalLoadingOwner::new(- crate::runtime::RendererDocumentToken {- page_id: crate::PageId::new_for_testing(1),- generation: 1,- },+ crate::runtime::RendererDocumentToken::new_for_testing(+ crate::PageId::new_for_testing(1),+ 1,+ ),FrameDocumentTaskOwner::new(FrameSchedulerLaneId(order),LocalWindowId(order + 1),@@ -981,10 +927,10 @@ mod tests {RendererPageReadyDescriptor::ChildModulepreloadEventAction {ready: ready_metadata(ready_at, order),owner: crate::page_task_queue::RendererPageChildModulepreloadEventActionOwner::new(- crate::runtime::RendererDocumentToken {- page_id: crate::PageId::new_for_testing(1),- generation: 1,- },+ crate::runtime::RendererDocumentToken::new_for_testing(+ crate::PageId::new_for_testing(1),+ 1,+ ),FrameDocumentTaskOwner::new(FrameSchedulerLaneId(order),LocalWindowId(order + 1),@@ -1002,10 +948,7 @@ mod tests {RendererPageReadyDescriptor::ChildModuleDependencyFetchStart {ready: ready_metadata(ready_at, order),owner: RendererPageChildModuleDependencyFetchStartOwner::new(- RendererDocumentToken {- page_id: crate::PageId::new_for_testing(1),- generation: 1,- },+ RendererDocumentToken::new_for_testing(crate::PageId::new_for_testing(1), 1),ChildDocumentModuleFetchTarget::new(DomHandle::new(order as usize + 100),FrameDocumentTaskOwner::new(@@ -1026,10 +969,7 @@ mod tests {RendererPageReadyDescriptor::ChildModuleScriptTerminal {ready: ready_metadata(ready_at, order),owner: RendererPageChildModuleScriptTerminalOwner::new(- RendererDocumentToken {- page_id: crate::PageId::new_for_testing(1),- generation: 1,- },+ RendererDocumentToken::new_for_testing(crate::PageId::new_for_testing(1), 1),FrameDocumentTaskOwner::new(FrameSchedulerLaneId(order),LocalWindowId(order + 1),@@ -1047,10 +987,7 @@ mod tests {RendererPageReadyDescriptor::MainDocumentRuntime {ready: ready_metadata(ready_at, order),owner: crate::page_task_queue::RendererPageMainDocumentRuntimeOwner::new_for_test(- RendererDocumentToken {- page_id: crate::PageId::new_for_testing(1),- generation: 1,- },+ RendererDocumentToken::new_for_testing(crate::PageId::new_for_testing(1), 1),FrameDocumentTaskOwner::new(FrameSchedulerLaneId(order),LocalWindowId(order + 1),diff --git a/moli-renderer-v8/src/runtime/page_vm/page_websocket.rs b/moli-renderer-v8/src/runtime/page_vm/page_websocket.rsindex a6035178e..0902f0d95 100644--- a/moli-renderer-v8/src/runtime/page_vm/page_websocket.rs+++ b/moli-renderer-v8/src/runtime/page_vm/page_websocket.rs@@ -67,10 +67,10 @@ mod tests {fn completion_for(target_effect: PageWebSocketTargetEffect) -> PageTaskCompletion {PageWebSocketTurnAction {owner: crate::page_task_queue::RendererPageWebSocketOwner::new_for_test(- crate::runtime::RendererDocumentToken {- page_id: crate::PageId::new_for_testing(1),- generation: 1,- },+ crate::runtime::RendererDocumentToken::new_for_testing(+ crate::PageId::new_for_testing(1),+ 1,+ ),7,),target_effect,@@ -92,10 +92,10 @@ mod tests {PageWebSocketTargetEffect::CurrentDocumentTargetDisappeared,PageWebSocketTargetEffect::ParkedForReadableBackpressure,PageWebSocketTargetEffect::DiscardedStaleDocument {- current_document: crate::runtime::RendererDocumentToken {- page_id: crate::PageId::new_for_testing(1),- generation: 2,- },+ current_document: crate::runtime::RendererDocumentToken::new_for_testing(+ crate::PageId::new_for_testing(1),+ 2,+ ),},] {assert!(matches!(diff --git a/moli-renderer-v8/src/runtime/page_vm/tests/async_subresource_completion.rs b/moli-renderer-v8/src/runtime/page_vm/tests/async_subresource_completion.rsindex 1ae2001af..778ca8c82 100644--- a/moli-renderer-v8/src/runtime/page_vm/tests/async_subresource_completion.rs+++ b/moli-renderer-v8/src/runtime/page_vm/tests/async_subresource_completion.rs@@ -316,10 +316,7 @@ async fn stale_root_with_reused_async_subresource_id_cannot_consume_current_requlet request_url = Url::parse("https://typed-subresource.test/reused-id").unwrap();let mut page_vm = test_page_vm();let current_root = page_vm.document_lifecycle.identity().document;- let stale_root = crate::runtime::RendererDocumentToken {- page_id: current_root.page_id,- generation: current_root.generation.wrapping_add(1),- };+ let stale_root = current_root.successor_for_testing();let internal_id = register_intercepted_fetch(&mut page_vm, &request_url);let target = AsyncSubresourceFetchEventTarget::Completion { internal_id };let stale_owner =@@ -542,10 +539,7 @@ async fn stale_observed_network_record_is_captured_without_consuming_current_reqlet document_url = Url::parse("https://typed-subresource.test/retired-document").unwrap();let mut page_vm = test_page_vm();let current_root = page_vm.document_lifecycle.identity().document;- let stale_root = crate::runtime::RendererDocumentToken {- page_id: current_root.page_id,- generation: current_root.generation.wrapping_add(1),- };+ let stale_root = current_root.successor_for_testing();let internal_id = register_intercepted_fetch(&mut page_vm, &request_url);let request_target = AsyncSubresourceFetchEventTarget::Completion { internal_id };diff --git a/moli-renderer-v8/src/runtime/page_vm/tests/child_dynamic_import_owner_action.rs b/moli-renderer-v8/src/runtime/page_vm/tests/child_dynamic_import_owner_action.rsindex 6afca1d83..f2620e3af 100644--- a/moli-renderer-v8/src/runtime/page_vm/tests/child_dynamic_import_owner_action.rs+++ b/moli-renderer-v8/src/runtime/page_vm/tests/child_dynamic_import_owner_action.rs@@ -252,10 +252,7 @@ async fn root_document_namespace_rejects_reused_local_owner_identity() {let target =install_dynamic_import_action_target(&mut page_vm, "dynamic-action-root-namespace")?;let current_root = page_vm.document_lifecycle.identity().document;- let non_current_root = crate::runtime::RendererDocumentToken {- page_id: current_root.page_id,- generation: current_root.generation + 1,- };+ let non_current_root = current_root.successor_for_testing();page_vm.page_task_executor_sources_for_test().dynamic_import_owner_action()diff --git a/moli-renderer-v8/src/runtime/page_vm/tests/mod.rs b/moli-renderer-v8/src/runtime/page_vm/tests/mod.rsindex 996f94666..8fcc76a10 100644--- a/moli-renderer-v8/src/runtime/page_vm/tests/mod.rs+++ b/moli-renderer-v8/src/runtime/page_vm/tests/mod.rs@@ -999,10 +999,7 @@ async fn child_modulepreload_start_rejects_reused_local_owner_from_retired_root_.current_child_document_module_fetch_target(child_handle).expect("current PageVm should expose an exact child target");let current_root = page_vm.document_lifecycle.identity().document;- let retired_root = crate::runtime::RendererDocumentToken {- page_id: current_root.page_id,- generation: current_root.generation.checked_sub(1).unwrap_or(u64::MAX),- };+ let retired_root = current_root.successor_for_testing();page_vm.page_task_executor_sources_for_test().modulepreload_start().enqueue_local_for_test(retired_root,diff --git a/moli-renderer-v8/src/runtime/page_vm/tests/popup_document_completion.rs b/moli-renderer-v8/src/runtime/page_vm/tests/popup_document_completion.rsindex de785dac4..f9082aa27 100644--- a/moli-renderer-v8/src/runtime/page_vm/tests/popup_document_completion.rs+++ b/moli-renderer-v8/src/runtime/page_vm/tests/popup_document_completion.rs@@ -631,10 +631,7 @@ async fn retired_root_namespace_rejects_an_identical_popup_local_target() {wait_for_popup_terminal(&mut queue, &mut wake_rx, "namespace popup response").await;let target = queued_popup_target(&mut queue);let current_root = page_vm.document_lifecycle.identity().document;- let retired_root = crate::runtime::RendererDocumentToken {- page_id: current_root.page_id,- generation: current_root.generation.wrapping_add(1),- };+ let retired_root = current_root.successor_for_testing();queue.enqueue_local_for_test(RendererPageResourceCompletion::popup_document_load(retired_root,loaded_popup_completion(diff --git a/moli-renderer-v8/src/runtime/page_vm/tests/service_worker.rs b/moli-renderer-v8/src/runtime/page_vm/tests/service_worker.rsindex 19d25f945..9fff28670 100644--- a/moli-renderer-v8/src/runtime/page_vm/tests/service_worker.rs+++ b/moli-renderer-v8/src/runtime/page_vm/tests/service_worker.rs@@ -86,10 +86,7 @@ async fn service_worker_internal_body_authorizes_the_exact_root_document() {// This test intentionally stops at the body/settlement boundary. The// typed NoCompletion mapping above proves that the selected dispatcher// has no task-end work to apply.- let stale_root = crate::runtime::RendererDocumentToken {- page_id: current_root.page_id,- generation: current_root.generation + 1,- };+ let stale_root = current_root.successor_for_testing();page_vm.service_worker_task_sender_for_root_for_test(stale_root).send_service_worker_unregister(ServiceWorkerUnregisterCompletion {@@ -171,10 +168,7 @@ async fn service_worker_client_message_authorizes_root_before_window_client_targstale_client.action.target_effect,PageServiceWorkerClientMessageTargetEffect::DiscardedStaleTarget);- let stale_root = crate::runtime::RendererDocumentToken {- page_id: current_root.page_id,- generation: current_root.generation + 1,- };+ let stale_root = current_root.successor_for_testing();page_vm.service_worker_task_sender_for_root_for_test(stale_root).send_service_worker_client_message(service_worker_message(stale_target))diff --git a/moli-renderer-v8/src/runtime/page_vm/tests/websocket/completion.rs b/moli-renderer-v8/src/runtime/page_vm/tests/websocket/completion.rsindex 97aba87e5..d00641efe 100644--- a/moli-renderer-v8/src/runtime/page_vm/tests/websocket/completion.rs+++ b/moli-renderer-v8/src/runtime/page_vm/tests/websocket/completion.rs@@ -294,10 +294,7 @@ async fn websocket_stale_root_task_cannot_complete_in_replacement_page_vm() {let mut page_vm = test_page_vm();page_vm.vm_mut().enqueue_test_pending_runtime_source_load();let current_document = page_vm.document_lifecycle.identity().document;- let stale_document = crate::runtime::RendererDocumentToken {- page_id: current_document.page_id,- generation: current_document.generation + 1,- };+ let stale_document = current_document.successor_for_testing();let senders = page_vm.runtime_hooks.standalone_page_task_residence()diff --git a/moli-renderer-v8/src/runtime/phase_one/streaming_input.rs b/moli-renderer-v8/src/runtime/phase_one/streaming_input.rsindex 9e64838a2..59cba20e8 100644--- a/moli-renderer-v8/src/runtime/phase_one/streaming_input.rs+++ b/moli-renderer-v8/src/runtime/phase_one/streaming_input.rs@@ -153,10 +153,8 @@ mod tests {RendererPageMainParserContinuationProducer,tokio::sync::mpsc::UnboundedReceiver<RendererOwnerWake>,) {- let root_document = RendererDocumentToken {- page_id: crate::PageId::new_for_testing(page_id),- generation: 1,- };+ let root_document =+ RendererDocumentToken::new_for_testing(crate::PageId::new_for_testing(page_id), 1);let (wake_tx, wake_rx) = tokio::sync::mpsc::unbounded_channel();let networking = RendererPageNetworkingSource::new_owner_attached(PageRuntimeWakeSignal::default(),diff --git a/moli-renderer-v8/src/runtime/protocol_output/tests.rs b/moli-renderer-v8/src/runtime/protocol_output/tests.rsindex 0b1e4237f..8acd74e28 100644--- a/moli-renderer-v8/src/runtime/protocol_output/tests.rs+++ b/moli-renderer-v8/src/runtime/protocol_output/tests.rs@@ -13,10 +13,7 @@ fn lifecycle_event(sequence: u64) -> RendererDocumentLifecycleEvent {let page_id = PageId::new_for_testing(7);RendererDocumentLifecycleEvent {frame: RendererFrameToken { page_id },- document: RendererDocumentToken {- page_id,- generation: 3,- },+ document: RendererDocumentToken::new_for_testing(page_id, 3),epoch: RendererLifecycleEpoch(2),sequence,timestamp_micros: sequence,diff --git a/moli-renderer-v8/src/shared_worker_runtime/test_support.rs b/moli-renderer-v8/src/shared_worker_runtime/test_support.rsindex 854b69aa9..1efe316dc 100644--- a/moli-renderer-v8/src/shared_worker_runtime/test_support.rs+++ b/moli-renderer-v8/src/shared_worker_runtime/test_support.rs@@ -25,10 +25,7 @@ pub(super) struct SharedWorkerPageClientHarness {impl SharedWorkerPageClientHarness {pub(super) fn new() -> Self {let page_id = crate::PageId::new_for_testing(9201);- let root_document = crate::runtime::RendererDocumentToken {- page_id,- generation: 1,- };+ let root_document = crate::runtime::RendererDocumentToken::new_for_testing(page_id, 1);let (wake_tx, wake_rx) = tokio::sync::mpsc::unbounded_channel();let (sources, routes) = crate::page_task_queue::RendererPageOwnedTaskSources::new(crate::page_task_queue::PageRuntimeWakeSignal::default(),