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): remove duplicate turn output metadata
ldm0a7c1eb0b42ce
diff --git a/moli-renderer-v8/src/frame_owner_model/module_graph/dynamic_import_fetch.rs b/moli-renderer-v8/src/frame_owner_model/module_graph/dynamic_import_fetch.rsindex 3c28928d2..eec852e5a 100644--- a/moli-renderer-v8/src/frame_owner_model/module_graph/dynamic_import_fetch.rs+++ b/moli-renderer-v8/src/frame_owner_model/module_graph/dynamic_import_fetch.rs@@ -744,6 +744,7 @@ impl FrameDocumentDynamicImportTerminalOutcome {}}+ #[cfg(test)]pub(crate) fn made_progress(self) -> bool {self.terminal_work_consumed|| self.missing_joined_clientdiff --git a/moli-renderer-v8/src/page_resource_completion/turn.rs b/moli-renderer-v8/src/page_resource_completion/turn.rsindex 4c160d6f2..ccd0e833c 100644--- a/moli-renderer-v8/src/page_resource_completion/turn.rs+++ b/moli-renderer-v8/src/page_resource_completion/turn.rs@@ -196,16 +196,10 @@ impl PageResourceCompletionTurnAction {self}+ #[cfg(test)]pub(crate) fn source(self) -> RendererOwnerResourceActivitySource {self.source}-- pub(crate) fn requires_output_capture(self) -> bool {- matches!(- self.output_effect,- PageResourceCompletionOutputEffect::CaptureRequired- )- }}pub(crate) type PageResourceCompletionTurnOutcome =diff --git a/moli-renderer-v8/src/page_task_queue.rs b/moli-renderer-v8/src/page_task_queue.rsindex dd2679d87..75e804fd9 100644--- a/moli-renderer-v8/src/page_task_queue.rs+++ b/moli-renderer-v8/src/page_task_queue.rs@@ -149,14 +149,7 @@ pub(crate) struct PageWindowDocumentTaskTurnAction<I, K> {pub(crate) target_effect: PageWindowDocumentTaskTargetEffect,}-impl<I, K> PageWindowDocumentTaskTurnAction<I, K> {- pub(crate) const fn requires_output_capture(&self) -> bool {- matches!(- self.target_effect,- PageWindowDocumentTaskTargetEffect::DispatchedToCurrentOwner- )- }-}+impl<I, K> PageWindowDocumentTaskTurnAction<I, K> {}pub(crate) use self::broadcast_channel_delivery::{PageBroadcastChannelDeliveryDocumentEffect, PageBroadcastChannelDeliveryTurnAction,@@ -510,7 +503,7 @@ pub(crate) use self::worker_host_bridge::{PageWorkerHostBridgeCurrentEffect, PageWorkerHostBridgeTargetEffect,PageWorkerHostBridgeTurnAction, PageWorkerHostBridgeTurnOutcome,RendererPageWorkerHostBridgeOwner, RendererPageWorkerHostBridgeTask,- RendererWorkerHostBridgeEventSender, worker_host_bridge_activity,+ RendererWorkerHostBridgeEventSender, is_worker_host_bridge_message,};/// Minimal page-owned task queue.diff --git a/moli-renderer-v8/src/page_task_queue/broadcast_channel_delivery.rs b/moli-renderer-v8/src/page_task_queue/broadcast_channel_delivery.rsindex 48b0ff289..1454d311a 100644--- a/moli-renderer-v8/src/page_task_queue/broadcast_channel_delivery.rs+++ b/moli-renderer-v8/src/page_task_queue/broadcast_channel_delivery.rs@@ -142,14 +142,5 @@ pub(crate) struct PageBroadcastChannelDeliveryTurnAction {pub(crate) document_effect: PageBroadcastChannelDeliveryDocumentEffect,}-impl PageBroadcastChannelDeliveryTurnAction {- pub(crate) const fn requires_output_capture(self) -> bool {- matches!(- self.document_effect,- PageBroadcastChannelDeliveryDocumentEffect::DispatchedToCurrentOwner- )- }-}-pub(crate) type PageBroadcastChannelDeliveryTurnOutcome =PageOwnerTurnOutcome<PageBroadcastChannelDeliveryTurnAction>;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 8d8240360..8c0dd410a 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@@ -297,20 +297,6 @@ pub(crate) struct PageChildDocumentScriptReadyTurnAction {pub(crate) target_effect: PageChildDocumentScriptReadyTargetEffect,}-impl PageChildDocumentScriptReadyTurnAction {- pub(crate) const fn requires_output_capture(self) -> bool {- matches!(- self.target_effect,- PageChildDocumentScriptReadyTargetEffect::AppliedScriptOrEventToCurrentOwner {- made_progress: true- }- | PageChildDocumentScriptReadyTargetEffect::AppliedWithoutScriptOrEventToCurrentOwner {- made_progress: true- }- )- }-}-pub(crate) type PageChildDocumentScriptReadyTurnOutcome =PageOwnerTurnOutcome<PageChildDocumentScriptReadyTurnAction>;@@ -330,17 +316,6 @@ pub(crate) struct PageChildDocumentLifecycleTurnAction {pub(crate) target_effect: PageChildDocumentLifecycleTargetEffect,}-impl PageChildDocumentLifecycleTurnAction {- pub(crate) const fn requires_output_capture(self) -> bool {- matches!(- self.target_effect,- PageChildDocumentLifecycleTargetEffect::EventDispatchedToCurrentOwner- | PageChildDocumentLifecycleTargetEffect::ConsumedCurrentOwnerWithoutEvent- | PageChildDocumentLifecycleTargetEffect::FailedForCurrentOwner- )- }-}-pub(crate) type PageChildDocumentLifecycleTurnOutcome =PageOwnerTurnOutcome<PageChildDocumentLifecycleTurnAction>;@@ -360,17 +335,6 @@ pub(crate) struct PageChildHostLoadTurnAction {pub(crate) target_effect: PageChildHostLoadTargetEffect,}-impl PageChildHostLoadTurnAction {- pub(crate) const fn requires_output_capture(self) -> bool {- matches!(- self.target_effect,- PageChildHostLoadTargetEffect::CallbackDispatchedToCurrentOwner- | PageChildHostLoadTargetEffect::ConsumedCurrentOwnerWithoutCallback- | PageChildHostLoadTargetEffect::FailedForCurrentOwner- )- }-}-pub(crate) type PageChildHostLoadTurnOutcome = PageOwnerTurnOutcome<PageChildHostLoadTurnAction>;#[derive(Clone, Copy, Debug, Eq, PartialEq)]@@ -393,15 +357,6 @@ pub(crate) struct PageChildParserModuleRootStartTurnAction {pub(crate) target_effect: PageChildParserModuleRootStartTargetEffect,}-impl PageChildParserModuleRootStartTurnAction {- pub(crate) const fn requires_output_capture(self) -> bool {- matches!(- self.target_effect,- PageChildParserModuleRootStartTargetEffect::ConsumedByCurrentOwner- )- }-}-pub(crate) type PageChildParserModuleRootStartTurnOutcome =PageOwnerTurnOutcome<PageChildParserModuleRootStartTurnAction>;@@ -428,16 +383,6 @@ pub(crate) struct PageChildClassicScriptSourceLoadTurnAction {pub(crate) target_effect: PageChildClassicScriptSourceLoadTargetEffect,}-impl PageChildClassicScriptSourceLoadTurnAction {- pub(crate) const fn requires_output_capture(self) -> bool {- matches!(- self.target_effect,- PageChildClassicScriptSourceLoadTargetEffect::NetworkRequestStartedForCurrentOwner- | PageChildClassicScriptSourceLoadTargetEffect::RejectedBeforeNetworkStartForCurrentOwner- )- }-}-pub(crate) type PageChildClassicScriptSourceLoadTurnOutcome =PageOwnerTurnOutcome<PageChildClassicScriptSourceLoadTurnAction>;diff --git a/moli-renderer-v8/src/page_task_queue/child_module_dependency_fetch_start.rs b/moli-renderer-v8/src/page_task_queue/child_module_dependency_fetch_start.rsindex dff1f99a6..1a934e569 100644--- a/moli-renderer-v8/src/page_task_queue/child_module_dependency_fetch_start.rs+++ b/moli-renderer-v8/src/page_task_queue/child_module_dependency_fetch_start.rs@@ -306,13 +306,5 @@ pub(crate) struct PageChildModuleDependencyFetchStartTurnAction {pub(crate) target_effect: PageChildModuleDependencyFetchStartTargetEffect,}-impl PageChildModuleDependencyFetchStartTurnAction {- /// Network output belongs to the later typed completion. Consuming the- /// start task itself publishes no completed output batch.- pub(crate) const fn requires_output_capture(self) -> bool {- false- }-}-pub(crate) type PageChildModuleDependencyFetchStartTurnOutcome =PageOwnerTurnOutcome<PageChildModuleDependencyFetchStartTurnAction>;diff --git a/moli-renderer-v8/src/page_task_queue/child_module_script_terminal.rs b/moli-renderer-v8/src/page_task_queue/child_module_script_terminal.rsindex 300c7fda6..f814f028f 100644--- a/moli-renderer-v8/src/page_task_queue/child_module_script_terminal.rs+++ b/moli-renderer-v8/src/page_task_queue/child_module_script_terminal.rs@@ -224,14 +224,5 @@ pub(crate) struct PageChildModuleScriptTerminalTurnAction {pub(crate) target_effect: PageChildModuleScriptTerminalTargetEffect,}-impl PageChildModuleScriptTerminalTurnAction {- pub(crate) const fn requires_output_capture(self) -> bool {- matches!(- self.target_effect,- PageChildModuleScriptTerminalTargetEffect::AppliedToCurrentOwner { .. }- )- }-}-pub(crate) type PageChildModuleScriptTerminalTurnOutcome =PageOwnerTurnOutcome<PageChildModuleScriptTerminalTurnAction>;diff --git a/moli-renderer-v8/src/page_task_queue/child_modulepreload_event_action.rs b/moli-renderer-v8/src/page_task_queue/child_modulepreload_event_action.rsindex def8fdc83..f16e8c219 100644--- a/moli-renderer-v8/src/page_task_queue/child_modulepreload_event_action.rs+++ b/moli-renderer-v8/src/page_task_queue/child_modulepreload_event_action.rs@@ -221,15 +221,5 @@ pub(crate) struct PageChildModulepreloadEventActionTurnAction {pub(crate) target_effect: PageChildModulepreloadEventActionTargetEffect,}-impl PageChildModulepreloadEventActionTurnAction {- pub(crate) fn requires_output_capture(self) -> bool {- matches!(- self.target_effect,- PageChildModulepreloadEventActionTargetEffect::AppliedToCurrentOwner { outcome }- if outcome.event_was_dispatched()- )- }-}-pub(crate) type PageChildModulepreloadEventActionTurnOutcome =PageOwnerTurnOutcome<PageChildModulepreloadEventActionTurnAction>;diff --git a/moli-renderer-v8/src/page_task_queue/child_navigation_commit.rs b/moli-renderer-v8/src/page_task_queue/child_navigation_commit.rsindex 80dbbc210..62390c81b 100644--- a/moli-renderer-v8/src/page_task_queue/child_navigation_commit.rs+++ b/moli-renderer-v8/src/page_task_queue/child_navigation_commit.rs@@ -107,14 +107,5 @@ pub(crate) struct PageChildNavigationCommitTurnAction {pub(crate) target_effect: PageChildNavigationCommitTargetEffect,}-impl PageChildNavigationCommitTurnAction {- pub(crate) const fn requires_output_capture(self) -> bool {- matches!(- self.target_effect,- PageChildNavigationCommitTargetEffect::AppliedToCurrentOwner- )- }-}-pub(crate) type PageChildNavigationCommitTurnOutcome =PageOwnerTurnOutcome<PageChildNavigationCommitTurnAction>;diff --git a/moli-renderer-v8/src/page_task_queue/child_realm_materialization.rs b/moli-renderer-v8/src/page_task_queue/child_realm_materialization.rsindex d4059c857..b6922d7a6 100644--- a/moli-renderer-v8/src/page_task_queue/child_realm_materialization.rs+++ b/moli-renderer-v8/src/page_task_queue/child_realm_materialization.rs@@ -61,16 +61,5 @@ pub(crate) struct PageChildRealmMaterializationTurnAction {pub(crate) target_effect: PageChildRealmMaterializationTargetEffect,}-impl PageChildRealmMaterializationTurnAction {- pub(crate) const fn requires_output_capture(self) -> bool {- matches!(- self.target_effect,- PageChildRealmMaterializationTargetEffect::MaterializedCurrentOwnerWithoutDocumentStartScript- | PageChildRealmMaterializationTargetEffect::MaterializedCurrentOwnerAfterDocumentStartScript- | PageChildRealmMaterializationTargetEffect::FailedCurrentOwner- )- }-}-pub(crate) type PageChildRealmMaterializationTurnOutcome =PageOwnerTurnOutcome<PageChildRealmMaterializationTurnAction>;diff --git a/moli-renderer-v8/src/page_task_queue/dedicated_worker_client_event.rs b/moli-renderer-v8/src/page_task_queue/dedicated_worker_client_event.rsindex 930cdaf58..3d129dcdf 100644--- a/moli-renderer-v8/src/page_task_queue/dedicated_worker_client_event.rs+++ b/moli-renderer-v8/src/page_task_queue/dedicated_worker_client_event.rs@@ -351,14 +351,5 @@ pub(crate) struct PageDedicatedWorkerClientEventTurnAction {pub(crate) target_effect: PageDedicatedWorkerClientEventTargetEffect,}-impl PageDedicatedWorkerClientEventTurnAction {- pub(crate) const fn requires_output_capture(self) -> bool {- matches!(- self.target_effect,- PageDedicatedWorkerClientEventTargetEffect::CallbackDispatchedToCurrentOwner- )- }-}-pub(crate) type PageDedicatedWorkerClientEventTurnOutcome =PageOwnerTurnOutcome<PageDedicatedWorkerClientEventTurnAction>;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 c23d9103d..9bf1947a0 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@@ -252,16 +252,6 @@ pub(crate) struct PageDynamicImportOwnerActionTurnAction {pub(crate) document_effect: PageDynamicImportOwnerActionDocumentEffect,}-impl PageDynamicImportOwnerActionTurnAction {- pub(crate) fn requires_output_capture(self) -> bool {- matches!(- self.document_effect,- PageDynamicImportOwnerActionDocumentEffect::AppliedToCurrentOwner { outcome }- if outcome.made_progress()- )- }-}-pub(crate) type PageDynamicImportOwnerActionTurnOutcome =PageOwnerTurnOutcome<PageDynamicImportOwnerActionTurnAction>;diff --git a/moli-renderer-v8/src/page_task_queue/file_entry_file_callback.rs b/moli-renderer-v8/src/page_task_queue/file_entry_file_callback.rsindex 11bb65488..b3ff95876 100644--- a/moli-renderer-v8/src/page_task_queue/file_entry_file_callback.rs+++ b/moli-renderer-v8/src/page_task_queue/file_entry_file_callback.rs@@ -90,14 +90,5 @@ pub(crate) struct PageFileEntryFileCallbackTurnAction {pub(crate) target_effect: PageFileEntryFileCallbackTargetEffect,}-impl PageFileEntryFileCallbackTurnAction {- pub(crate) const fn requires_output_capture(self) -> bool {- matches!(- self.target_effect,- PageFileEntryFileCallbackTargetEffect::CallbackInvokedForCurrentOwner- )- }-}-pub(crate) type PageFileEntryFileCallbackTurnOutcome =PageOwnerTurnOutcome<PageFileEntryFileCallbackTurnAction>;diff --git a/moli-renderer-v8/src/page_task_queue/file_reading.rs b/moli-renderer-v8/src/page_task_queue/file_reading.rsindex edf19d558..d94fe1f81 100644--- a/moli-renderer-v8/src/page_task_queue/file_reading.rs+++ b/moli-renderer-v8/src/page_task_queue/file_reading.rs@@ -81,13 +81,4 @@ pub(crate) struct PageFileReadingTurnAction {pub(crate) target_effect: PageFileReadingTargetEffect,}-impl PageFileReadingTurnAction {- pub(crate) const fn requires_output_capture(self) -> bool {- matches!(- self.target_effect,- PageFileReadingTargetEffect::CallbackInvokedForCurrentOwner- )- }-}-pub(crate) type PageFileReadingTurnOutcome = PageOwnerTurnOutcome<PageFileReadingTurnAction>;diff --git a/moli-renderer-v8/src/page_task_queue/hash_change_delivery.rs b/moli-renderer-v8/src/page_task_queue/hash_change_delivery.rsindex 75be5f695..afa3cb5bc 100644--- a/moli-renderer-v8/src/page_task_queue/hash_change_delivery.rs+++ b/moli-renderer-v8/src/page_task_queue/hash_change_delivery.rs@@ -134,14 +134,5 @@ pub(crate) struct PageHashChangeDeliveryTurnAction {pub(crate) target_effect: PageHashChangeDeliveryTargetEffect,}-impl PageHashChangeDeliveryTurnAction {- pub(crate) const fn requires_output_capture(self) -> bool {- matches!(- self.target_effect,- PageHashChangeDeliveryTargetEffect::DispatchedToCurrentOwner- )- }-}-pub(crate) type PageHashChangeDeliveryTurnOutcome =PageOwnerTurnOutcome<PageHashChangeDeliveryTurnAction>;diff --git a/moli-renderer-v8/src/page_task_queue/history_traversal.rs b/moli-renderer-v8/src/page_task_queue/history_traversal.rsindex 3224f739a..afbe43796 100644--- a/moli-renderer-v8/src/page_task_queue/history_traversal.rs+++ b/moli-renderer-v8/src/page_task_queue/history_traversal.rs@@ -198,14 +198,5 @@ pub(crate) struct PageHistoryTraversalTurnAction {pub(crate) target_effect: PageHistoryTraversalTargetEffect,}-impl PageHistoryTraversalTurnAction {- pub(crate) const fn requires_output_capture(self) -> bool {- matches!(- self.target_effect,- PageHistoryTraversalTargetEffect::AppliedToCurrentOwner- )- }-}-pub(crate) type PageHistoryTraversalTurnOutcome =PageOwnerTurnOutcome<PageHistoryTraversalTurnAction>;diff --git a/moli-renderer-v8/src/page_task_queue/image_load_event.rs b/moli-renderer-v8/src/page_task_queue/image_load_event.rsindex df09ab50b..3e05da1f8 100644--- a/moli-renderer-v8/src/page_task_queue/image_load_event.rs+++ b/moli-renderer-v8/src/page_task_queue/image_load_event.rs@@ -110,21 +110,6 @@ pub(crate) enum PageImageLoadEventStalePayloadEffect {SettledExactPayloadAndProcessedDecodeRequests,}-impl PageImageLoadEventTargetEffect {- const fn requires_output_capture(self) -> bool {- matches!(- self,- Self::DispatchedToCurrentOwner- | Self::SettledCurrentOwnerWithoutEvent- | Self::DiscardedStaleOwner {- stale_payload_effect:- PageImageLoadEventStalePayloadEffect::SettledExactPayloadAndProcessedDecodeRequests,- ..- }- )- }-}-#[derive(Clone, Copy, Debug, Eq, PartialEq)]pub(crate) struct PageImageLoadEventTurnAction {pub(crate) owner: RendererPageImageLoadEventOwner,@@ -133,39 +118,4 @@ pub(crate) struct PageImageLoadEventTurnAction {pub(crate) target_effect: PageImageLoadEventTargetEffect,}-impl PageImageLoadEventTurnAction {- pub(crate) const fn requires_output_capture(self) -> bool {- self.target_effect.requires_output_capture()- }-}-pub(crate) type PageImageLoadEventTurnOutcome = PageOwnerTurnOutcome<PageImageLoadEventTurnAction>;--#[cfg(test)]-mod tests {- use super::{PageImageLoadEventStalePayloadEffect, PageImageLoadEventTargetEffect};-- #[test]- fn only_a_settled_stale_image_payload_publishes_runtime_output() {- assert!(- PageImageLoadEventTargetEffect::DiscardedStaleOwner {- current_owner: None,- stale_payload_effect:- PageImageLoadEventStalePayloadEffect::SettledExactPayloadAndProcessedDecodeRequests,- }- .requires_output_capture()- );- for stale_payload_effect in [- PageImageLoadEventStalePayloadEffect::ForeignPageVmStatePreserved,- PageImageLoadEventStalePayloadEffect::NoSettledExactPayload,- ] {- assert!(- !PageImageLoadEventTargetEffect::DiscardedStaleOwner {- current_owner: None,- stale_payload_effect,- }- .requires_output_capture()- );- }- }-}diff --git a/moli-renderer-v8/src/page_task_queue/indexed_db_task.rs b/moli-renderer-v8/src/page_task_queue/indexed_db_task.rsindex 85de640f0..a9401293d 100644--- a/moli-renderer-v8/src/page_task_queue/indexed_db_task.rs+++ b/moli-renderer-v8/src/page_task_queue/indexed_db_task.rs@@ -220,14 +220,4 @@ pub(crate) struct PageIndexedDbTaskTurnAction {pub(crate) target_effect: PageIndexedDbTaskTargetEffect,}-impl PageIndexedDbTaskTurnAction {- pub(crate) const fn requires_output_capture(self) -> bool {- matches!(- self.target_effect,- PageIndexedDbTaskTargetEffect::AppliedToCurrentOwner- | PageIndexedDbTaskTargetEffect::FailedCurrentOwner- )- }-}-pub(crate) type PageIndexedDbTaskTurnOutcome = PageOwnerTurnOutcome<PageIndexedDbTaskTurnAction>;diff --git a/moli-renderer-v8/src/page_task_queue/internal_loading.rs b/moli-renderer-v8/src/page_task_queue/internal_loading.rsindex 94e8bec8a..0999b16b5 100644--- a/moli-renderer-v8/src/page_task_queue/internal_loading.rs+++ b/moli-renderer-v8/src/page_task_queue/internal_loading.rs@@ -264,16 +264,5 @@ pub(crate) struct PageInternalLoadingTurnAction {pub(crate) target_effect: PageInternalLoadingTargetEffect,}-impl PageInternalLoadingTurnAction {- pub(crate) const fn requires_output_capture(self) -> bool {- matches!(- self.target_effect,- PageInternalLoadingTargetEffect::AppliedToCurrentOwner {- effect: PageOwnedInternalLoadingTaskEffect::MetaRefreshNavigationActivated,- }- )- }-}-pub(crate) type PageInternalLoadingTurnOutcome =PageOwnerTurnOutcome<PageInternalLoadingTurnAction>;diff --git a/moli-renderer-v8/src/page_task_queue/main_document_post_parse.rs b/moli-renderer-v8/src/page_task_queue/main_document_post_parse.rsindex 54e73aefd..3ec4952f8 100644--- a/moli-renderer-v8/src/page_task_queue/main_document_post_parse.rs+++ b/moli-renderer-v8/src/page_task_queue/main_document_post_parse.rs@@ -445,8 +445,4 @@ impl MainDocumentPostParseExecution {}}}-- pub(crate) const fn requires_output_capture(&self) -> bool {- self.target().applied_to_selected_owner()- }}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 193fd3ec0..642a594bd 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@@ -501,13 +501,6 @@ impl PageMainDocumentRuntimeActionResult {pub(crate) const fn target_effect(self) -> PageMainDocumentRuntimeTargetEffect {self.target_effect}-- pub(crate) const fn requires_output_capture(self) -> bool {- matches!(- self.target_effect,- PageMainDocumentRuntimeTargetEffect::AppliedToCurrentOwner- )- }}/// Exact-Document effect of one selected runtime-script admission.@@ -547,13 +540,6 @@ impl PageRuntimeScriptAdmissionTurnAction {pub(crate) const fn target_effect(self) -> PageRuntimeScriptAdmissionTargetEffect {self.target_effect}-- const fn requires_output_capture(self) -> bool {- matches!(- self.target_effect,- PageRuntimeScriptAdmissionTargetEffect::AdmittedToCurrentOwner- )- }}/// Exact-Document effect of one selected runtime-script continuation.@@ -590,13 +576,6 @@ impl PageRuntimeScriptContinuationTurnAction {pub(crate) const fn target_effect(self) -> PageRuntimeScriptContinuationTargetEffect {self.target_effect}-- const fn requires_output_capture(self) -> bool {- !matches!(- self.target_effect,- PageRuntimeScriptContinuationTargetEffect::DiscardedStaleOwner- )- }}/// Execution result for the exact runtime-owned module continuation variant.@@ -678,7 +657,7 @@ impl PageMainDocumentPostParseTurnAction {)> {match self {Self::Executed { owner, execution } => Some((owner, execution)),- Self::CompletedByFamily(_) => None,+ Self::CompletedByFamily(_result) => None,}}@@ -703,13 +682,6 @@ impl PageMainDocumentPostParseTurnAction {Self::CompletedByFamily(result) => result.target_effect(),}}-- const fn requires_output_capture(&self) -> bool {- match self {- Self::Executed { execution, .. } => execution.requires_output_capture(),- Self::CompletedByFamily(result) => result.requires_output_capture(),- }- }}impl PageMainDocumentRuntimeTurnAction {@@ -941,19 +913,6 @@ impl PageMainDocumentRuntimeTurnAction {_ => None,}}-- pub(crate) const fn requires_output_capture(&self) -> bool {- match self {- Self::RuntimeScriptAdmission(action) => action.requires_output_capture(),- Self::ParserAsyncModuleAdmission(action) => action.requires_output_capture(),- Self::RuntimeScriptContinuation(action) => action.requires_output_capture(),- Self::DynamicModuleJob(action) => action.requires_output_capture(),- Self::NativeModuleOwnerEvent(action) => action.requires_output_capture(),- Self::PostParseWork(action) => action.requires_output_capture(),- Self::RuntimeOwnedModuleContinuation(action) => action.0.requires_output_capture(),- Self::ParserOwnedModuleContinuation(action) => action.requires_output_capture(),- }- }}pub(crate) type PageMainDocumentRuntimeTurnOutcome =diff --git a/moli-renderer-v8/src/page_task_queue/main_native_module_task.rs b/moli-renderer-v8/src/page_task_queue/main_native_module_task.rsindex 51688c648..4c95c1919 100644--- a/moli-renderer-v8/src/page_task_queue/main_native_module_task.rs+++ b/moli-renderer-v8/src/page_task_queue/main_native_module_task.rs@@ -77,13 +77,6 @@ impl PageMainNativeModuleTurnResult {self.target_effect}- const fn requires_output_capture(&self) -> bool {- matches!(- self.target_effect,- PageMainNativeModuleTargetEffect::AppliedToSelectedOwner(_)- )- }-fn into_parts(self,) -> (@@ -121,10 +114,6 @@ impl PageDynamicModuleJobTurnAction {self.0.target_effect()}- pub(super) const fn requires_output_capture(&self) -> bool {- self.0.requires_output_capture()- }-pub(crate) fn into_parts(self,) -> (@@ -162,10 +151,6 @@ impl PageNativeModuleOwnerEventTurnAction {self.0.target_effect()}- pub(super) const fn requires_output_capture(&self) -> bool {- self.0.requires_output_capture()- }-pub(crate) fn into_parts(self,) -> (diff --git a/moli-renderer-v8/src/page_task_queue/message_port_delivery.rs b/moli-renderer-v8/src/page_task_queue/message_port_delivery.rsindex 8d652f464..3ef9675c4 100644--- a/moli-renderer-v8/src/page_task_queue/message_port_delivery.rs+++ b/moli-renderer-v8/src/page_task_queue/message_port_delivery.rs@@ -239,16 +239,5 @@ pub(crate) struct PageMessagePortDeliveryTurnAction {pub(crate) target_effect: PageMessagePortDeliveryTargetEffect,}-impl PageMessagePortDeliveryTurnAction {- pub(crate) const fn requires_output_capture(self) -> bool {- matches!(- self.target_effect,- PageMessagePortDeliveryTargetEffect::ConsumedByCurrentOwner {- callback_dispatched: true- }- )- }-}-pub(crate) type PageMessagePortDeliveryTurnOutcome =PageOwnerTurnOutcome<PageMessagePortDeliveryTurnAction>;diff --git a/moli-renderer-v8/src/page_task_queue/misc_platform_api.rs b/moli-renderer-v8/src/page_task_queue/misc_platform_api.rsindex 43f838e10..9c9012a14 100644--- a/moli-renderer-v8/src/page_task_queue/misc_platform_api.rs+++ b/moli-renderer-v8/src/page_task_queue/misc_platform_api.rs@@ -73,14 +73,5 @@ pub(crate) struct PageMiscPlatformApiTurnAction {pub(crate) target_effect: PageMiscPlatformApiTargetEffect,}-impl PageMiscPlatformApiTurnAction {- pub(crate) const fn requires_output_capture(self) -> bool {- matches!(- self.target_effect,- PageMiscPlatformApiTargetEffect::CallbackInvokedForCurrentOwner- )- }-}-pub(crate) type PageMiscPlatformApiTurnOutcome =PageOwnerTurnOutcome<PageMiscPlatformApiTurnAction>;diff --git a/moli-renderer-v8/src/page_task_queue/module_reaction.rs b/moli-renderer-v8/src/page_task_queue/module_reaction.rsindex e4c3dfb50..b5f0ef341 100644--- a/moli-renderer-v8/src/page_task_queue/module_reaction.rs+++ b/moli-renderer-v8/src/page_task_queue/module_reaction.rs@@ -391,13 +391,6 @@ impl PageModuleReactionTurnAction {pub(crate) const fn target_effect(self) -> PageModuleReactionTargetEffect {self.target_effect}-- pub(crate) const fn requires_output_capture(self) -> bool {- matches!(- self.target_effect,- PageModuleReactionTargetEffect::AppliedToCurrentOwner(_)- )- }}pub(crate) type PageModuleReactionTurnOutcome = PageOwnerTurnOutcome<PageModuleReactionTurnAction>;diff --git a/moli-renderer-v8/src/page_task_queue/modulepreload_start.rs b/moli-renderer-v8/src/page_task_queue/modulepreload_start.rsindex c89223f0b..8cb556a17 100644--- a/moli-renderer-v8/src/page_task_queue/modulepreload_start.rs+++ b/moli-renderer-v8/src/page_task_queue/modulepreload_start.rs@@ -241,14 +241,6 @@ pub(crate) struct PageModulepreloadStartTurnAction {pub(crate) document_effect: PageModulepreloadStartDocumentEffect,}-impl PageModulepreloadStartTurnAction {- /// Starting or joining a fetch can schedule later work, but this action- /// does not itself publish a completed runtime/resource output batch.- pub(crate) const fn requires_output_capture(self) -> bool {- false- }-}-pub(crate) type PageModulepreloadStartTurnOutcome =PageOwnerTurnOutcome<PageModulepreloadStartTurnAction>;diff --git a/moli-renderer-v8/src/page_task_queue/navigation_api_task.rs b/moli-renderer-v8/src/page_task_queue/navigation_api_task.rsindex 3ac582cc6..887d3baf3 100644--- a/moli-renderer-v8/src/page_task_queue/navigation_api_task.rs+++ b/moli-renderer-v8/src/page_task_queue/navigation_api_task.rs@@ -178,14 +178,5 @@ pub(crate) struct PageNavigationApiTaskTurnAction {pub(crate) target_effect: PageNavigationApiTaskTargetEffect,}-impl PageNavigationApiTaskTurnAction {- pub(crate) const fn requires_output_capture(self) -> bool {- !matches!(- self.target_effect,- PageNavigationApiTaskTargetEffect::DiscardedStaleOwner { .. }- )- }-}-pub(crate) type PageNavigationApiTaskTurnOutcome =PageOwnerTurnOutcome<PageNavigationApiTaskTurnAction>;diff --git a/moli-renderer-v8/src/page_task_queue/opfs_task.rs b/moli-renderer-v8/src/page_task_queue/opfs_task.rsindex 9d47eaeec..588f1f723 100644--- a/moli-renderer-v8/src/page_task_queue/opfs_task.rs+++ b/moli-renderer-v8/src/page_task_queue/opfs_task.rs@@ -241,16 +241,13 @@ pub(crate) struct PageOpfsTaskTurnAction {}impl PageOpfsTaskTurnAction {+ #[cfg(test)]pub(crate) const fn settled_current_owner(self) -> bool {matches!(self.target_effect,PageOpfsTaskTargetEffect::SettledCurrentOwner)}-- pub(crate) const fn requires_output_capture(self) -> bool {- self.settled_current_owner()- }}pub(crate) type PageOpfsTaskTurnOutcome = PageOwnerTurnOutcome<PageOpfsTaskTurnAction>;diff --git a/moli-renderer-v8/src/page_task_queue/parser_async_module_admission.rs b/moli-renderer-v8/src/page_task_queue/parser_async_module_admission.rsindex 6887d6600..402974d9b 100644--- a/moli-renderer-v8/src/page_task_queue/parser_async_module_admission.rs+++ b/moli-renderer-v8/src/page_task_queue/parser_async_module_admission.rs@@ -40,11 +40,4 @@ impl PageParserAsyncModuleAdmissionTurnAction {pub(crate) const fn target_effect(self) -> PageParserAsyncModuleAdmissionTargetEffect {self.target_effect}-- pub(super) const fn requires_output_capture(self) -> bool {- !matches!(- self.target_effect,- PageParserAsyncModuleAdmissionTargetEffect::DiscardedStaleOwner- )- }}diff --git a/moli-renderer-v8/src/page_task_queue/parser_owned_module_continuation.rs b/moli-renderer-v8/src/page_task_queue/parser_owned_module_continuation.rsindex 92f876f02..e2cc55559 100644--- a/moli-renderer-v8/src/page_task_queue/parser_owned_module_continuation.rs+++ b/moli-renderer-v8/src/page_task_queue/parser_owned_module_continuation.rs@@ -64,11 +64,4 @@ impl PageParserOwnedModuleContinuationTurnAction {pub(crate) const fn target_effect(self) -> PageParserOwnedModuleContinuationTargetEffect {self.target_effect}-- pub(super) const fn requires_output_capture(self) -> bool {- matches!(- self.target_effect,- PageParserOwnedModuleContinuationTargetEffect::AppliedToSelectedOwner(_)- )- }}diff --git a/moli-renderer-v8/src/page_task_queue/popup_load_event.rs b/moli-renderer-v8/src/page_task_queue/popup_load_event.rsindex 2e02d1786..8439a4eb3 100644--- a/moli-renderer-v8/src/page_task_queue/popup_load_event.rs+++ b/moli-renderer-v8/src/page_task_queue/popup_load_event.rs@@ -95,13 +95,4 @@ pub(crate) struct PagePopupLoadEventTurnAction {pub(crate) target_effect: PagePopupLoadEventTargetEffect,}-impl PagePopupLoadEventTurnAction {- pub(crate) const fn requires_output_capture(self) -> bool {- matches!(- self.target_effect,- PagePopupLoadEventTargetEffect::DispatchedToCurrentOwner- )- }-}-pub(crate) type PagePopupLoadEventTurnOutcome = PageOwnerTurnOutcome<PagePopupLoadEventTurnAction>;diff --git a/moli-renderer-v8/src/page_task_queue/service_worker_client_message.rs b/moli-renderer-v8/src/page_task_queue/service_worker_client_message.rsindex d0a45477a..ef54d9f4b 100644--- a/moli-renderer-v8/src/page_task_queue/service_worker_client_message.rs+++ b/moli-renderer-v8/src/page_task_queue/service_worker_client_message.rs@@ -228,17 +228,5 @@ pub(crate) struct PageServiceWorkerClientMessageTurnAction {pub(crate) target_effect: PageServiceWorkerClientMessageTargetEffect,}-impl PageServiceWorkerClientMessageTurnAction {- pub(crate) const fn requires_output_capture(self) -> bool {- matches!(- self.target_effect,- PageServiceWorkerClientMessageTargetEffect::EventDispatchedToCurrentTarget {- callback_effect: ServiceWorkerClientMessageCallbackEffect::CallbackDispatched,- ..- }- )- }-}-pub(crate) type PageServiceWorkerClientMessageTurnOutcome =PageOwnerTurnOutcome<PageServiceWorkerClientMessageTurnAction>;diff --git a/moli-renderer-v8/src/page_task_queue/service_worker_internal.rs b/moli-renderer-v8/src/page_task_queue/service_worker_internal.rsindex ea7955565..f192e8267 100644--- a/moli-renderer-v8/src/page_task_queue/service_worker_internal.rs+++ b/moli-renderer-v8/src/page_task_queue/service_worker_internal.rs@@ -248,14 +248,5 @@ pub(crate) struct PageServiceWorkerInternalTurnAction {pub(crate) target_effect: PageServiceWorkerInternalTargetEffect,}-impl PageServiceWorkerInternalTurnAction {- pub(crate) const fn requires_output_capture(self) -> bool {- !matches!(- self.target_effect,- PageServiceWorkerInternalTargetEffect::DiscardedStaleRoot { .. }- )- }-}-pub(crate) type PageServiceWorkerInternalTurnOutcome =PageOwnerTurnOutcome<PageServiceWorkerInternalTurnAction>;diff --git a/moli-renderer-v8/src/page_task_queue/shared_worker_client_event.rs b/moli-renderer-v8/src/page_task_queue/shared_worker_client_event.rsindex e3c478b95..5af43fd17 100644--- a/moli-renderer-v8/src/page_task_queue/shared_worker_client_event.rs+++ b/moli-renderer-v8/src/page_task_queue/shared_worker_client_event.rs@@ -287,14 +287,5 @@ pub(crate) struct PageSharedWorkerClientEventTurnAction {pub(crate) target_effect: PageSharedWorkerClientEventTargetEffect,}-impl PageSharedWorkerClientEventTurnAction {- pub(crate) const fn requires_output_capture(self) -> bool {- matches!(- self.target_effect,- PageSharedWorkerClientEventTargetEffect::ErrorCallbackDispatchedToCurrentOwner { .. }- )- }-}-pub(crate) type PageSharedWorkerClientEventTurnOutcome =PageOwnerTurnOutcome<PageSharedWorkerClientEventTurnAction>;diff --git a/moli-renderer-v8/src/page_task_queue/storage_event_delivery.rs b/moli-renderer-v8/src/page_task_queue/storage_event_delivery.rsindex 8f78c603b..35557fd2c 100644--- a/moli-renderer-v8/src/page_task_queue/storage_event_delivery.rs+++ b/moli-renderer-v8/src/page_task_queue/storage_event_delivery.rs@@ -168,14 +168,5 @@ pub(crate) struct PageStorageEventDeliveryTurnAction {pub(crate) target_effect: PageStorageEventDeliveryTargetEffect,}-impl PageStorageEventDeliveryTurnAction {- pub(crate) const fn requires_output_capture(self) -> bool {- matches!(- self.target_effect,- PageStorageEventDeliveryTargetEffect::DispatchedToCurrentOwner- )- }-}-pub(crate) type PageStorageEventDeliveryTurnOutcome =PageOwnerTurnOutcome<PageStorageEventDeliveryTurnAction>;diff --git a/moli-renderer-v8/src/page_task_queue/stylesheet_task.rs b/moli-renderer-v8/src/page_task_queue/stylesheet_task.rsindex aa673a07b..9a082dffd 100644--- a/moli-renderer-v8/src/page_task_queue/stylesheet_task.rs+++ b/moli-renderer-v8/src/page_task_queue/stylesheet_task.rs@@ -351,7 +351,7 @@ pub(crate) struct PageConnectedStyleEventTurnAction {}impl PageConnectedStyleEventTurnAction {- pub(crate) const fn requires_output_capture(self) -> bool {+ pub(crate) const fn settled_current_owner(self) -> bool {matches!(self.target_effect,PageConnectedStyleEventTargetEffect::DispatchedToCurrentOwner { .. }diff --git a/moli-renderer-v8/src/page_task_queue/text_track_default_mode.rs b/moli-renderer-v8/src/page_task_queue/text_track_default_mode.rsindex 7172d4a81..99419e1bf 100644--- a/moli-renderer-v8/src/page_task_queue/text_track_default_mode.rs+++ b/moli-renderer-v8/src/page_task_queue/text_track_default_mode.rs@@ -85,14 +85,5 @@ pub(crate) struct PageTextTrackDefaultModeTurnAction {pub(crate) target_effect: PageTextTrackDefaultModeTargetEffect,}-impl PageTextTrackDefaultModeTurnAction {- pub(crate) const fn requires_output_capture(self) -> bool {- matches!(- self.target_effect,- PageTextTrackDefaultModeTargetEffect::AppliedToCurrentOwner- )- }-}-pub(crate) type PageTextTrackDefaultModeTurnOutcome =PageOwnerTurnOutcome<PageTextTrackDefaultModeTurnAction>;diff --git a/moli-renderer-v8/src/page_task_queue/text_track_load.rs b/moli-renderer-v8/src/page_task_queue/text_track_load.rsindex 5e5f87a97..8a6f72950 100644--- a/moli-renderer-v8/src/page_task_queue/text_track_load.rs+++ b/moli-renderer-v8/src/page_task_queue/text_track_load.rs@@ -1,7 +1,7 @@use crate::{document_runtime::DomHandle,native_bridge::{TextTrackLoadSequenceId, WindowDocumentTaskTarget},- runtime::{PageOwnerTurnOutcome, RendererDocumentToken, RendererOwnerRuntimeActivitySource},+ runtime::{PageOwnerTurnOutcome, RendererDocumentToken},};use super::{@@ -43,17 +43,6 @@ pub(crate) enum RendererPageTextTrackLoadTaskKind {FetchFailureTerminal,}-impl RendererPageTextTrackLoadTaskKind {- pub(crate) const fn activity_source(self) -> RendererOwnerRuntimeActivitySource {- match self {- Self::Start | Self::NetworkTerminal => {- RendererOwnerRuntimeActivitySource::SelectedTaskOutput- }- Self::FetchFailureTerminal => RendererOwnerRuntimeActivitySource::DomManipulation,- }- }-}-pub(crate) type RendererPageTextTrackLoadOwner = RendererPageWindowDocumentTaskOwner;pub(crate) type RendererPageTextTrackLoadTask = RendererPageWindowDocumentTask<RendererPageTextTrackLoadTaskId,@@ -144,13 +133,4 @@ pub(crate) struct PageTextTrackLoadTurnAction {pub(crate) target_effect: PageTextTrackLoadTargetEffect,}-impl PageTextTrackLoadTurnAction {- pub(crate) const fn requires_output_capture(self) -> bool {- matches!(- self.target_effect,- PageTextTrackLoadTargetEffect::AppliedToCurrentOwner- )- }-}-pub(crate) type PageTextTrackLoadTurnOutcome = PageOwnerTurnOutcome<PageTextTrackLoadTurnAction>;diff --git a/moli-renderer-v8/src/page_task_queue/user_interaction.rs b/moli-renderer-v8/src/page_task_queue/user_interaction.rsindex 42d328351..6dc34f4a8 100644--- a/moli-renderer-v8/src/page_task_queue/user_interaction.rs+++ b/moli-renderer-v8/src/page_task_queue/user_interaction.rs@@ -93,14 +93,5 @@ pub(crate) struct PageUserInteractionTurnAction {pub(crate) target_effect: PageUserInteractionTargetEffect,}-impl PageUserInteractionTurnAction {- pub(crate) const fn requires_output_capture(self) -> bool {- matches!(- self.target_effect,- PageUserInteractionTargetEffect::AppliedToCurrentOwner- )- }-}-pub(crate) type PageUserInteractionTurnOutcome =PageOwnerTurnOutcome<PageUserInteractionTurnAction>;diff --git a/moli-renderer-v8/src/page_task_queue/v8_foreground_task.rs b/moli-renderer-v8/src/page_task_queue/v8_foreground_task.rsindex 97da5c9f1..2c5e5c82c 100644--- a/moli-renderer-v8/src/page_task_queue/v8_foreground_task.rs+++ b/moli-renderer-v8/src/page_task_queue/v8_foreground_task.rs@@ -164,10 +164,6 @@ impl PageV8ForegroundTaskTurnAction {pub(crate) const fn entered_isolate(self) -> bool {matches!(self.effect, PageV8ForegroundTaskEffect::Ran)}-- pub(crate) const fn requires_output_capture(self) -> bool {- matches!(self.effect, PageV8ForegroundTaskEffect::Ran)- }}pub(crate) type PageV8ForegroundTaskTurnOutcome =diff --git a/moli-renderer-v8/src/page_task_queue/view_transition_update.rs b/moli-renderer-v8/src/page_task_queue/view_transition_update.rsindex 45038f11c..f3e73e5a6 100644--- a/moli-renderer-v8/src/page_task_queue/view_transition_update.rs+++ b/moli-renderer-v8/src/page_task_queue/view_transition_update.rs@@ -135,14 +135,5 @@ pub(crate) struct PageViewTransitionUpdateTurnAction {pub(crate) target_effect: PageViewTransitionUpdateTargetEffect,}-impl PageViewTransitionUpdateTurnAction {- pub(crate) const fn requires_output_capture(self) -> bool {- matches!(- self.target_effect,- PageViewTransitionUpdateTargetEffect::ProcessedForCurrentOwner- )- }-}-pub(crate) type PageViewTransitionUpdateTurnOutcome =PageOwnerTurnOutcome<PageViewTransitionUpdateTurnAction>;diff --git a/moli-renderer-v8/src/page_task_queue/webcrypto_task.rs b/moli-renderer-v8/src/page_task_queue/webcrypto_task.rsindex 6e8e2938c..6286502a7 100644--- a/moli-renderer-v8/src/page_task_queue/webcrypto_task.rs+++ b/moli-renderer-v8/src/page_task_queue/webcrypto_task.rs@@ -264,10 +264,6 @@ impl PageWebCryptoTaskTurnAction {PageWebCryptoTaskTargetEffect::SettledCurrentOwner)}-- pub(crate) const fn requires_output_capture(self) -> bool {- self.settled_current_owner()- }}pub(crate) type PageWebCryptoTaskTurnOutcome = PageOwnerTurnOutcome<PageWebCryptoTaskTurnAction>;diff --git a/moli-renderer-v8/src/page_task_queue/websocket_event.rs b/moli-renderer-v8/src/page_task_queue/websocket_event.rsindex a39b8e727..118b6821a 100644--- a/moli-renderer-v8/src/page_task_queue/websocket_event.rs+++ b/moli-renderer-v8/src/page_task_queue/websocket_event.rs@@ -6,9 +6,7 @@ use crate::{};use super::{PageRuntimeWakeSignal, RendererOwnerWakeSender};-use crate::runtime::{- PageOwnerTurnOutcome, PageOwnerTurnOutput, RendererOwnerResourceActivitySource,-};+use crate::runtime::PageOwnerTurnOutcome;const WEBSOCKET_EVENT_QUEUE_CAPACITY: usize = 1;@@ -144,14 +142,7 @@ pub(crate) struct PageWebSocketTurnAction {impl PageWebSocketTurnAction {pub(crate) const fn outcome(self) -> PageWebSocketTurnOutcome {- let produced_output = PageOwnerTurnOutput::resource_if(- !matches!(- self.target_effect,- PageWebSocketTargetEffect::ParkedForReadableBackpressure- ),- RendererOwnerResourceActivitySource::WebSocket,- );- PageOwnerTurnOutcome::new(self, produced_output)+ PageOwnerTurnOutcome::new(self)}}diff --git a/moli-renderer-v8/src/page_task_queue/window_message.rs b/moli-renderer-v8/src/page_task_queue/window_message.rsindex 56b70c726..7bfbac151 100644--- a/moli-renderer-v8/src/page_task_queue/window_message.rs+++ b/moli-renderer-v8/src/page_task_queue/window_message.rs@@ -240,13 +240,4 @@ pub(crate) struct PageWindowMessageTurnAction {pub(crate) target_effect: PageWindowMessageTargetEffect,}-impl PageWindowMessageTurnAction {- pub(crate) const fn requires_output_capture(self) -> bool {- matches!(- self.target_effect,- PageWindowMessageTargetEffect::AppliedToCurrentOwner- )- }-}-pub(crate) type PageWindowMessageTurnOutcome = PageOwnerTurnOutcome<PageWindowMessageTurnAction>;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 7c651e247..a23680f9a 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@@ -10,7 +10,7 @@use moli_shared_worker::SharedWorkerInstanceId;use crate::{- runtime::{PageOwnerTurnOutcome, RendererDocumentToken, RendererOwnerResourceActivitySource},+ runtime::{PageOwnerTurnOutcome, RendererDocumentToken},types::DedicatedWorkerId,worker::{WorkerRuntimeEvent, WorkerToParentMessage},};@@ -50,82 +50,18 @@ impl RendererPageWorkerHostBridgeOwner {}}-#[derive(Clone, Copy, Debug, Eq, PartialEq)]-pub(crate) enum WorkerHostBridgeActivity {- Subresource,- FetchInterception,- FetchCancellation,- ContinueEvent,- WebSocket,- Console,-}--impl WorkerHostBridgeActivity {- const fn activity_source(self) -> RendererOwnerResourceActivitySource {- match self {- Self::Subresource => RendererOwnerResourceActivitySource::WorkerSubresource,- Self::FetchInterception => RendererOwnerResourceActivitySource::WorkerFetchInterception,- Self::FetchCancellation => RendererOwnerResourceActivitySource::WorkerFetchCancellation,- Self::ContinueEvent => RendererOwnerResourceActivitySource::WorkerContinueEvent,- Self::WebSocket => RendererOwnerResourceActivitySource::WorkerWebSocket,- Self::Console => RendererOwnerResourceActivitySource::Worker,- }- }-}--pub(crate) fn worker_host_bridge_activity(- message: &WorkerToParentMessage,-) -> Option<WorkerHostBridgeActivity> {- match message {- WorkerToParentMessage::SubresourceNetwork(_) => Some(WorkerHostBridgeActivity::Subresource),- WorkerToParentMessage::PendingSubresourceFetch(_) => {- Some(WorkerHostBridgeActivity::FetchInterception)- }- WorkerToParentMessage::PendingSubresourceFetchCanceled { .. } => {- Some(WorkerHostBridgeActivity::FetchCancellation)- }- WorkerToParentMessage::SubresourceContinue(_) => {- Some(WorkerHostBridgeActivity::ContinueEvent)- }- WorkerToParentMessage::WebSocketSubresource(_)- | WorkerToParentMessage::WebSocketLifecycle(_)- | WorkerToParentMessage::WebSocketFrame(_) => Some(WorkerHostBridgeActivity::WebSocket),- WorkerToParentMessage::Console(_) => Some(WorkerHostBridgeActivity::Console),- WorkerToParentMessage::Post(_)- | WorkerToParentMessage::Error { .. }- | WorkerToParentMessage::RuntimeInspectorMessages(_)- | WorkerToParentMessage::ServiceWorkerLifecycleCompleted(_)- | WorkerToParentMessage::ServiceWorkerFetchCompleted(_)- | WorkerToParentMessage::ServiceWorkerFetchStreamStarted(_)- | WorkerToParentMessage::ServiceWorkerFetchStreamChunk(_)- | WorkerToParentMessage::ServiceWorkerMessageCompleted(_)- | WorkerToParentMessage::ServiceWorkerNotificationCompleted(_)- | WorkerToParentMessage::ServiceWorkerPushCompleted(_)- | WorkerToParentMessage::ServiceWorkerPushSubscribe(_)- | WorkerToParentMessage::ServiceWorkerPushGetSubscription(_)- | WorkerToParentMessage::ServiceWorkerPushUnsubscribe(_)- | WorkerToParentMessage::ServiceWorkerSyncCompleted(_)- | WorkerToParentMessage::ServiceWorkerPeriodicSyncCompleted(_)- | WorkerToParentMessage::ServiceWorkerShowNotification(_)- | WorkerToParentMessage::ServiceWorkerGetNotifications(_)- | WorkerToParentMessage::ServiceWorkerSyncRegistration(_)- | WorkerToParentMessage::ServiceWorkerSyncGetTags(_)- | WorkerToParentMessage::ServiceWorkerPeriodicSyncRegistration(_)- | WorkerToParentMessage::ServiceWorkerPeriodicSyncGetTags(_)- | WorkerToParentMessage::ServiceWorkerPeriodicSyncUnregistration(_)- | WorkerToParentMessage::ServiceWorkerCloseNotification(_)- | WorkerToParentMessage::ServiceWorkerClientMessage(_)- | WorkerToParentMessage::ServiceWorkerWorkerMessage(_)- | WorkerToParentMessage::ServiceWorkerClientQuery(_)- | WorkerToParentMessage::ServiceWorkerClientNavigate(_)- | WorkerToParentMessage::ServiceWorkerClientFocus(_)- | WorkerToParentMessage::ServiceWorkerClientsOpenWindow(_)- | WorkerToParentMessage::ServiceWorkerSkipWaiting { .. }- | WorkerToParentMessage::ServiceWorkerClientsClaim { .. }- | WorkerToParentMessage::ServiceWorkerImportedScriptLoaded { .. }- | WorkerToParentMessage::SharedWorkerClosed- | WorkerToParentMessage::SharedWorkerRuntimeInspectorResponse(_) => None,- }+pub(crate) fn is_worker_host_bridge_message(message: &WorkerToParentMessage) -> bool {+ matches!(+ message,+ WorkerToParentMessage::SubresourceNetwork(_)+ | WorkerToParentMessage::PendingSubresourceFetch(_)+ | WorkerToParentMessage::PendingSubresourceFetchCanceled { .. }+ | WorkerToParentMessage::SubresourceContinue(_)+ | WorkerToParentMessage::WebSocketSubresource(_)+ | WorkerToParentMessage::WebSocketLifecycle(_)+ | WorkerToParentMessage::WebSocketFrame(_)+ | WorkerToParentMessage::Console(_)+ )}fn worker_host_bridge_target(event: &WorkerRuntimeEvent) -> RendererWorkerHostBridgeTarget {@@ -140,25 +76,9 @@ fn worker_host_bridge_target(event: &WorkerRuntimeEvent) -> RendererWorkerHostBr}}-fn worker_host_bridge_activity_source_for_event(- event: &WorkerRuntimeEvent,-) -> RendererOwnerResourceActivitySource {- let message = match event {- WorkerRuntimeEvent::Message { message, .. }- | WorkerRuntimeEvent::SharedWorkerMessage { message, .. } => message,- WorkerRuntimeEvent::HostBridgeDrained { .. } => {- return RendererOwnerResourceActivitySource::Worker;- }- };- worker_host_bridge_activity(message)- .map(WorkerHostBridgeActivity::activity_source)- .unwrap_or(RendererOwnerResourceActivitySource::Worker)-}-#[derive(Debug)]pub(crate) struct RendererPageWorkerHostBridgeTask {owner: RendererPageWorkerHostBridgeOwner,- activity_source: RendererOwnerResourceActivitySource,event: WorkerRuntimeEvent,}@@ -169,7 +89,6 @@ impl RendererPageWorkerHostBridgeTask {root_document,worker_host_bridge_target(&event),),- activity_source: worker_host_bridge_activity_source_for_event(&event),event,}}@@ -178,10 +97,6 @@ impl RendererPageWorkerHostBridgeTask {self.owner}- pub(crate) const fn activity_source(&self) -> RendererOwnerResourceActivitySource {- self.activity_source- }-pub(crate) fn into_event(self) -> WorkerRuntimeEvent {self.event}@@ -241,19 +156,16 @@ pub(crate) enum PageWorkerHostBridgeTargetEffect {#[derive(Clone, Copy, Debug, Eq, PartialEq)]pub(crate) struct PageWorkerHostBridgeTurnAction {owner: RendererPageWorkerHostBridgeOwner,- activity_source: RendererOwnerResourceActivitySource,target_effect: PageWorkerHostBridgeTargetEffect,}impl PageWorkerHostBridgeTurnAction {pub(crate) const fn new(owner: RendererPageWorkerHostBridgeOwner,- activity_source: RendererOwnerResourceActivitySource,target_effect: PageWorkerHostBridgeTargetEffect,) -> Self {Self {owner,- activity_source,target_effect,}}@@ -263,21 +175,9 @@ impl PageWorkerHostBridgeTurnAction {self.owner}- #[cfg(test)]- pub(crate) const fn activity_source(self) -> RendererOwnerResourceActivitySource {- self.activity_source- }-pub(crate) const fn target_effect(self) -> PageWorkerHostBridgeTargetEffect {self.target_effect}-- pub(crate) const fn requires_output_capture(self) -> bool {- matches!(- self.target_effect,- PageWorkerHostBridgeTargetEffect::AppliedToCurrentOwner(_)- )- }}pub(crate) type PageWorkerHostBridgeTurnOutcome =@@ -290,8 +190,8 @@ mod tests {PageRuntimeWakeSignal, RendererOwnerWakeSender, RendererOwnerWakeSource,RendererPageNetworkingSource, RendererPageNetworkingTask,},- runtime::{RendererDocumentToken, RendererOwnerResourceActivitySource, RendererPageToken},- types::{DedicatedWorkerId, PendingSubresourceContinueEvent},+ runtime::{RendererDocumentToken, RendererPageToken},+ types::DedicatedWorkerId,worker::{WorkerRuntimeEvent, WorkerToParentMessage},};use moli_shared_worker::SharedWorkerInstanceId;@@ -354,40 +254,6 @@ mod tests {);}- #[test]- fn fetch_cancellation_and_continue_keep_specific_activity_sources() {- let mut source = RendererPageNetworkingSource::new_for_test();- let sender = RendererWorkerHostBridgeEventSender::new(source.route(), root_document(1));- let worker_id = dedicated_worker_id(7);-- sender- .send(WorkerRuntimeEvent::Message {- worker_id,- message: Box::new(WorkerToParentMessage::PendingSubresourceFetchCanceled {- fetch_id: 99,- error_text: "blocked".to_owned(),- }),- })- .expect("fetch cancellation should send");- sender- .send(WorkerRuntimeEvent::Message {- worker_id,- message: Box::new(WorkerToParentMessage::SubresourceContinue(- PendingSubresourceContinueEvent::Completed { internal_id: 100 },- )),- })- .expect("continue event should send");-- assert_eq!(- pop_worker_task(&mut source).activity_source(),- RendererOwnerResourceActivitySource::WorkerFetchCancellation- );- assert_eq!(- pop_worker_task(&mut source).activity_source(),- RendererOwnerResourceActivitySource::WorkerContinueEvent- );- }-#[test]fn dedicated_worker_terminal_stays_after_the_prior_bridge_burst() {let mut source = RendererPageNetworkingSource::new_for_test();@@ -437,7 +303,7 @@ mod tests {}#[test]- fn shared_worker_target_and_activity_are_not_inferred_from_dedicated_ids() {+ fn shared_worker_target_is_not_inferred_from_dedicated_ids() {let mut source = RendererPageNetworkingSource::new_for_test();let sender = RendererWorkerHostBridgeEventSender::new(source.route(), root_document(1));let instance_id = SharedWorkerInstanceId::from_u64(7);@@ -457,10 +323,6 @@ mod tests {task.owner().target(),RendererWorkerHostBridgeTarget::Shared(instance_id));- assert_eq!(- task.activity_source(),- RendererOwnerResourceActivitySource::WorkerFetchCancellation- );}#[test]@@ -487,17 +349,12 @@ mod tests {);let action = super::PageWorkerHostBridgeTurnAction::new(owner,- RendererOwnerResourceActivitySource::Worker,super::PageWorkerHostBridgeTargetEffect::AppliedToCurrentOwner(super::PageWorkerHostBridgeCurrentEffect::StateAppliedWithoutPageContext,),);assert_eq!(action.owner(), owner);- assert_eq!(- action.activity_source(),- RendererOwnerResourceActivitySource::Worker- );assert_eq!(action.target_effect(),super::PageWorkerHostBridgeTargetEffect::AppliedToCurrentOwner(diff --git a/moli-renderer-v8/src/runtime/mod.rs b/moli-renderer-v8/src/runtime/mod.rsindex e4804745c..bcf8d5a9a 100644--- a/moli-renderer-v8/src/runtime/mod.rs+++ b/moli-renderer-v8/src/runtime/mod.rs@@ -82,8 +82,7 @@ pub(crate) use self::script_preloads::{pub(crate) use self::browser_context_runtime::RendererOutputTransportSenderSlot;pub(in crate::runtime) use self::document_lifecycle_turn::PendingDocumentLifecycleTurn;pub(crate) use self::page_turn_scheduler::{- PageOwnerBlockedReason, PageOwnerTurnOutcome, PageOwnerTurnOutput, PageOwnerTurnReadiness,- PageOwnerTurnSettlement,+ PageOwnerBlockedReason, PageOwnerTurnOutcome, PageOwnerTurnReadiness,};pub(crate) use self::page_vm::AuthorizedCurrentBroadcastChannelDelivery;pub(crate) use self::page_vm::AuthorizedCurrentPageChildClassicScriptSourceLoad;diff --git a/moli-renderer-v8/src/runtime/owner.rs b/moli-renderer-v8/src/runtime/owner.rsindex 3ec85f3d2..5b589b4e3 100644--- a/moli-renderer-v8/src/runtime/owner.rs+++ b/moli-renderer-v8/src/runtime/owner.rs@@ -4019,7 +4019,7 @@ impl RendererOwnerHandle {// belongs after the load boundary of the Document that authorized// this owner turn, never whichever Document is current at settlement.let turn_source_document = entry.page_vm().document_lifecycle.identity();- let failed_turn_output_ordering = if matches!(+ let output_ordering = if matches!(&scheduled_task,crate::page_task_queue::RendererPageSchedulerTask::Timer { .. }) {@@ -4035,50 +4035,42 @@ impl RendererOwnerHandle {advance_page_owner_one_turn_via_local_task(executor, entry, scheduled_task, loader).await;- let settlement = match advance_result {- Ok(settlement) => settlement,- Err(error) => {- let has_pending_document_lifecycle_turn =- has_pending_document_lifecycle_turn_on_entry(&mut entry);- let output = entry- .page_vm_mut()- .settle_renderer_output_publication()- .map(|output| output.with_ordering(failed_turn_output_ordering));- self.restore_live_page_entry(token, entry);- if let Some(output) = output {- self.publish_renderer_output(output);- }- let readiness = page_turn_readiness_after_restore_on_bound_owner_local_store(token);- let next_turn = readiness- .map(|readiness| readiness.next_turn(has_pending_document_lifecycle_turn))- .unwrap_or(PageOwnerNextTurn::None);- tracing::debug!(- source = source_label,- page_id = token.page_id.as_u64(),- ?readiness,- ?next_turn,- "Page scheduler turn failed: {error}"- );- match next_turn {- PageOwnerNextTurn::Ordinary => self.signal_internal_page_turn_source(- token,- RendererOwnerWakeSource::SchedulerContinuation,- ),- PageOwnerNextTurn::DocumentLifecycle => {- self.signal_internal_document_lifecycle_turn(token);- }- PageOwnerNextTurn::None => {}+ if let Err(error) = advance_result {+ let has_pending_document_lifecycle_turn =+ has_pending_document_lifecycle_turn_on_entry(&mut entry);+ let output = entry+ .page_vm_mut()+ .settle_renderer_output_publication()+ .map(|output| output.with_ordering(output_ordering));+ self.restore_live_page_entry(token, entry);+ if let Some(output) = output {+ self.publish_renderer_output(output);+ }+ let readiness = page_turn_readiness_after_restore_on_bound_owner_local_store(token);+ let next_turn = readiness+ .map(|readiness| readiness.next_turn(has_pending_document_lifecycle_turn))+ .unwrap_or(PageOwnerNextTurn::None);+ tracing::debug!(+ source = source_label,+ page_id = token.page_id.as_u64(),+ ?readiness,+ ?next_turn,+ "Page scheduler turn failed: {error}"+ );+ match next_turn {+ PageOwnerNextTurn::Ordinary => self.signal_internal_page_turn_source(+ token,+ RendererOwnerWakeSource::SchedulerContinuation,+ ),+ PageOwnerNextTurn::DocumentLifecycle => {+ self.signal_internal_document_lifecycle_turn(token);}- return RenderRuntimeDispatchOutcome::BackgroundComplete(Ok(()));+ PageOwnerNextTurn::None => {}}- };+ return RenderRuntimeDispatchOutcome::BackgroundComplete(Ok(()));+ }- self.finish_page_turn(- token,- entry,- source_label,- settlement.renderer_output_ordering(turn_source_document),- )+ self.finish_page_turn(token, entry, source_label, output_ordering)}async fn run_one_owner_maintenance_turn(diff --git a/moli-renderer-v8/src/runtime/owner_local_store.rs b/moli-renderer-v8/src/runtime/owner_local_store.rsindex 25ca47668..daa484b4c 100644--- a/moli-renderer-v8/src/runtime/owner_local_store.rs+++ b/moli-renderer-v8/src/runtime/owner_local_store.rs@@ -218,8 +218,6 @@ pub(super) enum RendererPageTurnAdmission {MissingPage,}-pub(super) type RendererPageOwnerTurnAdvance = PageOwnerTurnSettlement;-pub(super) struct RendererPendingPageCreation {pub(super) token: RendererPageToken,navigation_failure_observer: PageCreationNavigationFailureObserver,@@ -2177,7 +2175,7 @@ pub(super) async fn advance_page_owner_one_turn_via_local_task(entry: RendererPageLocalEntry,task: RendererPageSchedulerTask,loader: ResourceRequestClient,-) -> (RendererPageLocalEntry, Result<RendererPageOwnerTurnAdvance>) {+) -> (RendererPageLocalEntry, Result<()>) {run_entry_on_bound_owner_local_store_local_task(local_executor, entry, move |entry| {Box::pin(async move {let replacement_lifecycle_snapshot = entry@@ -2190,7 +2188,7 @@ pub(super) async fn advance_page_owner_one_turn_via_local_task(.page_vm().vm().begin_ordinary_page_turn_navigation_handoff()?;- let settlement = entry+ let application = entry.page_vm_mut().apply_selected_page_scheduler_task(task, &loader).await;@@ -2212,8 +2210,8 @@ pub(super) async fn advance_page_owner_one_turn_via_local_task(.await};- match (settlement, reconciliation) {- (Ok(settlement), Ok(_)) => Ok(settlement),+ match (application, reconciliation) {+ (Ok(()), Ok(_)) => Ok(()),(Err(action_error), Ok(_)) => Err(action_error),(Ok(_), Err(reconciliation_error)) => Err(reconciliation_error),(Err(action_error), Err(reconciliation_error)) => Err(anyhow!(diff --git a/moli-renderer-v8/src/runtime/page_turn_scheduler.rs b/moli-renderer-v8/src/runtime/page_turn_scheduler.rsindex c2d611f70..a55167342 100644--- a/moli-renderer-v8/src/runtime/page_turn_scheduler.rs+++ b/moli-renderer-v8/src/runtime/page_turn_scheduler.rs@@ -17,10 +17,10 @@ use crate::page_task_queue::{};use std::time::Instant;+use super::RendererOwnerRuntimeActivitySource;use super::page_entry_residence::{RendererPageEntryCheckout, RendererPageEntryResidenceSlot, RendererPageEntryRestore,};-use super::{RendererOwnerResourceActivitySource, RendererOwnerRuntimeActivitySource};#[derive(Debug)]pub(super) struct PageTurnScheduler<Entry> {@@ -169,25 +169,15 @@ impl PageOwnerTurnReadiness {}}-/// Observable settlement of exactly one ordinary Page action.-///-/// `Action` preserves the family-specific semantic result. The family-/// executor also records the output fact it actually produced; the owner-/// finish boundary decides when that fact becomes externally observable.-/// Scheduler continuation state deliberately does not live here: it is-/// derived from the stable Page residence after the action is complete.+/// Semantic result of exactly one ordinary Page action.#[derive(Clone, Copy, Debug, Eq, PartialEq)]pub(crate) struct PageOwnerTurnOutcome<Action> {pub(crate) action: Action,- settlement: PageOwnerTurnSettlement,}impl<Action> PageOwnerTurnOutcome<Action> {- pub(crate) const fn new(action: Action, produced_output: Option<PageOwnerTurnOutput>) -> Self {- Self {- action,- settlement: PageOwnerTurnSettlement { produced_output },- }+ pub(crate) const fn new(action: Action) -> Self {+ Self { action }}pub(crate) fn map_action<Mapped>(@@ -196,71 +186,6 @@ impl<Action> PageOwnerTurnOutcome<Action> {) -> PageOwnerTurnOutcome<Mapped> {PageOwnerTurnOutcome {action: map(self.action),- settlement: self.settlement,- }- }-- pub(crate) fn into_settlement(self) -> PageOwnerTurnSettlement {- self.settlement- }-- pub(crate) fn into_parts(self) -> (Action, PageOwnerTurnSettlement) {- (self.action, self.settlement)- }-}--#[derive(Clone, Copy, Debug, Eq, PartialEq)]-pub(crate) struct PageOwnerTurnSettlement {- pub(crate) produced_output: Option<PageOwnerTurnOutput>,-}--impl PageOwnerTurnSettlement {- /// Preserve the one ordering fact that is not encoded by the concrete- /// records themselves.- ///- /// A timer callback selected after the exact Page load boundary must not- /// overtake a still-pending `Page.loadEventFired` projection. Other task- /// families either produce load prerequisites or carry their ordering in- /// their concrete record identity.- pub(crate) const fn renderer_output_ordering(- self,- source_document: super::RendererDocumentLifecycleIdentity,- ) -> super::RendererOutputPublicationOrdering {- match self.produced_output {- Some(PageOwnerTurnOutput::Runtime(RendererOwnerRuntimeActivitySource::Timer)) => {- super::RendererOutputPublicationOrdering::AfterPendingPageLoad { source_document }- }- _ => super::RendererOutputPublicationOrdering::Unconstrained,- }- }-}--#[derive(Clone, Copy, Debug, Eq, PartialEq)]-pub(crate) enum PageOwnerTurnOutput {- Resource(RendererOwnerResourceActivitySource),- Runtime(RendererOwnerRuntimeActivitySource),-}--impl PageOwnerTurnOutput {- pub(crate) const fn resource_if(- produced: bool,- source: RendererOwnerResourceActivitySource,- ) -> Option<Self> {- if produced {- Some(Self::Resource(source))- } else {- None- }- }-- pub(crate) const fn runtime_if(- produced: bool,- source: RendererOwnerRuntimeActivitySource,- ) -> Option<Self> {- if produced {- Some(Self::Runtime(source))- } else {- None}}}diff --git a/moli-renderer-v8/src/runtime/page_vm/mod.rs b/moli-renderer-v8/src/runtime/page_vm/mod.rsindex 373ffb153..7db678d57 100644--- a/moli-renderer-v8/src/runtime/page_vm/mod.rs+++ b/moli-renderer-v8/src/runtime/page_vm/mod.rs@@ -3403,19 +3403,16 @@ impl PageVm {let crate::page_task_queue::RendererPageSchedulerTask::WebSocket(task) = task else {unreachable!("WebSocket descriptor must dequeue its own typed source")};+ let outcome = self.apply_selected_page_websocket_turn(task)?;+ let action = outcome.action;+ let produced_output = !matches!(+ action.target_effect,+ crate::page_task_queue::PageWebSocketTargetEffect::ParkedForReadableBackpressure+ );let loader = self.request_client.clone();- let settlement = Box::pin(self.apply_selected_page_scheduler_task(- crate::page_task_queue::RendererPageSchedulerTask::WebSocket(task),- &loader,- ))- .await?;- return Ok(match settlement.produced_output {- Some(crate::runtime::PageOwnerTurnOutput::Resource(source)) => Some(source),- Some(crate::runtime::PageOwnerTurnOutput::Runtime(_)) => {- unreachable!("WebSocket task cannot produce runtime-activity output")- }- None => None,- });+ self.finish_selected_page_task_completion(action.into_page_task_completion(), &loader)+ .await?;+ return Ok(produced_output.then_some(RendererOwnerResourceActivitySource::WebSocket));}Ok(None)}diff --git a/moli-renderer-v8/src/runtime/page_vm/page_broadcast_channel_delivery.rs b/moli-renderer-v8/src/runtime/page_vm/page_broadcast_channel_delivery.rsindex c72e49b1b..6e95b5a42 100644--- a/moli-renderer-v8/src/runtime/page_vm/page_broadcast_channel_delivery.rs+++ b/moli-renderer-v8/src/runtime/page_vm/page_broadcast_channel_delivery.rs@@ -3,7 +3,6 @@ use crate::page_task_queue::{PageBroadcastChannelDeliveryTurnOutcome, RendererPageBroadcastChannelDeliveryOwner,RendererPageBroadcastChannelDeliveryTask,};-use crate::runtime::{PageOwnerTurnOutput, RendererOwnerResourceActivitySource};use super::{IntoPageTaskCompletion, PageTaskCompletion, PageVm};@@ -88,12 +87,6 @@ impl PageVm {channel_id,document_effect,};- Ok(PageBroadcastChannelDeliveryTurnOutcome::new(- action,- PageOwnerTurnOutput::resource_if(- action.requires_output_capture(),- RendererOwnerResourceActivitySource::BroadcastChannel,- ),- ))+ Ok(PageBroadcastChannelDeliveryTurnOutcome::new(action))}}diff --git a/moli-renderer-v8/src/runtime/page_vm/page_child_frame_task.rs b/moli-renderer-v8/src/runtime/page_vm/page_child_frame_task.rsindex e37820c8c..7a64d2e36 100644--- a/moli-renderer-v8/src/runtime/page_vm/page_child_frame_task.rs+++ b/moli-renderer-v8/src/runtime/page_vm/page_child_frame_task.rs@@ -10,10 +10,6 @@ use crate::page_task_queue::{PageChildRealmMaterializationTurnAction, PageChildRealmMaterializationTurnOutcome,RendererPageChildFrameTask, RendererPageChildFrameTaskOwner, RendererPageChildFrameTaskTarget,};-use crate::runtime::{- PageOwnerTurnOutput, PageOwnerTurnSettlement, RendererOwnerResourceActivitySource,- RendererOwnerRuntimeActivitySource,-};use crate::script_vm::{ChildDocumentLifecycleRunOutcome, ChildDocumentScriptActivity,ChildDocumentScriptReadyRunOutcome, ChildHostLoadRunOutcome,@@ -194,13 +190,7 @@ impl PageVm {owner,target_effect,};- PageChildDocumentLifecycleTurnOutcome::new(- action,- PageOwnerTurnOutput::resource_if(- action.requires_output_capture(),- RendererOwnerResourceActivitySource::ChildDocument,- ),- )+ PageChildDocumentLifecycleTurnOutcome::new(action)}fn current_page_child_host_load_owner(@@ -263,13 +253,7 @@ impl PageVm {owner,target_effect,};- PageChildHostLoadTurnOutcome::new(- action,- PageOwnerTurnOutput::resource_if(- action.requires_output_capture(),- RendererOwnerResourceActivitySource::ChildDocument,- ),- )+ PageChildHostLoadTurnOutcome::new(action)}fn current_page_child_realm_materialization_owner(@@ -337,13 +321,7 @@ impl PageVm {owner,target_effect,};- PageChildRealmMaterializationTurnOutcome::new(- action,- PageOwnerTurnOutput::runtime_if(- action.requires_output_capture(),- RendererOwnerRuntimeActivitySource::ChildRealmMaterialization,- ),- )+ PageChildRealmMaterializationTurnOutcome::new(action)}fn current_page_child_document_script_ready_owner(@@ -423,13 +401,7 @@ impl PageVm {task_id,target_effect,};- Ok(PageChildDocumentScriptReadyTurnOutcome::new(- action,- PageOwnerTurnOutput::resource_if(- action.requires_output_capture(),- RendererOwnerResourceActivitySource::ChildDocument,- ),- ))+ Ok(PageChildDocumentScriptReadyTurnOutcome::new(action))}fn current_page_child_classic_source_load_owner(@@ -487,13 +459,7 @@ impl PageVm {owner,target_effect,};- PageChildClassicScriptSourceLoadTurnOutcome::new(- action,- PageOwnerTurnOutput::resource_if(- action.requires_output_capture(),- RendererOwnerResourceActivitySource::ChildDocument,- ),- )+ PageChildClassicScriptSourceLoadTurnOutcome::new(action)}fn current_page_child_parser_module_root_start_owner(@@ -545,25 +511,19 @@ impl PageVm {owner,target_effect,};- PageChildParserModuleRootStartTurnOutcome::new(- action,- PageOwnerTurnOutput::resource_if(- action.requires_output_capture(),- RendererOwnerResourceActivitySource::ChildDocument,- ),- )+ PageChildParserModuleRootStartTurnOutcome::new(action)}pub(in crate::runtime) async fn apply_selected_page_child_frame_task_turn(&mut self,task: RendererPageChildFrameTask,loader: &crate::network::ResourceRequestClient,- ) -> anyhow::Result<PageOwnerTurnSettlement> {+ ) -> anyhow::Result<()> {match task.owner().target() {RendererPageChildFrameTaskTarget::RealmMaterialization(_) => {let outcome = self.apply_selected_page_child_realm_materialization_turn(task);self.finish_selected_page_child_realm_materialization(outcome.action)?;- Ok(outcome.into_settlement())+ Ok(())}RendererPageChildFrameTaskTarget::DocumentLifecycle(_) => {let outcome = self.apply_selected_page_child_document_lifecycle_turn(task);@@ -572,7 +532,7 @@ impl PageVm {loader,).await?;- Ok(outcome.into_settlement())+ Ok(())}RendererPageChildFrameTaskTarget::DocumentScriptReady(_) => {let outcome = self@@ -585,7 +545,7 @@ impl PageVm {}PageChildDocumentScriptReadyCompletionBoundary::DiscardedStale => {}}- Ok(outcome.into_settlement())+ Ok(())}RendererPageChildFrameTaskTarget::HostLoad(_) => {let outcome = self.apply_selected_page_child_host_load_turn(task);@@ -594,7 +554,7 @@ impl PageVm {loader,).await?;- Ok(outcome.into_settlement())+ Ok(())}RendererPageChildFrameTaskTarget::ParserModuleRootStart(_) => {let outcome = self.apply_selected_page_child_parser_module_root_start_turn(task);@@ -603,7 +563,7 @@ impl PageVm {loader,).await?;- Ok(outcome.into_settlement())+ Ok(())}RendererPageChildFrameTaskTarget::ClassicScriptSourceLoad(_) => {let outcome = self.apply_selected_page_child_classic_source_load_turn(task);@@ -612,7 +572,7 @@ impl PageVm {loader,).await?;- Ok(outcome.into_settlement())+ Ok(())}}}diff --git a/moli-renderer-v8/src/runtime/page_vm/page_child_module_dependency_fetch_start.rs b/moli-renderer-v8/src/runtime/page_vm/page_child_module_dependency_fetch_start.rsindex 7906a5664..ac1b13aaf 100644--- a/moli-renderer-v8/src/runtime/page_vm/page_child_module_dependency_fetch_start.rs+++ b/moli-renderer-v8/src/runtime/page_vm/page_child_module_dependency_fetch_start.rs@@ -86,10 +86,7 @@ impl PageVm {owner,target_effect,};- debug_assert!(!action.requires_output_capture());- Ok(PageChildModuleDependencyFetchStartTurnOutcome::new(- action, None,- ))+ Ok(PageChildModuleDependencyFetchStartTurnOutcome::new(action))}#[cfg(test)]diff --git a/moli-renderer-v8/src/runtime/page_vm/page_child_module_script_terminal.rs b/moli-renderer-v8/src/runtime/page_vm/page_child_module_script_terminal.rsindex e90349fdf..c5ca4de71 100644--- a/moli-renderer-v8/src/runtime/page_vm/page_child_module_script_terminal.rs+++ b/moli-renderer-v8/src/runtime/page_vm/page_child_module_script_terminal.rs@@ -5,7 +5,6 @@ use crate::{PageChildModuleScriptTerminalTurnOutcome, RendererPageChildModuleScriptTerminalOwner,RendererPageChildModuleScriptTerminalTask,},- runtime::{PageOwnerTurnOutput, RendererOwnerResourceActivitySource},};use super::PageVm;@@ -91,13 +90,7 @@ impl PageVm {owner,target_effect,};- PageChildModuleScriptTerminalTurnOutcome::new(- action,- PageOwnerTurnOutput::resource_if(- action.requires_output_capture(),- RendererOwnerResourceActivitySource::ChildDocument,- ),- )+ PageChildModuleScriptTerminalTurnOutcome::new(action)}#[cfg(test)]diff --git a/moli-renderer-v8/src/runtime/page_vm/page_child_modulepreload_event_action.rs b/moli-renderer-v8/src/runtime/page_vm/page_child_modulepreload_event_action.rsindex 0538598e2..d28cdff24 100644--- a/moli-renderer-v8/src/runtime/page_vm/page_child_modulepreload_event_action.rs+++ b/moli-renderer-v8/src/runtime/page_vm/page_child_modulepreload_event_action.rs@@ -6,7 +6,6 @@ use crate::{RendererPageChildModulepreloadEventActionOwner,RendererPageChildModulepreloadEventActionTask,},- runtime::{PageOwnerTurnOutput, RendererOwnerResourceActivitySource},};use super::{IntoPageTaskCompletion, PageTaskCompletion, PageVm};@@ -126,12 +125,6 @@ impl PageVm {owner,target_effect,};- PageChildModulepreloadEventActionTurnOutcome::new(- action,- PageOwnerTurnOutput::resource_if(- action.requires_output_capture(),- RendererOwnerResourceActivitySource::ChildDocument,- ),- )+ PageChildModulepreloadEventActionTurnOutcome::new(action)}}diff --git a/moli-renderer-v8/src/runtime/page_vm/page_child_navigation_commit.rs b/moli-renderer-v8/src/runtime/page_vm/page_child_navigation_commit.rsindex 0b5bdf432..32689f81f 100644--- a/moli-renderer-v8/src/runtime/page_vm/page_child_navigation_commit.rs+++ b/moli-renderer-v8/src/runtime/page_vm/page_child_navigation_commit.rs@@ -1,10 +1,7 @@-use crate::{- page_task_queue::{- PageChildNavigationCommitTargetEffect, PageChildNavigationCommitTurnAction,- PageChildNavigationCommitTurnOutcome, RendererPageChildNavigationCommitOwner,- RendererPageChildNavigationCommitTask,- },- runtime::{PageOwnerTurnOutput, RendererOwnerRuntimeActivitySource},+use crate::page_task_queue::{+ PageChildNavigationCommitTargetEffect, PageChildNavigationCommitTurnAction,+ PageChildNavigationCommitTurnOutcome, RendererPageChildNavigationCommitOwner,+ RendererPageChildNavigationCommitTask,};use super::{IntoPageTaskCompletion, PageTaskCompletion, PageVm};@@ -85,13 +82,7 @@ impl PageVm {owner,target_effect,};- Ok(PageChildNavigationCommitTurnOutcome::new(- action,- PageOwnerTurnOutput::runtime_if(- action.requires_output_capture(),- RendererOwnerRuntimeActivitySource::NavigationAndTraversal,- ),- ))+ Ok(PageChildNavigationCommitTurnOutcome::new(action))}#[cfg(test)]diff --git a/moli-renderer-v8/src/runtime/page_vm/page_dedicated_worker_client_event.rs b/moli-renderer-v8/src/runtime/page_vm/page_dedicated_worker_client_event.rsindex e7a355ef9..558a11a3e 100644--- a/moli-renderer-v8/src/runtime/page_vm/page_dedicated_worker_client_event.rs+++ b/moli-renderer-v8/src/runtime/page_vm/page_dedicated_worker_client_event.rs@@ -4,7 +4,6 @@ use crate::{PageDedicatedWorkerClientEventTurnOutcome, RendererPageDedicatedWorkerClientEventOwner,RendererPageDedicatedWorkerClientEventTask,},- runtime::{PageOwnerTurnOutput, RendererOwnerResourceActivitySource},script_vm::DedicatedWorkerClientEventBodyEffect,};@@ -106,12 +105,6 @@ impl PageVm {event_kind,target_effect,};- Ok(PageDedicatedWorkerClientEventTurnOutcome::new(- action,- PageOwnerTurnOutput::resource_if(- action.requires_output_capture(),- RendererOwnerResourceActivitySource::Worker,- ),- ))+ Ok(PageDedicatedWorkerClientEventTurnOutcome::new(action))}}diff --git a/moli-renderer-v8/src/runtime/page_vm/page_dom_manipulation.rs b/moli-renderer-v8/src/runtime/page_vm/page_dom_manipulation.rsindex 4191e1255..5172b94cb 100644--- a/moli-renderer-v8/src/runtime/page_vm/page_dom_manipulation.rs+++ b/moli-renderer-v8/src/runtime/page_vm/page_dom_manipulation.rs@@ -34,10 +34,7 @@ impl PageVm {.apply_selected_page_popup_load_event_turn(task).map(|outcome| outcome.map_action(PageDomManipulationTurnAction::PopupLoadEvent)),RendererPageDomManipulationTask::ConnectedStyleEvent(task) => self- .apply_selected_page_connected_style_event_turn(- task,- crate::runtime::RendererOwnerRuntimeActivitySource::DomManipulation,- )+ .apply_selected_page_connected_style_event_turn(task).map(|outcome| {outcome.map_action(PageDomManipulationTurnAction::ConnectedStyleEvent)}),diff --git a/moli-renderer-v8/src/runtime/page_vm/page_dom_manipulation_task_completion.rs b/moli-renderer-v8/src/runtime/page_vm/page_dom_manipulation_task_completion.rsindex e13d9ed34..f72af4551 100644--- a/moli-renderer-v8/src/runtime/page_vm/page_dom_manipulation_task_completion.rs+++ b/moli-renderer-v8/src/runtime/page_vm/page_dom_manipulation_task_completion.rs@@ -20,7 +20,7 @@ impl PageVm {let connected_style_event_settled_current_owner = matches!(action,PageDomManipulationTurnAction::ConnectedStyleEvent(action)- if action.requires_output_capture()+ if action.settled_current_owner());let completion = match action {PageDomManipulationTurnAction::BroadcastChannel(action) => {diff --git a/moli-renderer-v8/src/runtime/page_vm/page_dynamic_import_owner_action.rs b/moli-renderer-v8/src/runtime/page_vm/page_dynamic_import_owner_action.rsindex de1c1c40d..85b6c7742 100644--- a/moli-renderer-v8/src/runtime/page_vm/page_dynamic_import_owner_action.rs+++ b/moli-renderer-v8/src/runtime/page_vm/page_dynamic_import_owner_action.rs@@ -5,7 +5,6 @@ use crate::{PageDynamicImportOwnerActionTurnOutcome, RendererPageDynamicImportOwnerActionOwner,RendererPageDynamicImportOwnerActionTask,},- runtime::{PageOwnerTurnOutput, RendererOwnerRuntimeActivitySource},};use super::{IntoPageTaskCompletion, PageTaskCompletion, PageVm};@@ -93,13 +92,7 @@ impl PageVm {owner,document_effect,};- PageDynamicImportOwnerActionTurnOutcome::new(- action,- PageOwnerTurnOutput::runtime_if(- action.requires_output_capture(),- RendererOwnerRuntimeActivitySource::SelectedTaskOutput,- ),- )+ PageDynamicImportOwnerActionTurnOutcome::new(action)}/// Test-only body executor for assertions about the owner-action domaindiff --git a/moli-renderer-v8/src/runtime/page_vm/page_element_toggle_event.rs b/moli-renderer-v8/src/runtime/page_vm/page_element_toggle_event.rsindex 5347e47d1..73348e6ef 100644--- a/moli-renderer-v8/src/runtime/page_vm/page_element_toggle_event.rs+++ b/moli-renderer-v8/src/runtime/page_vm/page_element_toggle_event.rs@@ -4,7 +4,6 @@ use crate::page_task_queue::{RendererPageElementToggleEventOwner, RendererPageElementToggleEventTask,RendererPageElementToggleEventTaskId,};-use crate::runtime::{PageOwnerTurnOutput, RendererOwnerRuntimeActivitySource};use super::{AuthorizedCurrentWindowDocumentTask, IntoPageTaskCompletion, PageTaskCompletion, PageVm,@@ -87,12 +86,6 @@ impl PageVm {kind,target_effect,};- Ok(PageElementToggleEventTurnOutcome::new(- action,- PageOwnerTurnOutput::runtime_if(- action.requires_output_capture(),- RendererOwnerRuntimeActivitySource::DomManipulation,- ),- ))+ Ok(PageElementToggleEventTurnOutcome::new(action))}}diff --git a/moli-renderer-v8/src/runtime/page_vm/page_file_entry_file_callback.rs b/moli-renderer-v8/src/runtime/page_vm/page_file_entry_file_callback.rsindex dfbad59f3..af7195cf3 100644--- a/moli-renderer-v8/src/runtime/page_vm/page_file_entry_file_callback.rs+++ b/moli-renderer-v8/src/runtime/page_vm/page_file_entry_file_callback.rs@@ -4,7 +4,6 @@ use crate::page_task_queue::{RendererPageFileEntryFileCallbackTask, RendererPageFileEntryFileCallbackTaskId,RendererPageFileEntryFileCallbackTaskKind,};-use crate::runtime::{PageOwnerTurnOutput, RendererOwnerRuntimeActivitySource};use super::{AuthorizedCurrentWindowDocumentTask, IntoPageTaskCompletion, PageTaskCompletion, PageVm,@@ -78,12 +77,6 @@ impl PageVm {kind,target_effect,};- Ok(PageFileEntryFileCallbackTurnOutcome::new(- action,- PageOwnerTurnOutput::runtime_if(- action.requires_output_capture(),- RendererOwnerRuntimeActivitySource::DomManipulation,- ),- ))+ Ok(PageFileEntryFileCallbackTurnOutcome::new(action))}}diff --git a/moli-renderer-v8/src/runtime/page_vm/page_file_reading.rs b/moli-renderer-v8/src/runtime/page_vm/page_file_reading.rsindex 2434e4570..08ab9eed9 100644--- a/moli-renderer-v8/src/runtime/page_vm/page_file_reading.rs+++ b/moli-renderer-v8/src/runtime/page_vm/page_file_reading.rs@@ -1,10 +1,7 @@-use crate::{- page_task_queue::{- PageFileReadingTargetEffect, PageFileReadingTurnAction, PageFileReadingTurnOutcome,- RendererPageFileReadingOwner, RendererPageFileReadingTask, RendererPageFileReadingTaskId,- RendererPageFileReadingTaskKind,- },- runtime::{PageOwnerTurnOutput, RendererOwnerRuntimeActivitySource},+use crate::page_task_queue::{+ PageFileReadingTargetEffect, PageFileReadingTurnAction, PageFileReadingTurnOutcome,+ RendererPageFileReadingOwner, RendererPageFileReadingTask, RendererPageFileReadingTaskId,+ RendererPageFileReadingTaskKind,};use super::{@@ -80,12 +77,6 @@ impl PageVm {kind,target_effect,};- Ok(PageFileReadingTurnOutcome::new(- action,- PageOwnerTurnOutput::runtime_if(- action.requires_output_capture(),- RendererOwnerRuntimeActivitySource::FileReading,- ),- ))+ Ok(PageFileReadingTurnOutcome::new(action))}}diff --git a/moli-renderer-v8/src/runtime/page_vm/page_hash_change_delivery.rs b/moli-renderer-v8/src/runtime/page_vm/page_hash_change_delivery.rsindex bb9ffa534..e4489a968 100644--- a/moli-renderer-v8/src/runtime/page_vm/page_hash_change_delivery.rs+++ b/moli-renderer-v8/src/runtime/page_vm/page_hash_change_delivery.rs@@ -3,7 +3,6 @@ use crate::page_task_queue::{PageHashChangeDeliveryTurnOutcome, RendererPageHashChangeDeliveryOwner,RendererPageHashChangeDeliveryTask,};-use crate::runtime::{PageOwnerTurnOutput, RendererOwnerRuntimeActivitySource};use super::{IntoPageTaskCompletion, PageTaskCompletion, PageVm};@@ -74,12 +73,6 @@ impl PageVm {owner,target_effect,};- Ok(PageHashChangeDeliveryTurnOutcome::new(- action,- PageOwnerTurnOutput::runtime_if(- action.requires_output_capture(),- RendererOwnerRuntimeActivitySource::DomManipulation,- ),- ))+ Ok(PageHashChangeDeliveryTurnOutcome::new(action))}}diff --git a/moli-renderer-v8/src/runtime/page_vm/page_history_traversal.rs b/moli-renderer-v8/src/runtime/page_vm/page_history_traversal.rsindex a02eef366..eb8b71165 100644--- a/moli-renderer-v8/src/runtime/page_vm/page_history_traversal.rs+++ b/moli-renderer-v8/src/runtime/page_vm/page_history_traversal.rs@@ -4,7 +4,6 @@ use crate::page_task_queue::{RendererPageHistoryTraversalTask, RendererPageHistoryTraversalTaskId,RendererPageHistoryTraversalTaskKind,};-use crate::runtime::{PageOwnerTurnOutput, RendererOwnerRuntimeActivitySource};use super::{IntoPageTaskCompletion, PageTaskCompletion, PageVm};@@ -91,12 +90,6 @@ impl PageVm {kind,target_effect,};- Ok(PageHistoryTraversalTurnOutcome::new(- action,- PageOwnerTurnOutput::runtime_if(- action.requires_output_capture(),- RendererOwnerRuntimeActivitySource::NavigationAndTraversal,- ),- ))+ Ok(PageHistoryTraversalTurnOutcome::new(action))}}diff --git a/moli-renderer-v8/src/runtime/page_vm/page_image_load_event.rs b/moli-renderer-v8/src/runtime/page_vm/page_image_load_event.rsindex 142e824cc..aad288498 100644--- a/moli-renderer-v8/src/runtime/page_vm/page_image_load_event.rs+++ b/moli-renderer-v8/src/runtime/page_vm/page_image_load_event.rs@@ -4,7 +4,6 @@ use crate::page_task_queue::{RendererPageImageLoadEventOwner, RendererPageImageLoadEventTask,RendererPageImageLoadEventTaskId,};-use crate::runtime::{PageOwnerTurnOutput, RendererOwnerRuntimeActivitySource};use super::{AuthorizedCurrentWindowDocumentTask, IntoPageTaskCompletion, PageTaskCompletion, PageVm,@@ -94,12 +93,6 @@ impl PageVm {kind,target_effect,};- Ok(PageImageLoadEventTurnOutcome::new(- action,- PageOwnerTurnOutput::runtime_if(- action.requires_output_capture(),- RendererOwnerRuntimeActivitySource::DomManipulation,- ),- ))+ Ok(PageImageLoadEventTurnOutcome::new(action))}}diff --git a/moli-renderer-v8/src/runtime/page_vm/page_indexed_db_task.rs b/moli-renderer-v8/src/runtime/page_vm/page_indexed_db_task.rsindex db64f0159..158bd6a96 100644--- a/moli-renderer-v8/src/runtime/page_vm/page_indexed_db_task.rs+++ b/moli-renderer-v8/src/runtime/page_vm/page_indexed_db_task.rs@@ -2,7 +2,6 @@ use crate::page_task_queue::{PageIndexedDbTaskTargetEffect, PageIndexedDbTaskTurnAction, PageIndexedDbTaskTurnOutcome,RendererPageIndexedDbTask, RendererPageIndexedDbTaskOwner,};-use crate::runtime::{PageOwnerTurnOutput, RendererOwnerRuntimeActivitySource};use crate::script_vm::IndexedDbTaskBodyEffect;use super::{IntoPageTaskCompletion, PageTaskCompletion, PageVm};@@ -109,12 +108,6 @@ impl PageVm {kind,target_effect,};- Ok(PageIndexedDbTaskTurnOutcome::new(- action,- PageOwnerTurnOutput::runtime_if(- action.requires_output_capture(),- RendererOwnerRuntimeActivitySource::IndexedDb,- ),- ))+ Ok(PageIndexedDbTaskTurnOutcome::new(action))}}diff --git a/moli-renderer-v8/src/runtime/page_vm/page_internal_loading.rs b/moli-renderer-v8/src/runtime/page_vm/page_internal_loading.rsindex 1de5d39b0..a3dea7ec3 100644--- a/moli-renderer-v8/src/runtime/page_vm/page_internal_loading.rs+++ b/moli-renderer-v8/src/runtime/page_vm/page_internal_loading.rs@@ -2,7 +2,6 @@ use crate::page_task_queue::{PageInternalLoadingTargetEffect, PageInternalLoadingTurnAction, PageInternalLoadingTurnOutcome,RendererPageInternalLoadingOwner, RendererPageInternalLoadingTask,};-use crate::runtime::{PageOwnerTurnOutput, RendererOwnerRuntimeActivitySource};use super::PageVm;@@ -44,13 +43,7 @@ impl PageVm {owner,target_effect,};- PageInternalLoadingTurnOutcome::new(- action,- PageOwnerTurnOutput::runtime_if(- action.requires_output_capture(),- RendererOwnerRuntimeActivitySource::InternalLoading,- ),- )+ PageInternalLoadingTurnOutcome::new(action)}/// Executes only the authorized internal-loading body.diff --git a/moli-renderer-v8/src/runtime/page_vm/page_main_document_runtime.rs b/moli-renderer-v8/src/runtime/page_vm/page_main_document_runtime.rsindex 487872a57..781d37694 100644--- a/moli-renderer-v8/src/runtime/page_vm/page_main_document_runtime.rs+++ b/moli-renderer-v8/src/runtime/page_vm/page_main_document_runtime.rs@@ -6,7 +6,6 @@ use crate::page_task_queue::{PageRuntimeScriptContinuationTargetEffect, RendererPageMainDocumentRuntimeAction,RendererPageMainDocumentRuntimeOwner, RendererPageMainDocumentRuntimeTask,};-use crate::runtime::{PageOwnerTurnOutput, RendererOwnerRuntimeActivitySource};use super::{IntoPageTaskCompletion, PageTaskCompletion, PageVm};@@ -287,14 +286,7 @@ impl PageVm {}}};- let requires_output_capture = action.requires_output_capture();- Ok(PageMainDocumentRuntimeTurnOutcome::new(- action,- PageOwnerTurnOutput::runtime_if(- requires_output_capture,- RendererOwnerRuntimeActivitySource::SelectedTaskOutput,- ),- ))+ Ok(PageMainDocumentRuntimeTurnOutcome::new(action))}/// Test-only body executor for assertions about one action's domaindiff --git a/moli-renderer-v8/src/runtime/page_vm/page_main_parser_continuation.rs b/moli-renderer-v8/src/runtime/page_vm/page_main_parser_continuation.rsindex 3cdafdfda..83c462ff6 100644--- a/moli-renderer-v8/src/runtime/page_vm/page_main_parser_continuation.rs+++ b/moli-renderer-v8/src/runtime/page_vm/page_main_parser_continuation.rs@@ -38,12 +38,9 @@ impl PageVm {} else {PageMainParserContinuationTargetEffect::DiscardedStaleOrInactiveParser};- PageOwnerTurnOutcome::new(- PageMainParserContinuationTurnAction {- owner,- target_effect,- },- None,- )+ PageOwnerTurnOutcome::new(PageMainParserContinuationTurnAction {+ owner,+ target_effect,+ })}}diff --git a/moli-renderer-v8/src/runtime/page_vm/page_media_element_event.rs b/moli-renderer-v8/src/runtime/page_vm/page_media_element_event.rsindex 629c0ff52..b14c8b8d5 100644--- a/moli-renderer-v8/src/runtime/page_vm/page_media_element_event.rs+++ b/moli-renderer-v8/src/runtime/page_vm/page_media_element_event.rs@@ -4,7 +4,6 @@ use crate::page_task_queue::{RendererPageMediaElementEventTask, RendererPageMediaElementEventTaskId,RendererPageMediaElementEventTaskKind,};-use crate::runtime::{PageOwnerTurnOutput, RendererOwnerRuntimeActivitySource};use super::{AuthorizedCurrentWindowDocumentTask, IntoPageTaskCompletion, PageTaskCompletion, PageVm,@@ -87,12 +86,6 @@ impl PageVm {kind,target_effect,};- Ok(PageMediaElementEventTurnOutcome::new(- action,- PageOwnerTurnOutput::runtime_if(- action.requires_output_capture(),- RendererOwnerRuntimeActivitySource::MediaElementEvent,- ),- ))+ Ok(PageMediaElementEventTurnOutcome::new(action))}}diff --git a/moli-renderer-v8/src/runtime/page_vm/page_message_port_delivery.rs b/moli-renderer-v8/src/runtime/page_vm/page_message_port_delivery.rsindex a307e661b..06096efa9 100644--- a/moli-renderer-v8/src/runtime/page_vm/page_message_port_delivery.rs+++ b/moli-renderer-v8/src/runtime/page_vm/page_message_port_delivery.rs@@ -5,7 +5,6 @@ use crate::{PageMessagePortDeliveryTurnOutcome, RendererPageMessagePortDeliveryOwner,RendererPageMessagePortDeliveryTask,},- runtime::{PageOwnerTurnOutput, RendererOwnerResourceActivitySource},};use super::PageVm;@@ -76,12 +75,6 @@ impl PageVm {port_id,target_effect,};- Ok(PageMessagePortDeliveryTurnOutcome::new(- action,- PageOwnerTurnOutput::resource_if(- action.requires_output_capture(),- RendererOwnerResourceActivitySource::MessagePort,- ),- ))+ Ok(PageMessagePortDeliveryTurnOutcome::new(action))}}diff --git a/moli-renderer-v8/src/runtime/page_vm/page_misc_platform_api.rs b/moli-renderer-v8/src/runtime/page_vm/page_misc_platform_api.rsindex 756c9a094..d4dd0345b 100644--- a/moli-renderer-v8/src/runtime/page_vm/page_misc_platform_api.rs+++ b/moli-renderer-v8/src/runtime/page_vm/page_misc_platform_api.rs@@ -1,11 +1,7 @@-use crate::{- page_task_queue::{- PageMiscPlatformApiTargetEffect, PageMiscPlatformApiTurnAction,- PageMiscPlatformApiTurnOutcome, RendererPageMiscPlatformApiOwner,- RendererPageMiscPlatformApiTask, RendererPageMiscPlatformApiTaskId,- RendererPageMiscPlatformApiTaskKind,- },- runtime::{PageOwnerTurnOutput, RendererOwnerRuntimeActivitySource},+use crate::page_task_queue::{+ PageMiscPlatformApiTargetEffect, PageMiscPlatformApiTurnAction, PageMiscPlatformApiTurnOutcome,+ RendererPageMiscPlatformApiOwner, RendererPageMiscPlatformApiTask,+ RendererPageMiscPlatformApiTaskId, RendererPageMiscPlatformApiTaskKind,};use super::{@@ -79,12 +75,6 @@ impl PageVm {kind,target_effect,};- Ok(PageMiscPlatformApiTurnOutcome::new(- action,- PageOwnerTurnOutput::runtime_if(- action.requires_output_capture(),- RendererOwnerRuntimeActivitySource::MiscPlatformApi,- ),- ))+ Ok(PageMiscPlatformApiTurnOutcome::new(action))}}diff --git a/moli-renderer-v8/src/runtime/page_vm/page_module_reaction.rs b/moli-renderer-v8/src/runtime/page_vm/page_module_reaction.rsindex 406213c95..ec9b90981 100644--- a/moli-renderer-v8/src/runtime/page_vm/page_module_reaction.rs+++ b/moli-renderer-v8/src/runtime/page_vm/page_module_reaction.rs@@ -1,10 +1,7 @@-use crate::{- page_task_queue::{- PageModuleReactionApplication, PageModuleReactionFollowup, PageModuleReactionTargetEffect,- PageModuleReactionTurnAction, PageModuleReactionTurnOutcome,- RendererPageModuleReactionOwner, RendererPageModuleReactionTask,- },- runtime::{PageOwnerTurnOutput, RendererOwnerRuntimeActivitySource},+use crate::page_task_queue::{+ PageModuleReactionApplication, PageModuleReactionFollowup, PageModuleReactionTargetEffect,+ PageModuleReactionTurnAction, PageModuleReactionTurnOutcome, RendererPageModuleReactionOwner,+ RendererPageModuleReactionTask,};use super::{IntoPageTaskCompletion, PageTaskCompletion, PageVm};@@ -107,12 +104,6 @@ impl PageVm {PageModuleReactionTargetEffect::IgnoredStaleOwner};let action = PageModuleReactionTurnAction::new(owner, target_effect);- Ok(PageModuleReactionTurnOutcome::new(- action,- PageOwnerTurnOutput::runtime_if(- action.requires_output_capture(),- RendererOwnerRuntimeActivitySource::ModuleReaction,- ),- ))+ Ok(PageModuleReactionTurnOutcome::new(action))}}diff --git a/moli-renderer-v8/src/runtime/page_vm/page_modulepreload_start.rs b/moli-renderer-v8/src/runtime/page_vm/page_modulepreload_start.rsindex 24e898401..e91010ada 100644--- a/moli-renderer-v8/src/runtime/page_vm/page_modulepreload_start.rs+++ b/moli-renderer-v8/src/runtime/page_vm/page_modulepreload_start.rs@@ -58,8 +58,7 @@ impl PageVm {owner,document_effect,};- debug_assert!(!action.requires_output_capture());- PageModulepreloadStartTurnOutcome::new(action, None)+ PageModulepreloadStartTurnOutcome::new(action)}#[cfg(test)]diff --git a/moli-renderer-v8/src/runtime/page_vm/page_navigation_api_task.rs b/moli-renderer-v8/src/runtime/page_vm/page_navigation_api_task.rsindex 18ee29706..9607fc896 100644--- a/moli-renderer-v8/src/runtime/page_vm/page_navigation_api_task.rs+++ b/moli-renderer-v8/src/runtime/page_vm/page_navigation_api_task.rs@@ -4,7 +4,6 @@ use crate::page_task_queue::{RendererPageNavigationApiTaskId, RendererPageNavigationApiTaskKind,RendererPageNavigationApiTaskOwner,};-use crate::runtime::{PageOwnerTurnOutput, RendererOwnerRuntimeActivitySource};use crate::script_vm::NavigationApiTaskBodyApplied;use super::{IntoPageTaskCompletion, PageTaskCompletion, PageVm};@@ -92,12 +91,6 @@ impl PageVm {kind,target_effect,};- Ok(PageNavigationApiTaskTurnOutcome::new(- action,- PageOwnerTurnOutput::runtime_if(- action.requires_output_capture(),- RendererOwnerRuntimeActivitySource::NavigationAndTraversal,- ),- ))+ Ok(PageNavigationApiTaskTurnOutcome::new(action))}}diff --git a/moli-renderer-v8/src/runtime/page_vm/page_networking.rs b/moli-renderer-v8/src/runtime/page_vm/page_networking.rsindex b7ab0a117..19698d024 100644--- a/moli-renderer-v8/src/runtime/page_vm/page_networking.rs+++ b/moli-renderer-v8/src/runtime/page_vm/page_networking.rs@@ -17,10 +17,7 @@ impl PageVm {.apply_selected_page_main_parser_continuation_turn(task).map_action(PageNetworkingTurnAction::MainParserContinuation)),RendererPageNetworkingTask::StyleElementEvent(task) => self- .apply_selected_page_connected_style_event_turn(- task,- crate::runtime::RendererOwnerRuntimeActivitySource::Networking,- )+ .apply_selected_page_connected_style_event_turn(task).map(|outcome| outcome.map_action(PageNetworkingTurnAction::StyleElementEvent)),RendererPageNetworkingTask::TextTrackLoad(task) => self.apply_selected_page_text_track_load_turn(task)diff --git a/moli-renderer-v8/src/runtime/page_vm/page_networking_task_completion.rs b/moli-renderer-v8/src/runtime/page_vm/page_networking_task_completion.rsindex 1cdee2ccc..c4aa6947f 100644--- a/moli-renderer-v8/src/runtime/page_vm/page_networking_task_completion.rs+++ b/moli-renderer-v8/src/runtime/page_vm/page_networking_task_completion.rs@@ -22,7 +22,7 @@ impl PageVm {self.finish_selected_page_resource_completion_task(action)?;}PageNetworkingTurnAction::StyleElementEvent(action) => {- let connected_style_event_settled_current_owner = action.requires_output_capture();+ let connected_style_event_settled_current_owner = action.settled_current_owner();self.finish_selected_page_task_completion(action.into_page_task_completion(),loader,diff --git a/moli-renderer-v8/src/runtime/page_vm/page_opfs_task.rs b/moli-renderer-v8/src/runtime/page_vm/page_opfs_task.rsindex df8dd1c9d..455eb962d 100644--- a/moli-renderer-v8/src/runtime/page_vm/page_opfs_task.rs+++ b/moli-renderer-v8/src/runtime/page_vm/page_opfs_task.rs@@ -2,7 +2,6 @@ use crate::page_task_queue::{PageOpfsTaskTargetEffect, PageOpfsTaskTurnAction, PageOpfsTaskTurnOutcome,RendererPageOpfsTask, RendererPageOpfsTaskOwner,};-use crate::runtime::{PageOwnerTurnOutput, RendererOwnerResourceActivitySource};use super::{IntoPageTaskCompletion, PageTaskCompletion, PageVm};@@ -85,12 +84,6 @@ impl PageVm {owner,target_effect,};- Ok(PageOpfsTaskTurnOutcome::new(- action,- PageOwnerTurnOutput::resource_if(- action.requires_output_capture(),- RendererOwnerResourceActivitySource::StorageIo,- ),- ))+ Ok(PageOpfsTaskTurnOutcome::new(action))}}diff --git a/moli-renderer-v8/src/runtime/page_vm/page_popup_load_event.rs b/moli-renderer-v8/src/runtime/page_vm/page_popup_load_event.rsindex 65ac63b7d..7144a3c31 100644--- a/moli-renderer-v8/src/runtime/page_vm/page_popup_load_event.rs+++ b/moli-renderer-v8/src/runtime/page_vm/page_popup_load_event.rs@@ -2,7 +2,6 @@ use crate::page_task_queue::{PagePopupLoadEventTargetEffect, PagePopupLoadEventTurnAction, PagePopupLoadEventTurnOutcome,RendererPagePopupLoadEventOwner, RendererPagePopupLoadEventTask,};-use crate::runtime::{PageOwnerTurnOutput, RendererOwnerRuntimeActivitySource};use super::{IntoPageTaskCompletion, PageTaskCompletion, PageVm};@@ -71,12 +70,6 @@ impl PageVm {owner,target_effect,};- Ok(PagePopupLoadEventTurnOutcome::new(- action,- PageOwnerTurnOutput::runtime_if(- action.requires_output_capture(),- RendererOwnerRuntimeActivitySource::DomManipulation,- ),- ))+ Ok(PagePopupLoadEventTurnOutcome::new(action))}}diff --git a/moli-renderer-v8/src/runtime/page_vm/page_rendering_update.rs b/moli-renderer-v8/src/runtime/page_vm/page_rendering_update.rsindex 05fd4151d..813384323 100644--- a/moli-renderer-v8/src/runtime/page_vm/page_rendering_update.rs+++ b/moli-renderer-v8/src/runtime/page_vm/page_rendering_update.rs@@ -3,7 +3,6 @@ use crate::page_task_queue::{RendererPageRenderingUpdateOwner, RendererPageRenderingUpdateTask,RendererPageRenderingUpdateTaskId, RendererPageRenderingUpdateTaskKind,};-use crate::runtime::{PageOwnerTurnOutput, RendererOwnerRuntimeActivitySource};use super::{AuthorizedCurrentWindowDocumentTask, IntoPageTaskCompletion, PageTaskCompletion, PageVm,@@ -86,12 +85,6 @@ impl PageVm {kind,target_effect,};- Ok(PageRenderingUpdateTurnOutcome::new(- action,- PageOwnerTurnOutput::runtime_if(- action.requires_output_capture(),- RendererOwnerRuntimeActivitySource::RenderingUpdate,- ),- ))+ Ok(PageRenderingUpdateTurnOutcome::new(action))}}diff --git a/moli-renderer-v8/src/runtime/page_vm/page_resource_completion.rs b/moli-renderer-v8/src/runtime/page_vm/page_resource_completion.rsindex ef11b06cd..e1a5db3fb 100644--- a/moli-renderer-v8/src/runtime/page_vm/page_resource_completion.rs+++ b/moli-renderer-v8/src/runtime/page_vm/page_resource_completion.rs@@ -5,7 +5,6 @@ use crate::page_resource_completion::{PageResourceCompletionTurnOutcome, RendererPageResourceCompletion,RendererPageResourceTerminal,};-use crate::runtime::PageOwnerTurnOutput;use super::PageVm;@@ -117,10 +116,7 @@ impl PageVm {&self,action: PageResourceCompletionTurnAction,) -> PageResourceCompletionTurnOutcome {- PageResourceCompletionTurnOutcome::new(- action,- PageOwnerTurnOutput::resource_if(action.requires_output_capture(), action.source()),- )+ PageResourceCompletionTurnOutcome::new(action)}pub(in crate::runtime) fn apply_selected_page_resource_completion_turn(diff --git a/moli-renderer-v8/src/runtime/page_vm/page_service_worker_client_message.rs b/moli-renderer-v8/src/runtime/page_vm/page_service_worker_client_message.rsindex fe8b5c8e3..bc415bc7e 100644--- a/moli-renderer-v8/src/runtime/page_vm/page_service_worker_client_message.rs+++ b/moli-renderer-v8/src/runtime/page_vm/page_service_worker_client_message.rs@@ -13,7 +13,6 @@ use crate::{PageServiceWorkerClientMessageTurnOutcome, RendererPageServiceWorkerClientMessageTask,ServiceWorkerClientMessageCallbackEffect, ServiceWorkerClientMessageEventKind,},- runtime::{PageOwnerTurnOutput, RendererOwnerResourceActivitySource},script_vm::{ServiceWorkerClientMessageBodyCallbackEffect, ServiceWorkerClientMessageBodyEffect,ServiceWorkerClientMessageBodyEventKind,@@ -127,12 +126,6 @@ impl PageVm {owner,target_effect,};- Ok(PageServiceWorkerClientMessageTurnOutcome::new(- action,- PageOwnerTurnOutput::resource_if(- action.requires_output_capture(),- RendererOwnerResourceActivitySource::ServiceWorker,- ),- ))+ Ok(PageServiceWorkerClientMessageTurnOutcome::new(action))}}diff --git a/moli-renderer-v8/src/runtime/page_vm/page_service_worker_internal.rs b/moli-renderer-v8/src/runtime/page_vm/page_service_worker_internal.rsindex 0139af99a..ec3296d15 100644--- a/moli-renderer-v8/src/runtime/page_vm/page_service_worker_internal.rs+++ b/moli-renderer-v8/src/runtime/page_vm/page_service_worker_internal.rs@@ -13,7 +13,7 @@ use crate::{PageServiceWorkerInternalTurnOutcome, RendererPageServiceWorkerInternalTask,ServiceWorkerInternalCallbackEffect,},- runtime::{PageOwnerTurnOutcome, PageOwnerTurnOutput, RendererOwnerResourceActivitySource},+ runtime::PageOwnerTurnOutcome,script_vm::{ServiceWorkerInternalBodyCallbackEffect, ServiceWorkerInternalBodyEffect},};@@ -110,12 +110,6 @@ impl PageVm {task_kind,target_effect,};- Ok(PageOwnerTurnOutcome::new(- action,- PageOwnerTurnOutput::resource_if(- action.requires_output_capture(),- RendererOwnerResourceActivitySource::ServiceWorker,- ),- ))+ Ok(PageOwnerTurnOutcome::new(action))}}diff --git a/moli-renderer-v8/src/runtime/page_vm/page_shared_worker_client_event.rs b/moli-renderer-v8/src/runtime/page_vm/page_shared_worker_client_event.rsindex a9d6be158..79dfedc0e 100644--- a/moli-renderer-v8/src/runtime/page_vm/page_shared_worker_client_event.rs+++ b/moli-renderer-v8/src/runtime/page_vm/page_shared_worker_client_event.rs@@ -4,7 +4,6 @@ use crate::{PageSharedWorkerClientEventTurnOutcome, RendererPageSharedWorkerClientEventOwner,RendererPageSharedWorkerClientEventTask,},- runtime::{PageOwnerTurnOutput, RendererOwnerResourceActivitySource},script_vm::{SharedWorkerClientEventBodyEffect, SharedWorkerErrorDispatchEffect},};@@ -107,12 +106,6 @@ impl PageVm {event_kind,target_effect,};- Ok(PageSharedWorkerClientEventTurnOutcome::new(- action,- PageOwnerTurnOutput::resource_if(- action.requires_output_capture(),- RendererOwnerResourceActivitySource::SharedWorker,- ),- ))+ Ok(PageSharedWorkerClientEventTurnOutcome::new(action))}}diff --git a/moli-renderer-v8/src/runtime/page_vm/page_storage_event_delivery.rs b/moli-renderer-v8/src/runtime/page_vm/page_storage_event_delivery.rsindex 568a1b16c..f04f8bd33 100644--- a/moli-renderer-v8/src/runtime/page_vm/page_storage_event_delivery.rs+++ b/moli-renderer-v8/src/runtime/page_vm/page_storage_event_delivery.rs@@ -3,7 +3,6 @@ use crate::page_task_queue::{PageStorageEventDeliveryTurnOutcome, RendererPageStorageEventDeliveryOwner,RendererPageStorageEventDeliveryTask,};-use crate::runtime::{PageOwnerTurnOutput, RendererOwnerResourceActivitySource};use super::{IntoPageTaskCompletion, PageTaskCompletion, PageVm};@@ -74,12 +73,6 @@ impl PageVm {owner,target_effect,};- Ok(PageStorageEventDeliveryTurnOutcome::new(- action,- PageOwnerTurnOutput::resource_if(- action.requires_output_capture(),- RendererOwnerResourceActivitySource::StorageEvent,- ),- ))+ Ok(PageStorageEventDeliveryTurnOutcome::new(action))}}diff --git a/moli-renderer-v8/src/runtime/page_vm/page_stylesheet_task.rs b/moli-renderer-v8/src/runtime/page_vm/page_stylesheet_task.rsindex 5e1402aa9..6ba756e78 100644--- a/moli-renderer-v8/src/runtime/page_vm/page_stylesheet_task.rs+++ b/moli-renderer-v8/src/runtime/page_vm/page_stylesheet_task.rs@@ -1,14 +1,8 @@-use crate::{- page_task_queue::{- PageConnectedStyleEventTargetEffect, PageConnectedStyleEventTurnAction,- PageConnectedStyleEventTurnOutcome, PageStylesheetNetworkingTargetEffect,- PageStylesheetNetworkingTurnAction, PageStylesheetNetworkingTurnOutcome,- RendererPageConnectedStyleEventTask, RendererPageStylesheetNetworkingTask,- },- runtime::{- PageOwnerTurnOutput, RendererOwnerResourceActivitySource,- RendererOwnerRuntimeActivitySource,- },+use crate::page_task_queue::{+ PageConnectedStyleEventTargetEffect, PageConnectedStyleEventTurnAction,+ PageConnectedStyleEventTurnOutcome, PageStylesheetNetworkingTargetEffect,+ PageStylesheetNetworkingTurnAction, PageStylesheetNetworkingTurnOutcome,+ RendererPageConnectedStyleEventTask, RendererPageStylesheetNetworkingTask,};use super::{IntoPageTaskCompletion, PageTaskCompletion, PageVm};@@ -65,14 +59,12 @@ impl PageVm {owner,target_effect,},- PageOwnerTurnOutput::resource_if(true, RendererOwnerResourceActivitySource::Stylesheet),))}pub(in crate::runtime) fn apply_selected_page_connected_style_event_turn(&mut self,task: RendererPageConnectedStyleEventTask,- activity_source: RendererOwnerRuntimeActivitySource,) -> anyhow::Result<PageConnectedStyleEventTurnOutcome> {let owner = task.owner();let root_document = self.document_lifecycle.identity().document;@@ -83,9 +75,6 @@ impl PageVm {owner,target_effect,};- Ok(PageConnectedStyleEventTurnOutcome::new(- action,- PageOwnerTurnOutput::runtime_if(action.requires_output_capture(), activity_source),- ))+ Ok(PageConnectedStyleEventTurnOutcome::new(action))}}diff --git a/moli-renderer-v8/src/runtime/page_vm/page_text_track_default_mode.rs b/moli-renderer-v8/src/runtime/page_vm/page_text_track_default_mode.rsindex 5695c6254..2706c20f9 100644--- a/moli-renderer-v8/src/runtime/page_vm/page_text_track_default_mode.rs+++ b/moli-renderer-v8/src/runtime/page_vm/page_text_track_default_mode.rs@@ -4,7 +4,6 @@ use crate::page_task_queue::{RendererPageTextTrackDefaultModeTask, RendererPageTextTrackDefaultModeTaskId,RendererPageTextTrackDefaultModeTaskKind,};-use crate::runtime::{PageOwnerTurnOutput, RendererOwnerRuntimeActivitySource};use super::{AuthorizedCurrentWindowDocumentTask, PageVm};@@ -67,12 +66,6 @@ impl PageVm {kind,target_effect,};- Ok(PageTextTrackDefaultModeTurnOutcome::new(- action,- PageOwnerTurnOutput::runtime_if(- action.requires_output_capture(),- RendererOwnerRuntimeActivitySource::DomManipulation,- ),- ))+ Ok(PageTextTrackDefaultModeTurnOutcome::new(action))}}diff --git a/moli-renderer-v8/src/runtime/page_vm/page_text_track_load.rs b/moli-renderer-v8/src/runtime/page_vm/page_text_track_load.rsindex f92166d5b..b4252d60a 100644--- a/moli-renderer-v8/src/runtime/page_vm/page_text_track_load.rs+++ b/moli-renderer-v8/src/runtime/page_vm/page_text_track_load.rs@@ -4,7 +4,6 @@ use crate::page_task_queue::{RendererPageTextTrackLoadTask, RendererPageTextTrackLoadTaskId,RendererPageTextTrackLoadTaskKind,};-use crate::runtime::PageOwnerTurnOutput;use super::{AuthorizedCurrentWindowDocumentTask, PageVm};@@ -78,12 +77,6 @@ impl PageVm {kind,target_effect,};- Ok(PageTextTrackLoadTurnOutcome::new(- action,- PageOwnerTurnOutput::runtime_if(- action.requires_output_capture(),- kind.activity_source(),- ),- ))+ Ok(PageTextTrackLoadTurnOutcome::new(action))}}diff --git a/moli-renderer-v8/src/runtime/page_vm/page_timer.rs b/moli-renderer-v8/src/runtime/page_vm/page_timer.rsindex 913222eb4..800dc0e76 100644--- a/moli-renderer-v8/src/runtime/page_vm/page_timer.rs+++ b/moli-renderer-v8/src/runtime/page_vm/page_timer.rs@@ -2,9 +2,7 @@ use std::time::Instant;use anyhow::{Result, ensure};-use crate::runtime::{- PageOwnerTurnOutcome, PageOwnerTurnOutput, RendererOwnerRuntimeActivitySource,-};+use crate::runtime::PageOwnerTurnOutcome;use super::PageVm;@@ -24,12 +22,6 @@ pub(in crate::runtime) enum PageTimerTurnAction {},}-impl PageTimerTurnAction {- pub(in crate::runtime) const fn requires_output_capture(self) -> bool {- matches!(self, Self::Consumed { .. })- }-}-impl PageVm {/// Execute one already-selected timer body without committing its/// task-end checkpoint.@@ -59,12 +51,6 @@ impl PageVm {actual_deadline,}};- Ok(PageOwnerTurnOutcome::new(- action,- PageOwnerTurnOutput::runtime_if(- action.requires_output_capture(),- RendererOwnerRuntimeActivitySource::Timer,- ),- ))+ Ok(PageOwnerTurnOutcome::new(action))}}diff --git a/moli-renderer-v8/src/runtime/page_vm/page_user_interaction.rs b/moli-renderer-v8/src/runtime/page_vm/page_user_interaction.rsindex 650abcfab..c18198492 100644--- a/moli-renderer-v8/src/runtime/page_vm/page_user_interaction.rs+++ b/moli-renderer-v8/src/runtime/page_vm/page_user_interaction.rs@@ -4,7 +4,6 @@ use crate::page_task_queue::{RendererPageUserInteractionTask, RendererPageUserInteractionTaskId,RendererPageUserInteractionTaskKind,};-use crate::runtime::{PageOwnerTurnOutput, RendererOwnerRuntimeActivitySource};use super::{AuthorizedCurrentWindowDocumentTask, IntoPageTaskCompletion, PageTaskCompletion, PageVm,@@ -89,12 +88,6 @@ impl PageVm {kind,target_effect,};- Ok(PageUserInteractionTurnOutcome::new(- action,- PageOwnerTurnOutput::runtime_if(- action.requires_output_capture(),- RendererOwnerRuntimeActivitySource::UserInteraction,- ),- ))+ Ok(PageUserInteractionTurnOutcome::new(action))}}diff --git a/moli-renderer-v8/src/runtime/page_vm/page_v8_foreground_task.rs b/moli-renderer-v8/src/runtime/page_vm/page_v8_foreground_task.rsindex c92e7d84f..0026cf7ef 100644--- a/moli-renderer-v8/src/runtime/page_vm/page_v8_foreground_task.rs+++ b/moli-renderer-v8/src/runtime/page_vm/page_v8_foreground_task.rs@@ -2,7 +2,6 @@ use crate::page_task_queue::{PageV8ForegroundTaskEffect, PageV8ForegroundTaskTurnAction, PageV8ForegroundTaskTurnOutcome,RendererPageV8ForegroundTask,};-use crate::runtime::{PageOwnerTurnOutput, RendererOwnerRuntimeActivitySource};use super::PageVm;@@ -18,12 +17,6 @@ impl PageVm {PageV8ForegroundTaskEffect::IgnoredInactiveIsolateRegistration};let action = PageV8ForegroundTaskTurnAction { owner, effect };- Ok(PageV8ForegroundTaskTurnOutcome::new(- action,- PageOwnerTurnOutput::runtime_if(- action.requires_output_capture(),- RendererOwnerRuntimeActivitySource::V8ForegroundTask,- ),- ))+ Ok(PageV8ForegroundTaskTurnOutcome::new(action))}}diff --git a/moli-renderer-v8/src/runtime/page_vm/page_view_transition_update.rs b/moli-renderer-v8/src/runtime/page_vm/page_view_transition_update.rsindex e2da3f273..7a7bd0006 100644--- a/moli-renderer-v8/src/runtime/page_vm/page_view_transition_update.rs+++ b/moli-renderer-v8/src/runtime/page_vm/page_view_transition_update.rs@@ -1,10 +1,7 @@-use crate::{- page_task_queue::{- PageViewTransitionUpdateTargetEffect, PageViewTransitionUpdateTurnAction,- PageViewTransitionUpdateTurnOutcome, RendererPageViewTransitionUpdateOwner,- RendererPageViewTransitionUpdateTask,- },- runtime::{PageOwnerTurnOutput, RendererOwnerRuntimeActivitySource},+use crate::page_task_queue::{+ PageViewTransitionUpdateTargetEffect, PageViewTransitionUpdateTurnAction,+ PageViewTransitionUpdateTurnOutcome, RendererPageViewTransitionUpdateOwner,+ RendererPageViewTransitionUpdateTask,};use super::{IntoPageTaskCompletion, PageTaskCompletion, PageVm};@@ -79,12 +76,6 @@ impl PageVm {task_id,target_effect,};- Ok(PageViewTransitionUpdateTurnOutcome::new(- action,- PageOwnerTurnOutput::runtime_if(- action.requires_output_capture(),- RendererOwnerRuntimeActivitySource::DomManipulation,- ),- ))+ Ok(PageViewTransitionUpdateTurnOutcome::new(action))}}diff --git a/moli-renderer-v8/src/runtime/page_vm/page_webcrypto_task.rs b/moli-renderer-v8/src/runtime/page_vm/page_webcrypto_task.rsindex 937c32a7e..8220cc5c6 100644--- a/moli-renderer-v8/src/runtime/page_vm/page_webcrypto_task.rs+++ b/moli-renderer-v8/src/runtime/page_vm/page_webcrypto_task.rs@@ -2,7 +2,6 @@ use crate::page_task_queue::{PageWebCryptoTaskTargetEffect, PageWebCryptoTaskTurnAction, PageWebCryptoTaskTurnOutcome,RendererPageWebCryptoTask, RendererPageWebCryptoTaskOwner,};-use crate::runtime::{PageOwnerTurnOutput, RendererOwnerResourceActivitySource};use super::PageVm;@@ -69,12 +68,6 @@ impl PageVm {owner,target_effect,};- Ok(PageWebCryptoTaskTurnOutcome::new(- action,- PageOwnerTurnOutput::resource_if(- action.requires_output_capture(),- RendererOwnerResourceActivitySource::WebCryptoTask,- ),- ))+ Ok(PageWebCryptoTaskTurnOutcome::new(action))}}diff --git a/moli-renderer-v8/src/runtime/page_vm/page_window_message.rs b/moli-renderer-v8/src/runtime/page_vm/page_window_message.rsindex 9949b8c9a..be0b09024 100644--- a/moli-renderer-v8/src/runtime/page_vm/page_window_message.rs+++ b/moli-renderer-v8/src/runtime/page_vm/page_window_message.rs@@ -2,7 +2,6 @@ use crate::page_task_queue::{PageWindowMessageTargetEffect, PageWindowMessageTurnAction, PageWindowMessageTurnOutcome,RendererPageWindowMessageOwner, RendererPageWindowMessageTask,};-use crate::runtime::{PageOwnerTurnOutput, RendererOwnerRuntimeActivitySource};use super::PageVm;@@ -91,12 +90,6 @@ impl PageVm {task_id,target_effect,};- Ok(PageWindowMessageTurnOutcome::new(- action,- PageOwnerTurnOutput::runtime_if(- action.requires_output_capture(),- RendererOwnerRuntimeActivitySource::WindowMessage,- ),- ))+ Ok(PageWindowMessageTurnOutcome::new(action))}}diff --git a/moli-renderer-v8/src/runtime/page_vm/page_worker_host_bridge.rs b/moli-renderer-v8/src/runtime/page_vm/page_worker_host_bridge.rsindex 39d297558..d6fe8d53e 100644--- a/moli-renderer-v8/src/runtime/page_vm/page_worker_host_bridge.rs+++ b/moli-renderer-v8/src/runtime/page_vm/page_worker_host_bridge.rs@@ -6,7 +6,7 @@ use crate::{PageWorkerHostBridgeTurnAction, PageWorkerHostBridgeTurnOutcome,RendererPageWorkerHostBridgeTask,},- runtime::{PageOwnerTurnOutcome, PageOwnerTurnOutput},+ runtime::PageOwnerTurnOutcome,script_vm::WorkerHostBridgeBodyEffect,};@@ -58,7 +58,6 @@ impl PageVm {task: RendererPageWorkerHostBridgeTask,) -> Result<PageWorkerHostBridgeTurnOutcome> {let owner = task.owner();- let activity_source = task.activity_source();let target_effect = if owner.root_document() != self.document_lifecycle.identity().document{PageWorkerHostBridgeTargetEffect::IgnoredStaleRoot@@ -67,10 +66,7 @@ impl PageVm {.apply_current_worker_host_bridge_event_body(task.into_event())?.into()};- let action = PageWorkerHostBridgeTurnAction::new(owner, activity_source, target_effect);- Ok(PageOwnerTurnOutcome::new(- action,- PageOwnerTurnOutput::resource_if(action.requires_output_capture(), activity_source),- ))+ let action = PageWorkerHostBridgeTurnAction::new(owner, target_effect);+ Ok(PageOwnerTurnOutcome::new(action))}}diff --git a/moli-renderer-v8/src/runtime/page_vm/selected_page_task.rs b/moli-renderer-v8/src/runtime/page_vm/selected_page_task.rsindex f7480a70d..1ffb72276 100644--- a/moli-renderer-v8/src/runtime/page_vm/selected_page_task.rs+++ b/moli-renderer-v8/src/runtime/page_vm/selected_page_task.rs@@ -1,6 +1,6 @@use anyhow::Result;-use crate::{page_task_queue::RendererPageSchedulerTask, runtime::PageOwnerTurnSettlement};+use crate::page_task_queue::RendererPageSchedulerTask;use super::{IntoPageTaskCompletion, PageVm, page_timer::PageTimerTurnAction};@@ -17,13 +17,13 @@ impl PageVm {&mut self,task: RendererPageSchedulerTask,loader: &crate::network::ResourceRequestClient,- ) -> Result<PageOwnerTurnSettlement> {+ ) -> Result<()> {match task {RendererPageSchedulerTask::DomManipulation(task) => {let outcome = self.apply_selected_page_dom_manipulation_turn(task)?;self.finish_selected_page_dom_manipulation_task(outcome.action, loader).await?;- Ok(outcome.into_settlement())+ Ok(())}RendererPageSchedulerTask::UserInteraction(task) => {let outcome = self.apply_selected_page_user_interaction_turn(task)?;@@ -32,7 +32,7 @@ impl PageVm {loader,).await?;- Ok(outcome.into_settlement())+ Ok(())}RendererPageSchedulerTask::FileReading(task) => {let outcome = self.apply_selected_page_file_reading_turn(task)?;@@ -41,7 +41,7 @@ impl PageVm {loader,).await?;- Ok(outcome.into_settlement())+ Ok(())}RendererPageSchedulerTask::MiscPlatformApi(task) => {let outcome = self.apply_selected_page_misc_platform_api_turn(task)?;@@ -50,7 +50,7 @@ impl PageVm {loader,).await?;- Ok(outcome.into_settlement())+ Ok(())}RendererPageSchedulerTask::NavigationAndTraversal(task) => {let outcome = self.apply_selected_page_navigation_and_traversal_turn(task)?;@@ -83,7 +83,7 @@ impl PageVm {.await?;}}- Ok(outcome.into_settlement())+ Ok(())}RendererPageSchedulerTask::RenderingUpdate(task) => {let outcome = self.apply_selected_page_rendering_update_turn(task)?;@@ -92,7 +92,7 @@ impl PageVm {loader,).await?;- Ok(outcome.into_settlement())+ Ok(())}RendererPageSchedulerTask::MediaElementEvent(task) => {let outcome = self.apply_selected_page_media_element_event_turn(task)?;@@ -101,7 +101,7 @@ impl PageVm {loader,).await?;- Ok(outcome.into_settlement())+ Ok(())}RendererPageSchedulerTask::DedicatedWorkerClientEvent(task) => {let outcome = self.apply_selected_page_dedicated_worker_client_event_turn(task)?;@@ -110,7 +110,7 @@ impl PageVm {loader,).await?;- Ok(outcome.into_settlement())+ Ok(())}RendererPageSchedulerTask::SharedWorkerClientEvent(task) => {let outcome = self.apply_selected_page_shared_worker_client_event_turn(task)?;@@ -119,7 +119,7 @@ impl PageVm {loader,).await?;- Ok(outcome.into_settlement())+ Ok(())}RendererPageSchedulerTask::ServiceWorkerInternal(task) => {let outcome = self.apply_selected_page_service_worker_internal_turn(task)?;@@ -128,7 +128,7 @@ impl PageVm {loader,).await?;- Ok(outcome.into_settlement())+ Ok(())}RendererPageSchedulerTask::ServiceWorkerClientMessage(task) => {let outcome = self.apply_selected_page_service_worker_client_message_turn(task)?;@@ -137,14 +137,14 @@ impl PageVm {loader,).await?;- Ok(outcome.into_settlement())+ Ok(())}RendererPageSchedulerTask::WebCryptoTask(task) => {let outcome = self.apply_selected_page_webcrypto_task_turn(task)?;if outcome.action.settled_current_owner() {self.finish_selected_page_task_checkpoint()?;}- Ok(outcome.into_settlement())+ Ok(())}RendererPageSchedulerTask::IndexedDbTask(task) => {let outcome = self.apply_selected_page_indexed_db_task_turn(task)?;@@ -153,7 +153,7 @@ impl PageVm {loader,).await?;- Ok(outcome.into_settlement())+ Ok(())}RendererPageSchedulerTask::OpfsTask(task) => {let outcome = self.apply_selected_page_opfs_task_turn(task)?;@@ -162,7 +162,7 @@ impl PageVm {loader,).await?;- Ok(outcome.into_settlement())+ Ok(())}RendererPageSchedulerTask::InternalLoading(task) => {let outcome = self.apply_selected_page_internal_loading_turn(task);@@ -171,13 +171,13 @@ impl PageVm {loader,).await?;- Ok(outcome.into_settlement())+ Ok(())}RendererPageSchedulerTask::MainDocumentRuntime(task) => {let outcome = self.apply_selected_page_main_document_runtime_turn(task, loader).await?;- let (action, settlement) = outcome.into_parts();+ let action = outcome.action;let completion = match action {crate::page_task_queue::PageMainDocumentRuntimeTurnAction::RuntimeScriptAdmission(action,@@ -229,7 +229,7 @@ impl PageVm {self.finish_selected_page_task_completion(completion, loader).await?;}- Ok(settlement)+ Ok(())}RendererPageSchedulerTask::ChildModuleDependencyFetchStart(task) => {let outcome =@@ -239,7 +239,7 @@ impl PageVm {loader,).await?;- Ok(outcome.into_settlement())+ Ok(())}RendererPageSchedulerTask::ChildModuleScriptTerminal(task) => {let outcome = self.apply_selected_page_child_module_script_terminal_turn(task);@@ -248,7 +248,7 @@ impl PageVm {loader,).await?;- Ok(outcome.into_settlement())+ Ok(())}RendererPageSchedulerTask::ChildModulepreloadEventAction(task) => {let outcome = self.apply_selected_page_child_modulepreload_event_action_turn(task);@@ -257,7 +257,7 @@ impl PageVm {loader,).await?;- Ok(outcome.into_settlement())+ Ok(())}RendererPageSchedulerTask::ChildFrameTask(task) => {self.apply_selected_page_child_frame_task_turn(task, loader)@@ -268,7 +268,7 @@ impl PageVm {if outcome.action.entered_isolate() {self.finish_selected_page_task_checkpoint()?;}- Ok(outcome.into_settlement())+ Ok(())}RendererPageSchedulerTask::ModuleReaction(task) => {let outcome = self.apply_selected_page_module_reaction_turn(task)?;@@ -277,7 +277,7 @@ impl PageVm {loader,).await?;- Ok(outcome.into_settlement())+ Ok(())}RendererPageSchedulerTask::WindowMessage(task) => {let outcome = self.apply_selected_page_window_message_turn(task)?;@@ -296,7 +296,7 @@ impl PageVm {..} => {}}- Ok(outcome.into_settlement())+ Ok(())}RendererPageSchedulerTask::MessagePortDelivery {task,@@ -322,7 +322,7 @@ impl PageVm {..} => {}}- Ok(outcome.into_settlement())+ Ok(())}RendererPageSchedulerTask::DynamicImportOwnerAction(task) => {let outcome = self.apply_selected_page_dynamic_import_owner_action_turn(task);@@ -331,7 +331,7 @@ impl PageVm {loader,).await?;- Ok(outcome.into_settlement())+ Ok(())}RendererPageSchedulerTask::ModulepreloadStart(task) => {let outcome = self.apply_selected_page_modulepreload_start_turn(task);@@ -340,13 +340,13 @@ impl PageVm {loader,).await?;- Ok(outcome.into_settlement())+ Ok(())}RendererPageSchedulerTask::Networking(task) => {let outcome = self.apply_selected_page_networking_turn(task)?;self.finish_selected_page_networking_task(outcome.action, loader).await?;- Ok(outcome.into_settlement())+ Ok(())}RendererPageSchedulerTask::WebSocket(task) => {let outcome = self.apply_selected_page_websocket_turn(task)?;@@ -355,14 +355,14 @@ impl PageVm {loader,).await?;- Ok(outcome.into_settlement())+ Ok(())}RendererPageSchedulerTask::Timer { deadline } => {let outcome = self.apply_selected_page_timer_turn(deadline)?;if matches!(outcome.action, PageTimerTurnAction::Consumed { .. }) {self.finish_selected_page_callback_task(loader).await?;}- Ok(outcome.into_settlement())+ Ok(())}}}@@ -372,7 +372,7 @@ impl PageVm {&mut self,task: RendererPageSchedulerTask,loader: crate::network::ResourceRequestClient,- ) -> Result<PageOwnerTurnSettlement> {+ ) -> Result<()> {let local_executor = self.local_executor.clone();let mut page_vm_ref = super::AwaitedOwnerLocalPageVm::new(self);super::run_named_owner_local_task(diff --git a/moli-renderer-v8/src/runtime/page_vm/tests/child_document_script_ready.rs b/moli-renderer-v8/src/runtime/page_vm/tests/child_document_script_ready.rsindex 1c1afd73d..ff6b7708c 100644--- a/moli-renderer-v8/src/runtime/page_vm/tests/child_document_script_ready.rs+++ b/moli-renderer-v8/src/runtime/page_vm/tests/child_document_script_ready.rs@@ -180,7 +180,6 @@ async fn child_classic_script_ready_body_leaves_reactions_for_selected_completio.run_page_child_document_script_ready_body_for_test().await?.expect("the realm-bound classic script must retain one exact task body");- assert!(body.action.requires_output_capture());assert!(matches!(body.action.target_effect,crate::page_task_queue::PageChildDocumentScriptReadyTargetEffect::AppliedScriptOrEventToCurrentOwner {diff --git a/moli-renderer-v8/src/runtime/page_vm/tests/child_module_dependency_fetch_start.rs b/moli-renderer-v8/src/runtime/page_vm/tests/child_module_dependency_fetch_start.rsindex e008131c7..d5cbc8907 100644--- a/moli-renderer-v8/src/runtime/page_vm/tests/child_module_dependency_fetch_start.rs+++ b/moli-renderer-v8/src/runtime/page_vm/tests/child_module_dependency_fetch_start.rs@@ -343,7 +343,6 @@ async fn real_dependency_start_captures_realm_and_is_discarded_after_realm_repla},"the old realm's task must never be rebound to the replacement realm");- assert!(!outcome.action.requires_output_capture());assert!(page_vm.vm_mut().take_network_output().is_empty(),"discarding a start task must not synthesize a Network terminal"diff --git a/moli-renderer-v8/src/runtime/page_vm/tests/child_module_script_terminal.rs b/moli-renderer-v8/src/runtime/page_vm/tests/child_module_script_terminal.rsindex 3c2fa8ff6..11e4ae925 100644--- a/moli-renderer-v8/src/runtime/page_vm/tests/child_module_script_terminal.rs+++ b/moli-renderer-v8/src/runtime/page_vm/tests/child_module_script_terminal.rs@@ -108,10 +108,6 @@ async fn real_terminal_captures_realm_and_is_discarded_after_realm_replacement()current_owner: None,});- assert!(- !outcome.action.requires_output_capture(),- "discarding an old realm terminal must not publish current child output"- );Ok::<_, anyhow::Error>(())}).awaitdiff --git a/moli-renderer-v8/src/runtime/page_vm/tests/child_modulepreload_event_action.rs b/moli-renderer-v8/src/runtime/page_vm/tests/child_modulepreload_event_action.rsindex 3c995bdfd..96a84ebdb 100644--- a/moli-renderer-v8/src/runtime/page_vm/tests/child_modulepreload_event_action.rs+++ b/moli-renderer-v8/src/runtime/page_vm/tests/child_modulepreload_event_action.rs@@ -298,10 +298,6 @@ async fn replaced_realm_discards_real_modulepreload_event_and_settles_its_exact_outcome.action.into_page_task_completion(),PageTaskCompletion::NoCompletion));- assert!(- !outcome.action.requires_output_capture(),- "discarding a stale event must not publish a child runtime output"- );assert_eq!(page_vm.vm_mut()diff --git a/moli-renderer-v8/src/runtime/page_vm/tests/main_runtime_script_completion.rs b/moli-renderer-v8/src/runtime/page_vm/tests/main_runtime_script_completion.rsindex 8cb52449e..706321472 100644--- a/moli-renderer-v8/src/runtime/page_vm/tests/main_runtime_script_completion.rs+++ b/moli-renderer-v8/src/runtime/page_vm/tests/main_runtime_script_completion.rs@@ -348,17 +348,19 @@ queueMicrotask(() => { __runtimeContinuationBodyCheckpoint = "wrong"; });#[tokio::test(flavor = "current_thread")]async fn spent_runtime_script_continuation_body_is_current_but_checkpoint_free() {run_page_vm_async_test(async move {- let loader = crate::network::ResourceRequestClient::new(&FetchConfig::default()).expect("loader");- let mut page_vm =- runtime_script_test_page_vm(&loader, "runtime-continuation-spent-body");+ let loader =+ crate::network::ResourceRequestClient::new(&FetchConfig::default()).expect("loader");+ let mut page_vm = runtime_script_test_page_vm(&loader, "runtime-continuation-spent-body");page_vm.vm_mut().enqueue_runtime_script_work_continuation();- page_vm.vm_mut().eval_without_microtask_checkpoint_for_test(- r#"+ page_vm+ .vm_mut()+ .eval_without_microtask_checkpoint_for_test(+ r#"globalThis.__spentRuntimeContinuationBody = "pending";queueMicrotask(() => { __spentRuntimeContinuationBody = "wrong"; });"queued""#,- )?;+ )?;let outcome = page_vm.run_page_main_document_runtime_body_for_test(&loader)@@ -377,16 +379,9 @@ queueMicrotask(() => { __spentRuntimeContinuationBody = "wrong"; });Some(crate::script_vm::RuntimeScriptContinuationBodyEffect::ReservationSpent),);assert_eq!(- outcome.into_settlement().produced_output,- Some(crate::runtime::PageOwnerTurnOutput::Runtime(- crate::runtime::RendererOwnerRuntimeActivitySource::SelectedTaskOutput,- )),- "a current spent turn must retain output capture because its selected completion can run reactions"- );- assert_eq!(- page_vm.vm_mut().eval_without_microtask_checkpoint_for_test(- "__spentRuntimeContinuationBody",- )?,+ page_vm+ .vm_mut()+ .eval_without_microtask_checkpoint_for_test("__spentRuntimeContinuationBody",)?,"pending","body-only execution must leave the spent turn's checkpoint to the selected dispatcher");diff --git a/moli-renderer-v8/src/runtime/page_vm/tests/module_reaction.rs b/moli-renderer-v8/src/runtime/page_vm/tests/module_reaction.rsindex 3c2e515b3..8abb9c0a1 100644--- a/moli-renderer-v8/src/runtime/page_vm/tests/module_reaction.rs+++ b/moli-renderer-v8/src/runtime/page_vm/tests/module_reaction.rs@@ -44,8 +44,6 @@ Promise.resolve().then(() => {action.target_effect(),PageModuleReactionTargetEffect::DiscardedMissingReaction);- assert_eq!(outcome.into_settlement().produced_output, None);-let completion = action.into_page_task_completion();assert!(matches!(&completion, PageTaskCompletion::NoCompletion));// This test intentionally stops at the body/result boundary. Adiff --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 01788e830..e5ddd56f7 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@@ -5,10 +5,7 @@ use crate::{PageServiceWorkerClientMessageTargetEffect, PageServiceWorkerInternalTargetEffect,RendererOwnerWakeSource, RendererServiceWorkerInternalTaskKind,},- runtime::{- IntoPageTaskCompletion, PageOwnerTurnOutput, PageTaskCompletion,- RendererOwnerResourceActivitySource,- },+ runtime::{IntoPageTaskCompletion, PageTaskCompletion},service_worker_runtime::{ServiceWorkerClientId, ServiceWorkerVersionId},structured_clone::V8StructuredClonePayload,types::{@@ -75,12 +72,6 @@ async fn service_worker_internal_body_authorizes_the_exact_root_document() {current_completion,PageTaskCompletion::NoCompletion));- assert_eq!(- current.into_settlement().produced_output,- Some(PageOwnerTurnOutput::Resource(- RendererOwnerResourceActivitySource::ServiceWorker,- ))- );assert_eq!(page_vm.vm()@@ -126,7 +117,6 @@ async fn service_worker_internal_body_authorizes_the_exact_root_document() {);let stale_completion = stale.action.into_page_task_completion();assert!(matches!(stale_completion, PageTaskCompletion::NoCompletion));- assert_eq!(stale.into_settlement().produced_output, None);assert_eq!(page_vm.vm()@@ -182,8 +172,6 @@ async fn service_worker_client_message_authorizes_root_before_window_client_targstale_client.action.target_effect,PageServiceWorkerClientMessageTargetEffect::DiscardedStaleTarget);- assert_eq!(stale_client.into_settlement().produced_output, None);-let stale_root = crate::runtime::RendererDocumentToken {page_id: current_root.page_id,generation: current_root.generation + 1,@@ -210,7 +198,6 @@ async fn service_worker_client_message_authorizes_root_before_window_client_targstale_document.action.target_effect,PageServiceWorkerClientMessageTargetEffect::DiscardedStaleRoot { current_root });- assert_eq!(stale_document.into_settlement().produced_output, None);Ok::<_, anyhow::Error>(())}).awaitdiff --git a/moli-renderer-v8/src/runtime/page_vm/tests/service_worker_client_message.rs b/moli-renderer-v8/src/runtime/page_vm/tests/service_worker_client_message.rsindex 5c6ad0c1c..72225aae2 100644--- a/moli-renderer-v8/src/runtime/page_vm/tests/service_worker_client_message.rs+++ b/moli-renderer-v8/src/runtime/page_vm/tests/service_worker_client_message.rs@@ -74,12 +74,6 @@ navigator.serviceWorker.onmessage = event => {callback_effect: ServiceWorkerClientMessageCallbackEffect::CallbackDispatched,});- assert_eq!(- outcome.into_settlement().produced_output,- Some(crate::runtime::PageOwnerTurnOutput::Resource(- crate::runtime::RendererOwnerResourceActivitySource::ServiceWorker,- ))- );let completion = outcome.action.into_page_task_completion();assert!(matches!(completion, PageTaskCompletion::CallbackCompletion));assert_eq!(@@ -160,12 +154,6 @@ navigator.serviceWorker.onmessageerror = event => {callback_effect: ServiceWorkerClientMessageCallbackEffect::CallbackDispatched,});- assert_eq!(- outcome.into_settlement().produced_output,- Some(crate::runtime::PageOwnerTurnOutput::Resource(- crate::runtime::RendererOwnerResourceActivitySource::ServiceWorker,- ))- );let completion = outcome.action.into_page_task_completion();assert!(matches!(completion, PageTaskCompletion::CallbackCompletion));assert_eq!(@@ -230,7 +218,6 @@ Object.defineProperty(navigator, "serviceWorker", {outcome.action.target_effect,PageServiceWorkerClientMessageTargetEffect::CurrentTargetProducedNoDispatchableEvent);- assert_eq!(outcome.into_settlement().produced_output, None);let completion = outcome.action.into_page_task_completion();assert!(matches!(completion, PageTaskCompletion::CheckpointOnly));page_vm@@ -286,7 +273,6 @@ async fn service_worker_client_message_without_listener_is_checkpoint_only() {ServiceWorkerClientMessageCallbackEffect::CurrentTargetHadNoCallback,});- assert_eq!(outcome.into_settlement().produced_output, None);let completion = outcome.action.into_page_task_completion();assert!(matches!(completion, PageTaskCompletion::CheckpointOnly));page_vmdiff --git a/moli-renderer-v8/src/runtime/page_vm/tests/service_worker_internal.rs b/moli-renderer-v8/src/runtime/page_vm/tests/service_worker_internal.rsindex 3fb9685d4..f48cc58d2 100644--- a/moli-renderer-v8/src/runtime/page_vm/tests/service_worker_internal.rs+++ b/moli-renderer-v8/src/runtime/page_vm/tests/service_worker_internal.rs@@ -5,10 +5,7 @@ use crate::{PageServiceWorkerInternalTargetEffect, RendererServiceWorkerInternalTaskKind,ServiceWorkerInternalCallbackEffect,},- runtime::{- IntoPageTaskCompletion, PageOwnerTurnOutput, PageTaskCompletion,- RendererOwnerResourceActivitySource,- },+ runtime::{IntoPageTaskCompletion, PageTaskCompletion},service_worker_runtime::{ServiceWorkerRegistrationSnapshot, ServiceWorkerVersionId},types::{ServiceWorkerClientFocusRequestCompletion, ServiceWorkerLifecycleClientEvent,@@ -225,12 +222,6 @@ __serviceWorkerInternalRegistration.addEventListener("updatefound", () => {callback_effect: ServiceWorkerInternalCallbackEffect::CallbackBodyDispatched,});- assert_eq!(- outcome.into_settlement().produced_output,- Some(PageOwnerTurnOutput::Resource(- RendererOwnerResourceActivitySource::ServiceWorker,- ))- );assert_eq!(page_vm.vm_mut()diff --git a/moli-renderer-v8/src/runtime/page_vm/tests/stylesheet_task.rs b/moli-renderer-v8/src/runtime/page_vm/tests/stylesheet_task.rsindex 7f1a8c1cc..81e34aae1 100644--- a/moli-renderer-v8/src/runtime/page_vm/tests/stylesheet_task.rs+++ b/moli-renderer-v8/src/runtime/page_vm/tests/stylesheet_task.rs@@ -358,10 +358,7 @@ document.head.appendChild(style);let task = take_next_style_element_event_task_for_test(&mut page_vm).expect("one exact connected-style event task should be ready");- let body = page_vm.apply_selected_page_connected_style_event_turn(- task,- crate::runtime::RendererOwnerRuntimeActivitySource::Networking,- )?;+ let body = page_vm.apply_selected_page_connected_style_event_turn(task)?;assert_eq!(body.action.target_effect,PageConnectedStyleEventTargetEffect::DispatchedToCurrentOwner {@@ -523,10 +520,7 @@ async fn failed_inline_import_transitions_from_null_to_an_empty_child_stylesheetlet task = take_next_style_element_event_task_for_test(&mut page_vm).expect("the failed inline graph must publish one style event");- let body = page_vm.apply_selected_page_connected_style_event_turn(- task,- crate::runtime::RendererOwnerRuntimeActivitySource::Networking,- )?;+ let body = page_vm.apply_selected_page_connected_style_event_turn(task)?;page_vm.finish_selected_page_networking_task(PageNetworkingTurnAction::StyleElementEvent(body.action),@@ -1064,10 +1058,7 @@ document.head.appendChild(style);let task = take_next_style_element_event_task_for_test(&mut page_vm).expect("one exact connected-style event task should be ready");- let body = page_vm.apply_selected_page_connected_style_event_turn(- task,- crate::runtime::RendererOwnerRuntimeActivitySource::Networking,- )?;+ let body = page_vm.apply_selected_page_connected_style_event_turn(task)?;assert_eq!(body.action.target_effect,PageConnectedStyleEventTargetEffect::DispatchedToCurrentOwner {diff --git a/moli-renderer-v8/src/runtime/page_vm/tests/worker_host_bridge.rs b/moli-renderer-v8/src/runtime/page_vm/tests/worker_host_bridge.rsindex 7c5e0bcb0..fd525803e 100644--- a/moli-renderer-v8/src/runtime/page_vm/tests/worker_host_bridge.rs+++ b/moli-renderer-v8/src/runtime/page_vm/tests/worker_host_bridge.rs@@ -5,10 +5,7 @@ use crate::{PageWorkerHostBridgeCurrentEffect, PageWorkerHostBridgeTargetEffect,RendererOwnerWakeSource,},- runtime::{- IntoPageTaskCompletion, PageOwnerTurnOutput, PageTaskCompletion,- RendererOwnerResourceActivitySource,- },+ runtime::{IntoPageTaskCompletion, PageTaskCompletion},worker::{WorkerRuntimeEvent, WorkerToParentMessage},};@@ -235,12 +232,6 @@ Promise.resolve().then(() => {),"PageDiagnosticsSnapshot must observe without consuming the queued Worker task");- assert_eq!(- current.into_settlement().produced_output,- Some(PageOwnerTurnOutput::Resource(- RendererOwnerResourceActivitySource::Worker,- ))- );let current_completion = current_action.into_page_task_completion();assert!(matches!(current_completion,@@ -294,7 +285,6 @@ Promise.resolve().then(() => {stale_target_action.target_effect(),PageWorkerHostBridgeTargetEffect::IgnoredStaleTarget);- assert_eq!(stale_target.into_settlement().produced_output, None);let stale_target_completion = stale_target_action.into_page_task_completion();assert!(matches!(stale_target_completion,diff --git a/moli-renderer-v8/src/shared_worker_runtime/events.rs b/moli-renderer-v8/src/shared_worker_runtime/events.rsindex da5724536..dffbb5090 100644--- a/moli-renderer-v8/src/shared_worker_runtime/events.rs+++ b/moli-renderer-v8/src/shared_worker_runtime/events.rs@@ -3,7 +3,7 @@ use std::sync::Arc;use tracing::trace;use crate::{- page_task_queue::worker_host_bridge_activity,+ page_task_queue::is_worker_host_bridge_message,worker::{WorkerErrorPhase, WorkerParentErrorEventKind, WorkerRuntimeEvent, WorkerToParentMessage,},@@ -143,7 +143,7 @@ impl RendererSharedWorkerHost {}self.send_host_bridge_message(message, script_url);}- message if worker_host_bridge_activity(&message).is_some() => {+ message if is_worker_host_bridge_message(&message) => {self.send_host_bridge_message(message, script_url);}WorkerToParentMessage::SubresourceNetwork(_)