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): bind prepared scripts to exact document owners
ldm09e04a203d71f
diff --git a/moli-parser/src/lib.rs b/moli-parser/src/lib.rsindex 16668096e..855cc69c5 100644--- a/moli-parser/src/lib.rs+++ b/moli-parser/src/lib.rs@@ -35,9 +35,8 @@ pub use live_target::{};pub use script_planning::{ParserPlanningReadView, ParserScriptRead, PrepareScriptOutcome, PreparedImportMap,- PreparedImportMapSource, PreparedScript, PreparedScriptRuntimeGeneration, ScriptFetchMetadata,- ScriptFilterSkipReason, ScriptSource, build_prepared_import_map, build_prepared_script,- classify_parser_script,+ PreparedImportMapSource, PreparedScript, ScriptFetchMetadata, ScriptFilterSkipReason,+ ScriptSource, build_prepared_import_map, build_prepared_script, classify_parser_script,};pub use xml::XmlParser;pub use xml_stream::XmlDocumentStream;diff --git a/moli-parser/src/script_planning.rs b/moli-parser/src/script_planning.rsindex 200569213..886c53279 100644--- a/moli-parser/src/script_planning.rs+++ b/moli-parser/src/script_planning.rs@@ -245,7 +245,6 @@ pub struct PreparedScript {pub base_url: Url,pub initiator_url: Url,pub host_script_handle: Option<String>,- pub runtime_generation: PreparedScriptRuntimeGeneration,}#[derive(Debug, Clone)]@@ -339,12 +338,6 @@ fn normalize_non_empty_attr(value: Option<&str>) -> Option<String> {(!value.is_empty()).then(|| value.to_owned())}-#[derive(Debug, Clone, Copy, PartialEq, Eq)]-pub enum PreparedScriptRuntimeGeneration {- PendingBinding,- Live(u64),-}-impl PreparedScript {pub fn with_loaded_source(mut self, source: String) -> Self {self.source = ScriptSource::Loaded(source);@@ -512,7 +505,6 @@ pub fn build_prepared_script(url,initiator_url: document_url,host_script_handle: None,- runtime_generation: PreparedScriptRuntimeGeneration::PendingBinding,})),Err(error) => PrepareScriptOutcome::UrlResolutionFailed(format!("failed to resolve script src `{src}`: {error}"@@ -533,7 +525,6 @@ pub fn build_prepared_script(base_url: document_base_url,initiator_url: document_url,host_script_handle: None,- runtime_generation: PreparedScriptRuntimeGeneration::PendingBinding,}))}_ => PrepareScriptOutcome::EmptyInlineSource,diff --git a/moli-renderer-v8/src/document_runtime.rs b/moli-renderer-v8/src/document_runtime.rsindex 78f75a0eb..ae0cff78d 100644--- a/moli-renderer-v8/src/document_runtime.rs+++ b/moli-renderer-v8/src/document_runtime.rs@@ -3531,8 +3531,6 @@ mod tests {base_url: Url::parse("https://example.com/app.js").unwrap(),url: Url::parse("https://example.com/app.js").unwrap(),host_script_handle: None,- runtime_generation:- crate::planning::PreparedScriptRuntimeGeneration::PendingBinding,},);task_queue.extend_post_parse_work([diff --git a/moli-renderer-v8/src/document_runtime/document_write.rs b/moli-renderer-v8/src/document_runtime/document_write.rsindex 526f95e51..38aecd58e 100644--- a/moli-renderer-v8/src/document_runtime/document_write.rs+++ b/moli-renderer-v8/src/document_runtime/document_write.rs@@ -10,7 +10,7 @@ use crate::parser::{DocumentStream, ParserPumpStep, ParserScriptHandoff, ParserYield, PreparedImportMap,PreparedImportMapSource,};-use crate::planning::{PreparedScriptRuntimeGeneration, SharedScriptSourceLoad};+use crate::planning::SharedScriptSourceLoad;use crate::stylesheet_blocking::DocumentBlockingStylesheetSignature;use crate::types::{ScriptKind, ScriptMode};use html5ever::tree_builder::QuirksMode;@@ -2129,13 +2129,6 @@ impl DocumentRuntime {mut script: PreparedScript,) {self.note_parser_script_start_position(node, start_line, start_column);- if matches!(- script.runtime_generation,- PreparedScriptRuntimeGeneration::PendingBinding- ) {- script.runtime_generation =- PreparedScriptRuntimeGeneration::Live(self.runtime_reset_generation());- }if script.host_script_handle.is_none() {script.host_script_handle = Some(self.bind_parser_owned_script_handle_for_node(node));}@@ -2744,7 +2737,6 @@ mod tests {base_url: url.clone(),initiator_url: url,host_script_handle: None,- runtime_generation: PreparedScriptRuntimeGeneration::PendingBinding,}}diff --git a/moli-renderer-v8/src/document_runtime/lifecycle.rs b/moli-renderer-v8/src/document_runtime/lifecycle.rsindex 03d7d82f5..d6bbf68d7 100644--- a/moli-renderer-v8/src/document_runtime/lifecycle.rs+++ b/moli-renderer-v8/src/document_runtime/lifecycle.rs@@ -48,10 +48,9 @@ impl DocumentRuntime {&mut self,owner: crate::frame_owner_model::FrameDocumentTaskOwner,) -> bool {- let runtime_generation = self.runtime_reset_generation();self.script_lifecycle.scripts_mut()- .bind_main_document_runtime_producer(owner, runtime_generation)+ .bind_main_document_runtime_producer(owner)}pub(crate) fn has_main_document_runtime_route(&self) -> bool {@@ -544,7 +543,7 @@ mod tests {},document_script_scheduler::{DocumentScriptExecutionLane, PageOwnedDocumentScriptWork},page_task_queue::{PageTask, PostParseLifecycleWork, PostParsePageOwnedWork},- planning::{PreparedScriptRuntimeGeneration, ScriptSource, SharedScriptSourceLoad},+ planning::{ScriptSource, SharedScriptSourceLoad},types::{ScriptKind, ScriptMode, ScriptRun, ScriptSkipReason, ScriptSourceKind},},};@@ -668,7 +667,6 @@ mod tests {base_url: Url::parse(&format!("https://example.com/{position}.js")).unwrap(),initiator_url: Url::parse("https://example.com/index.html").unwrap(),host_script_handle: None,- runtime_generation: PreparedScriptRuntimeGeneration::PendingBinding,}}diff --git a/moli-renderer-v8/src/document_runtime/script_scheduling.rs b/moli-renderer-v8/src/document_runtime/script_scheduling.rsindex e84079464..ea3fb57a0 100644--- a/moli-renderer-v8/src/document_runtime/script_scheduling.rs+++ b/moli-renderer-v8/src/document_runtime/script_scheduling.rs@@ -128,7 +128,6 @@ mod tests {base_url: Url::parse("https://example.com/script.js").unwrap(),url: Url::parse("https://example.com/script.js").unwrap(),host_script_handle: None,- runtime_generation: crate::planning::PreparedScriptRuntimeGeneration::PendingBinding,}}diff --git a/moli-renderer-v8/src/document_runtime/script_scheduling/document_write_scripts.rs b/moli-renderer-v8/src/document_runtime/script_scheduling/document_write_scripts.rsindex 0522e3281..88d063b03 100644--- a/moli-renderer-v8/src/document_runtime/script_scheduling/document_write_scripts.rs+++ b/moli-renderer-v8/src/document_runtime/script_scheduling/document_write_scripts.rs@@ -3,7 +3,7 @@ use crate::host::{ScriptEventKind, ScriptEventTask, ScriptHandleSource,begin_prepared_document_write_script_start,};-use crate::planning::{PreparedScriptRuntimeGeneration, ScriptSource};+use crate::planning::ScriptSource;use crate::script_vm::perform_microtask_checkpoint_and_report_pending_promise_rejections;use crate::types::ScriptKind;use crate::util::create_script_origin;@@ -78,8 +78,6 @@ impl DocumentRuntime {);script.node_id = node;script.host_script_handle = Some(host_script_handle.clone());- script.runtime_generation =- PreparedScriptRuntimeGeneration::Live(self.runtime_reset_generation());let inline_classic_source = match (&script.kind, &script.source) {(ScriptKind::Classic, ScriptSource::Inline(source)) => Some(source.clone()),_ => None,diff --git a/moli-renderer-v8/src/document_runtime/security_policy.rs b/moli-renderer-v8/src/document_runtime/security_policy.rsindex 24d2d0b5c..a49a8a18e 100644--- a/moli-renderer-v8/src/document_runtime/security_policy.rs+++ b/moli-renderer-v8/src/document_runtime/security_policy.rs@@ -1546,12 +1546,12 @@ impl DocumentRuntime {send_report: bool,) -> anyhow::Result<()> {self.record_content_security_policy_inspector_issue(target, violation);+ let host = unsafe { &mut *host_ptr };+ let document_owner = host+ .current_main_document_task_owner()+ .ok_or_else(|| anyhow::anyhow!("main CSP violation document owner is unavailable"))?;if send_report {let fields = ContentSecurityPolicyViolationEventFields::from(violation);- let host = unsafe { &mut *host_ptr };- let document_owner = host.current_main_document_task_owner().ok_or_else(|| {- anyhow::anyhow!("main CSP violation document owner is unavailable")- })?;crate::network_host::send_content_security_policy_reports_for_window(scope,host,@@ -1565,13 +1565,13 @@ impl DocumentRuntime {let event_task = match target {Some(target) => {crate::page_task_queue::ContentSecurityPolicyViolationEventTask::for_element(- self.runtime_reset_generation(),+ document_owner,target,violation.clone(),)}None => crate::page_task_queue::ContentSecurityPolicyViolationEventTask::new(- self.runtime_reset_generation(),+ document_owner,violation.clone(),),};@@ -1596,7 +1596,7 @@ impl DocumentRuntime {host_ptr: *mut JsContextHost,task: &crate::page_task_queue::ContentSecurityPolicyViolationEventTask,) -> anyhow::Result<()> {- if task.runtime_generation() != self.runtime_reset_generation() {+ if unsafe { &*host_ptr }.current_main_document_task_owner() != Some(task.owner()) {return Ok(());}let violation = task.violation();diff --git a/moli-renderer-v8/src/document_script_scheduler.rs b/moli-renderer-v8/src/document_script_scheduler.rsindex 2886b72fa..1dd2b581f 100644--- a/moli-renderer-v8/src/document_script_scheduler.rs+++ b/moli-renderer-v8/src/document_script_scheduler.rs@@ -543,7 +543,6 @@ mod tests {base_url: Url::parse(&format!("https://example.com/{position}.js")).unwrap(),initiator_url: Url::parse("https://example.com/index.html").unwrap(),host_script_handle: None,- runtime_generation: crate::planning::PreparedScriptRuntimeGeneration::PendingBinding,}}diff --git a/moli-renderer-v8/src/document_script_scheduler/frame_module_script_owner.rs b/moli-renderer-v8/src/document_script_scheduler/frame_module_script_owner.rsindex 4a45dbc45..cadd53baf 100644--- a/moli-renderer-v8/src/document_script_scheduler/frame_module_script_owner.rs+++ b/moli-renderer-v8/src/document_script_scheduler/frame_module_script_owner.rs@@ -940,9 +940,7 @@ mod tests {frame_owner_model::{DocumentId, FrameSchedulerLaneId, LocalWindowId},module_runtime::{ModuleGraphHandle, ModuleLoadStage, ModuleMapKey},parser_module_evaluation::ParserModuleEvaluationStore,- planning::{- PreparedScript, PreparedScriptRuntimeGeneration, ScriptFetchMetadata, ScriptSource,- },+ planning::{PreparedScript, ScriptFetchMetadata, ScriptSource},types::{ScriptKind, ScriptMode, ScriptSourceKind},};use moli_module_script_tree as module_tree;@@ -1328,7 +1326,6 @@ mod tests {base_url: script_url.clone(),initiator_url: script_url,host_script_handle: None,- runtime_generation: PreparedScriptRuntimeGeneration::PendingBinding,}}diff --git a/moli-renderer-v8/src/document_script_scheduler/frame_parser_classic/pending_tests.rs b/moli-renderer-v8/src/document_script_scheduler/frame_parser_classic/pending_tests.rsindex 2c2a5fcca..937e31fdf 100644--- a/moli-renderer-v8/src/document_script_scheduler/frame_parser_classic/pending_tests.rs+++ b/moli-renderer-v8/src/document_script_scheduler/frame_parser_classic/pending_tests.rs@@ -36,9 +36,7 @@ use crate::{runner::ParserClassicScriptRunner,slot::ParserClassicScriptRunnerSlot,},- planning::{- PreparedScript, PreparedScriptRuntimeGeneration, ScriptFetchMetadata, ScriptSource,- },+ planning::{PreparedScript, ScriptFetchMetadata, ScriptSource},types::{ChildClassicScriptLoadCompletion, ChildClassicScriptNetworkAttribution, ScriptKind,ScriptMode, ScriptSourceKind,@@ -306,7 +304,6 @@ fn external_script(script_handle: DomHandle, script_url: Url) -> PreparedScriptbase_url: script_url.clone(),initiator_url: script_url,host_script_handle: None,- runtime_generation: PreparedScriptRuntimeGeneration::PendingBinding,}}diff --git a/moli-renderer-v8/src/document_script_scheduler/owner_runner.rs b/moli-renderer-v8/src/document_script_scheduler/owner_runner.rsindex 50ff23786..66f1f1b66 100644--- a/moli-renderer-v8/src/document_script_scheduler/owner_runner.rs+++ b/moli-renderer-v8/src/document_script_scheduler/owner_runner.rs@@ -601,7 +601,7 @@ mod tests {use crate::{document_script_scheduler::PageOwnedDocumentScriptBodyActivity,dom::NodeId,- planning::{PreparedScriptRuntimeGeneration, ScriptFetchMetadata, ScriptSource},+ planning::{ScriptFetchMetadata, ScriptSource},protocol_types::NavigationResponse,types::{ScriptKind, ScriptMode, ScriptRun, ScriptRunOutcome, ScriptSourceKind},};@@ -716,7 +716,6 @@ mod tests {base_url: url::Url::parse("https://example.com/owner-hook.js").unwrap(),initiator_url: url::Url::parse("https://example.com/index.html").unwrap(),host_script_handle: None,- runtime_generation: PreparedScriptRuntimeGeneration::PendingBinding,}}diff --git a/moli-renderer-v8/src/document_script_scheduler/owner_work.rs b/moli-renderer-v8/src/document_script_scheduler/owner_work.rsindex 1af8651f7..bcf5348d9 100644--- a/moli-renderer-v8/src/document_script_scheduler/owner_work.rs+++ b/moli-renderer-v8/src/document_script_scheduler/owner_work.rs@@ -3,8 +3,8 @@ use crate::{frame_owner_model::MainDocumentScriptLoadDelayLease,host::ModuleFailurePolicy,planning::{- PreparedScript, PreparedScriptRuntimeGeneration, PreparedScriptSourceLoadOutcome,- SharedScriptSourceLoad, prepared_script_with_loaded_source,+ PreparedScript, PreparedScriptSourceLoadOutcome, SharedScriptSourceLoad,+ prepared_script_with_loaded_source,},types::{ScriptErrorConstructorKind, SharedNavigationResponseResult},};@@ -99,10 +99,9 @@ pub(crate) enum PageOwnedDocumentScriptWork {}impl PageOwnedDocumentScriptWork {- pub(crate) fn bind_main_document_runtime_target(- &mut self,+ pub(crate) fn matches_main_document_runtime_target(+ &self,owner: crate::frame_owner_model::FrameDocumentTaskOwner,- runtime_generation: u64,) -> bool {let (load_delay_owner, runtime_script_owner) = match self {Self::AsyncSourceFailure {@@ -129,15 +128,7 @@ impl PageOwnedDocumentScriptWork {{return false;}- let script = self.as_script_mut();- match script.runtime_generation {- PreparedScriptRuntimeGeneration::PendingBinding => {- script.runtime_generation =- PreparedScriptRuntimeGeneration::Live(runtime_generation);- true- }- PreparedScriptRuntimeGeneration::Live(generation) => generation == runtime_generation,- }+ true}pub(crate) fn script(lane: DocumentScriptExecutionLane, script: PreparedScript) -> Self {diff --git a/moli-renderer-v8/src/document_script_scheduler/store.rs b/moli-renderer-v8/src/document_script_scheduler/store.rsindex fef6319a4..ffbec0a83 100644--- a/moli-renderer-v8/src/document_script_scheduler/store.rs+++ b/moli-renderer-v8/src/document_script_scheduler/store.rs@@ -933,9 +933,7 @@ mod tests {FrameRealmId, FrameSchedulerLaneId, LocalWindowId,};use crate::module_runtime::{ModuleEntryId, ModuleMapKey};- use crate::planning::{- PreparedScript, PreparedScriptRuntimeGeneration, ScriptFetchMetadata, ScriptSource,- };+ use crate::planning::{PreparedScript, ScriptFetchMetadata, ScriptSource};use crate::types::{ScriptKind, ScriptMode, ScriptSourceKind};use moli_module_script_tree as module_tree;@@ -953,7 +951,6 @@ mod tests {base_url: script_url.clone(),initiator_url: script_url,host_script_handle: None,- runtime_generation: PreparedScriptRuntimeGeneration::PendingBinding,}}diff --git a/moli-renderer-v8/src/dynamic_script_owner.rs b/moli-renderer-v8/src/dynamic_script_owner.rsindex 92b4ac936..b23289833 100644--- a/moli-renderer-v8/src/dynamic_script_owner.rs+++ b/moli-renderer-v8/src/dynamic_script_owner.rs@@ -2200,7 +2200,6 @@ mod tests {base_url: Url::parse("https://example.test/script.js").expect("test url should parse"),url: Url::parse("https://example.test/script.js").expect("test url should parse"),host_script_handle: Some(format!("script-{position}")),- runtime_generation: crate::planning::PreparedScriptRuntimeGeneration::Live(0),}}diff --git a/moli-renderer-v8/src/dynamic_script_owner/script_lanes.rs b/moli-renderer-v8/src/dynamic_script_owner/script_lanes.rsindex 515660f82..82f4ec0ea 100644--- a/moli-renderer-v8/src/dynamic_script_owner/script_lanes.rs+++ b/moli-renderer-v8/src/dynamic_script_owner/script_lanes.rs@@ -210,7 +210,7 @@ mod tests {use crate::{dom::NodeId,- planning::{PreparedScript, PreparedScriptRuntimeGeneration, ScriptFetchMetadata},+ planning::{PreparedScript, ScriptFetchMetadata},types::{ScriptKind, ScriptMode, ScriptSourceKind},};@@ -245,7 +245,6 @@ mod tests {initiator_url: Url::parse("https://example.test/").expect("initiator URL should parse"),host_script_handle: Some(handle.to_owned()),- runtime_generation: PreparedScriptRuntimeGeneration::Live(0),},ready_state: DynamicScriptReadyState::Ready {order: ready_order,diff --git a/moli-renderer-v8/src/frame_owner_model/module_graph/tests.rs b/moli-renderer-v8/src/frame_owner_model/module_graph/tests.rsindex 8954a2448..49c2f6ae3 100644--- a/moli-renderer-v8/src/frame_owner_model/module_graph/tests.rs+++ b/moli-renderer-v8/src/frame_owner_model/module_graph/tests.rs@@ -53,9 +53,7 @@ use crate::module_runtime::{NativeModuleGraphJobAdvance, NativeModuleScriptSingleModuleClient,NativeModuleSingleFetchRequest, NativeParserModuleTreeJobResume, PendingDynamicModuleImport,};-use crate::planning::{- PreparedScript, PreparedScriptRuntimeGeneration, ScriptFetchMetadata, ScriptSource,-};+use crate::planning::{PreparedScript, ScriptFetchMetadata, ScriptSource};use crate::types::{ScriptKind, ScriptMode, ScriptSourceKind};use moli_module_script_tree as module_tree;use url::Url;@@ -162,7 +160,6 @@ fn parser_root_script(handle: usize, url: &Url) -> PreparedScript {base_url: url.clone(),initiator_url: url.clone(),host_script_handle: None,- runtime_generation: PreparedScriptRuntimeGeneration::PendingBinding,}}diff --git a/moli-renderer-v8/src/host/scripts.rs b/moli-renderer-v8/src/host/scripts.rsindex fc9124fdb..ec7f33f55 100644--- a/moli-renderer-v8/src/host/scripts.rs+++ b/moli-renderer-v8/src/host/scripts.rs@@ -54,7 +54,7 @@ pub(crate) struct HostScriptScheduler {pending_failed_dynamic_scripts: VecDeque<FailedDynamicScript>,page_task_tx: Option<PageTaskSender>,main_document_runtime_producer: Option<RendererPageMainDocumentRuntimeProducer>,- main_document_runtime_target: Option<(crate::frame_owner_model::FrameDocumentTaskOwner, u64)>,+ main_document_runtime_target: Option<crate::frame_owner_model::FrameDocumentTaskOwner>,main_document_completion_recheck_turn_queued: bool,dynamic_module_job_turn_queued: bool,native_module_owner_event_turn_queued: bool,@@ -1226,16 +1226,15 @@ impl HostScriptScheduler {pub(crate) fn bind_main_document_runtime_producer(&mut self,owner: crate::frame_owner_model::FrameDocumentTaskOwner,- runtime_generation: u64,) -> bool {- let next_target = (owner, runtime_generation);+ let next_target = owner;if self.main_document_runtime_target != Some(next_target) {self.main_document_completion_recheck_turn_queued = false;}self.main_document_runtime_producer = self.page_task_tx.as_ref()- .map(|tx| tx.bind_main_document_runtime_producer(owner, runtime_generation));+ .map(|tx| tx.bind_main_document_runtime_producer(owner));self.main_document_runtime_target = self.main_document_runtime_producer.as_ref()@@ -1314,7 +1313,7 @@ impl HostScriptScheduler {) -> bool {if self.main_document_runtime_target- .is_none_or(|(target_owner, _)| target_owner != owner)+ .is_none_or(|target_owner| target_owner != owner){return false;}@@ -1527,7 +1526,6 @@ impl HostScriptScheduler {NativeNodeId::new(node_id.index()),position,Some(host_script_handle.to_owned()),- crate::planning::PreparedScriptRuntimeGeneration::PendingBinding,source,source_kind,kind,@@ -1622,8 +1620,6 @@ impl HostScriptScheduler {base_url: url.clone(),url,host_script_handle: Some(host_script_handle.to_owned()),- runtime_generation:- crate::planning::PreparedScriptRuntimeGeneration::PendingBinding,},message: message.to_owned(),failure_kind,diff --git a/moli-renderer-v8/src/host/scripts/loader.rs b/moli-renderer-v8/src/host/scripts/loader.rsindex 7cc9bebfe..e5dd77901 100644--- a/moli-renderer-v8/src/host/scripts/loader.rs+++ b/moli-renderer-v8/src/host/scripts/loader.rs@@ -2,9 +2,7 @@ use crate::{dom::native::{DomHost, NativeNodeId, Node},{host::HostDocumentState,- planning::{- PreparedScript, PreparedScriptRuntimeGeneration, ScriptFetchMetadata, ScriptSource,- },+ planning::{PreparedScript, ScriptFetchMetadata, ScriptSource},types::{ScriptElementClassificationInput, ScriptKind, ScriptMode,ScriptPreparationClassificationInput, ScriptSkipReason, ScriptSourceKind,@@ -146,7 +144,6 @@ pub(crate) fn build_runtime_prepared_script(node: NativeNodeId,position: usize,host_script_handle: Option<String>,- runtime_generation: PreparedScriptRuntimeGeneration,source: &str,source_kind: ScriptSourceKind,kind: ScriptKind,@@ -179,7 +176,6 @@ pub(crate) fn build_runtime_prepared_script(base_url: url.clone(),url,host_script_handle,- runtime_generation,})}diff --git a/moli-renderer-v8/src/host/scripts/tests.rs b/moli-renderer-v8/src/host/scripts/tests.rsindex 740f2681d..e7e40f1f7 100644--- a/moli-renderer-v8/src/host/scripts/tests.rs+++ b/moli-renderer-v8/src/host/scripts/tests.rs@@ -37,7 +37,7 @@ fn page_bound_script_scheduler(let runtime_sender = queue.owner_attached_runtime_page_task_sender_for_test();let mut scripts =HostScriptScheduler::with_page_task_injection(runtime_sender.page_task_sender());- assert!(scripts.bind_main_document_runtime_producer(test_main_document_owner(), 0));+ assert!(scripts.bind_main_document_runtime_producer(test_main_document_owner()));scripts}diff --git a/moli-renderer-v8/src/module_script_continuation.rs b/moli-renderer-v8/src/module_script_continuation.rsindex ff3f8edcd..cc9428b08 100644--- a/moli-renderer-v8/src/module_script_continuation.rs+++ b/moli-renderer-v8/src/module_script_continuation.rs@@ -1042,7 +1042,7 @@ mod tests {ModuleLoadStage, NativeDynamicModuleImportReady, NativeModuleGraphFetchRequest,NativeModuleGraphJob, PendingDynamicModuleImport,};- use crate::planning::{PreparedScriptRuntimeGeneration, ScriptFetchMetadata, ScriptSource};+ use crate::planning::{ScriptFetchMetadata, ScriptSource};use crate::types::{ScriptKind, ScriptMode, ScriptSourceKind};use url::Url;@@ -1100,7 +1100,6 @@ mod tests {base_url: Url::parse(&format!("https://example.test/{node}.mjs")).expect("module url"),initiator_url: Url::parse("https://example.test/page").expect("page url"),host_script_handle: None,- runtime_generation: PreparedScriptRuntimeGeneration::Live(1),}}diff --git a/moli-renderer-v8/src/native_bridge/context_host/child_dynamic_scripts.rs b/moli-renderer-v8/src/native_bridge/context_host/child_dynamic_scripts.rsindex 13920931f..cacd60283 100644--- a/moli-renderer-v8/src/native_bridge/context_host/child_dynamic_scripts.rs+++ b/moli-renderer-v8/src/native_bridge/context_host/child_dynamic_scripts.rs@@ -7,7 +7,6 @@ use crate::{FrameRealmId, PendingChildDynamicDocumentScript,},host::{RuntimeScriptPreparationContext, build_runtime_prepared_script},- planning::PreparedScriptRuntimeGeneration,types::{ScriptKind, ScriptMode, ScriptSourceKind},};@@ -39,7 +38,6 @@ impl JsContextHost {script_handle,0,None,- PreparedScriptRuntimeGeneration::PendingBinding,source,source_kind,kind,diff --git a/moli-renderer-v8/src/page_task_queue.rs b/moli-renderer-v8/src/page_task_queue.rsindex 75e804fd9..d32eb81de 100644--- a/moli-renderer-v8/src/page_task_queue.rs+++ b/moli-renderer-v8/src/page_task_queue.rs@@ -784,7 +784,6 @@ mod tests {base_url: Url::parse(&format!("https://example.com/{position}.js")).unwrap(),initiator_url: Url::parse("https://example.com/index.html").unwrap(),host_script_handle: None,- runtime_generation: crate::planning::PreparedScriptRuntimeGeneration::PendingBinding,}}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 8c0dd410a..070b85cfb 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@@ -717,9 +717,7 @@ mod tests {action::ParserPendingClassicScriptSourceLoadClientAction,payload::ParserClassicScriptMetadata,},- planning::{- PreparedScript, PreparedScriptRuntimeGeneration, ScriptFetchMetadata, ScriptSource,- },+ planning::{PreparedScript, ScriptFetchMetadata, ScriptSource},runtime::RendererPageToken,types::{ScriptKind, ScriptMode, ScriptSourceKind},};@@ -749,7 +747,6 @@ mod tests {base_url: script_url.clone(),initiator_url: script_url,host_script_handle: None,- runtime_generation: PreparedScriptRuntimeGeneration::PendingBinding,};let pending_script_id = crate::document_script_scheduler::ParserPendingScriptId::new(owner.document_owner(),@@ -783,7 +780,6 @@ mod tests {base_url: document_url.clone(),initiator_url: document_url,host_script_handle: None,- runtime_generation: PreparedScriptRuntimeGeneration::PendingBinding,};let pending_script_id = crate::document_script_scheduler::ParserPendingScriptId::new(owner.document_owner(),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 3ec4952f8..1c010abd5 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@@ -25,33 +25,20 @@ use super::{/// Exact main-Document binding selected by a post-parse carrier.////// The PageVm root token remains the outer scheduler's authority. This value-/// is the ScriptVm-local half: `document_owner` separates `document.open()`-/// replacements and `runtime_generation` separates runtime resets that can-/// reuse the same PageVm.+/// is the ScriptVm-local half and separates `document.open()` replacements.#[derive(Clone, Copy, Debug, Eq, PartialEq)]pub(crate) struct MainDocumentPostParseOwner {document_owner: FrameDocumentTaskOwner,- runtime_generation: u64,}impl MainDocumentPostParseOwner {- pub(crate) const fn new(- document_owner: FrameDocumentTaskOwner,- runtime_generation: u64,- ) -> Self {- Self {- document_owner,- runtime_generation,- }+ pub(crate) const fn new(document_owner: FrameDocumentTaskOwner) -> Self {+ Self { document_owner }}pub(crate) const fn document_owner(self) -> FrameDocumentTaskOwner {self.document_owner}-- pub(crate) const fn runtime_generation(self) -> u64 {- self.runtime_generation- }}/// The eight post-parse callback/state bodies whose task-end checkpoint wasdiff --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 3d7e256d2..7edfa9c2e 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@@ -169,12 +169,10 @@ impl RendererPageMainDocumentRuntimeSender {pub(crate) fn bind_producer(&self,document_owner: FrameDocumentTaskOwner,- runtime_generation: u64,) -> RendererPageMainDocumentRuntimeProducer {RendererPageMainDocumentRuntimeProducer {sender: self.clone(),document_owner,- runtime_generation,}}@@ -221,14 +219,11 @@ impl RendererPageMainDocumentRuntimeSender {/// Asynchronous runtime state may retain this value, and the Document-owned/// host scheduler replaces its current producer only at the synchronous/// `document.open()` owner transition. Already-created producers therefore-/// cannot rebind work to a later Document. `runtime_generation` remains only-/// as transitional metadata for binding pending `PreparedScript` payloads; it-/// is not part of the Page task's authorization identity.+/// cannot rebind work to a later Document.#[derive(Clone, Debug)]pub(crate) struct RendererPageMainDocumentRuntimeProducer {sender: RendererPageMainDocumentRuntimeSender,document_owner: FrameDocumentTaskOwner,- runtime_generation: u64,}impl RendererPageMainDocumentRuntimeProducer {@@ -306,7 +301,7 @@ impl RendererPageMainDocumentRuntimeProducer {&self,mut work: PostParsePageOwnedWork,) -> Result<(), RendererPageMainDocumentRuntimeAdmissionError> {- if !work.bind_main_document_runtime_target(self.document_owner, self.runtime_generation) {+ if !work.matches_main_document_runtime_target(self.document_owner) {return Err(RendererPageMainDocumentRuntimeAdmissionError::TargetMismatch);}work.complete_source_load_if_ready();@@ -913,10 +908,7 @@ mod tests {PageId,document_script_scheduler::{DocumentScriptExecutionLane, PageOwnedDocumentScriptWork},frame_owner_model::{DocumentId, FrameSchedulerLaneId, LocalWindowId},- planning::{- PreparedScript, PreparedScriptRuntimeGeneration, ScriptFetchMetadata, ScriptSource,- SharedScriptSourceLoad,- },+ planning::{PreparedScript, ScriptFetchMetadata, ScriptSource, SharedScriptSourceLoad},runtime::RendererPageToken,types::{ScriptKind, ScriptMode, ScriptSourceKind},};@@ -938,7 +930,7 @@ mod tests {}}- fn prepared_script(runtime_generation: PreparedScriptRuntimeGeneration) -> PreparedScript {+ fn prepared_script() -> PreparedScript {let url = Url::parse("https://main-runtime.test/async.js").expect("script URL");PreparedScript {position: 1,@@ -952,13 +944,27 @@ mod tests {base_url: url.clone(),initiator_url: url,host_script_handle: None,- runtime_generation,+ }+ }++ fn csp_violation() -> crate::content_security_policy::ContentSecurityPolicyUrlViolation {+ crate::content_security_policy::ContentSecurityPolicyUrlViolation {+ effective_directive: "script-src",+ blocked_uri: "https://blocked.test/script.js".to_owned(),+ document_uri: "https://main-runtime.test/".to_owned(),+ original_policy: "script-src 'none'".to_owned(),+ disposition: crate::content_security_policy::ContentSecurityPolicyDisposition::Enforce,+ report_uri_endpoints: Vec::new(),+ report_to_endpoints: Vec::new(),+ sample: String::new(),+ source_file: String::new(),+ line_number: 0,+ column_number: 0,}}fn source_and_producer(owner: FrameDocumentTaskOwner,- runtime_generation: u64,) -> (RendererPageMainDocumentRuntimeSource,RendererPageMainDocumentRuntimeProducer,@@ -972,14 +978,14 @@ mod tests {let producer = source.route().sender(document_token(1))- .bind_producer(owner, runtime_generation);+ .bind_producer(owner);(source, producer, wake_rx)}#[test]fn lifecycle_owner_mismatch_is_rejected_before_readiness() {let owner = task_owner(3);- let (mut source, producer, mut wake_rx) = source_and_producer(owner, 5);+ let (mut source, producer, mut wake_rx) = source_and_producer(owner);assert_eq!(producer.send_lifecycle_work(@@ -994,17 +1000,18 @@ mod tests {}#[test]- fn prepared_script_generation_mismatch_is_rejected_before_readiness() {+ fn csp_violation_owner_mismatch_is_rejected_before_readiness() {let owner = task_owner(3);- let (mut source, producer, mut wake_rx) = source_and_producer(owner, 5);- let work =- PostParsePageOwnedWork::document_script_work(PageOwnedDocumentScriptWork::script(- DocumentScriptExecutionLane::AsyncPhase,- prepared_script(PreparedScriptRuntimeGeneration::Live(6)),- ));+ let (mut source, producer, mut wake_rx) = source_and_producer(owner);+ let task = super::super::ContentSecurityPolicyViolationEventTask::new(+ task_owner(4),+ csp_violation(),+ );assert_eq!(- producer.send_post_parse_work_when_ready(work),+ producer.send_lifecycle_work(+ super::super::PostParseLifecycleWork::DispatchContentSecurityPolicyViolation(task,),+ ),Err(RendererPageMainDocumentRuntimeAdmissionError::TargetMismatch));assert!(!source.has_ready_task());@@ -1014,8 +1021,7 @@ mod tests {#[test]fn parser_owned_module_continuation_is_one_exact_ready_action() {let owner = task_owner(3);- let runtime_generation = 5;- let (mut source, producer, mut wake_rx) = source_and_producer(owner, runtime_generation);+ let (mut source, producer, mut wake_rx) = source_and_producer(owner);producer.send_parser_owned_module_continuation()@@ -1040,8 +1046,7 @@ mod tests {#[test]fn native_module_owner_event_is_one_exact_ready_action() {let owner = task_owner(3);- let runtime_generation = 5;- let (mut source, producer, mut wake_rx) = source_and_producer(owner, runtime_generation);+ let (mut source, producer, mut wake_rx) = source_and_producer(owner);producer.send_native_module_owner_event()@@ -1066,8 +1071,7 @@ mod tests {#[tokio::test]async fn pending_source_load_becomes_ready_once_under_its_bound_document() {let owner = task_owner(3);- let runtime_generation = 5;- let (mut source, producer, mut wake_rx) = source_and_producer(owner, runtime_generation);+ let (mut source, producer, mut wake_rx) = source_and_producer(owner);let (finish_tx, finish_rx) = tokio::sync::oneshot::channel();let source_load = SharedScriptSourceLoad::spawn_for_test(async move {finish_rx.await.expect("source release");@@ -1076,7 +1080,7 @@ mod tests {let work = PostParsePageOwnedWork::document_script_work(PageOwnedDocumentScriptWork::script_waiting_for_source(DocumentScriptExecutionLane::AsyncPhase,- prepared_script(PreparedScriptRuntimeGeneration::PendingBinding),+ prepared_script(),source_load,),);@@ -1102,13 +1106,13 @@ mod tests {else {panic!("source completion must preserve the concrete post-parse action");};- assert_eq!(+ assert!(matches!(work.into_post_parse_work().as_script().expect("document-script work")- .runtime_generation,- PreparedScriptRuntimeGeneration::Live(runtime_generation)- );+ .source,+ ScriptSource::Loaded(_)+ ));assert!(!source.has_ready_task());assert!(wake_rx.try_recv().is_err());}diff --git a/moli-renderer-v8/src/page_task_queue/post_parse_owner_work.rs b/moli-renderer-v8/src/page_task_queue/post_parse_owner_work.rsindex d04d53346..da88bb769 100644--- a/moli-renderer-v8/src/page_task_queue/post_parse_owner_work.rs+++ b/moli-renderer-v8/src/page_task_queue/post_parse_owner_work.rs@@ -66,7 +66,6 @@ impl PostParseLifecycleWork {pub(crate) fn matches_main_document_runtime_target(&self,owner: FrameDocumentTaskOwner,- runtime_generation: u64,) -> bool {if self.main_parser_deferred_scripts_owner()@@ -75,12 +74,10 @@ impl PostParseLifecycleWork {{return false;}- match self {- Self::DispatchContentSecurityPolicyViolation(task) => {- task.runtime_generation() == runtime_generation- }- _ => true,- }+ !matches!(+ self,+ Self::DispatchContentSecurityPolicyViolation(task) if task.owner() != owner+ )}#[cfg(test)]@@ -323,18 +320,15 @@ impl PostParseLifecycleWork {}impl PostParsePageOwnedWork {- pub(crate) fn bind_main_document_runtime_target(- &mut self,+ pub(crate) fn matches_main_document_runtime_target(+ &self,owner: FrameDocumentTaskOwner,- runtime_generation: u64,) -> bool {match self {- Self::Lifecycle(work) => {- work.matches_main_document_runtime_target(owner, runtime_generation)- }+ Self::Lifecycle(work) => work.matches_main_document_runtime_target(owner),Self::DocumentScript(work)| Self::DocumentScriptWithStylesheetSnapshot { work, .. } => {- work.bind_main_document_runtime_target(owner, runtime_generation)+ work.matches_main_document_runtime_target(owner)}}}diff --git a/moli-renderer-v8/src/page_task_queue/senders.rs b/moli-renderer-v8/src/page_task_queue/senders.rsindex 31e6a0e91..0a95505dd 100644--- a/moli-renderer-v8/src/page_task_queue/senders.rs+++ b/moli-renderer-v8/src/page_task_queue/senders.rs@@ -670,11 +670,10 @@ impl PageRuntimeWakeSender {pub(crate) fn bind_main_document_runtime_continuation(&self,document_owner: crate::frame_owner_model::FrameDocumentTaskOwner,- runtime_generation: u64,) -> MainDocumentRuntimeContinuationSender {match &self.main_document_runtime {Some(sender) => MainDocumentRuntimeContinuationSender::OwnerAttached(- sender.bind_producer(document_owner, runtime_generation),+ sender.bind_producer(document_owner),),None => panic!("owner-attached Page runtime continuation sender is required"),}@@ -759,10 +758,8 @@ impl PageTaskSender {pub(crate) fn bind_main_document_runtime_producer(&self,document_owner: crate::frame_owner_model::FrameDocumentTaskOwner,- runtime_generation: u64,) -> RendererPageMainDocumentRuntimeProducer {- self.main_document_runtime- .bind_producer(document_owner, runtime_generation)+ self.main_document_runtime.bind_producer(document_owner)}}diff --git a/moli-renderer-v8/src/page_task_queue/tasks.rs b/moli-renderer-v8/src/page_task_queue/tasks.rsindex 794767f9d..2eef27576 100644--- a/moli-renderer-v8/src/page_task_queue/tasks.rs+++ b/moli-renderer-v8/src/page_task_queue/tasks.rs@@ -93,37 +93,37 @@ impl WindowScriptFailureReportTask {#[derive(Debug, Clone, PartialEq, Eq)]pub(crate) struct ContentSecurityPolicyViolationEventTask {- runtime_generation: u64,+ owner: crate::frame_owner_model::FrameDocumentTaskOwner,target: Option<DomHandle>,violation: ContentSecurityPolicyUrlViolation,}impl ContentSecurityPolicyViolationEventTask {pub(crate) fn new(- runtime_generation: u64,+ owner: crate::frame_owner_model::FrameDocumentTaskOwner,violation: ContentSecurityPolicyUrlViolation,) -> Self {Self {- runtime_generation,+ owner,target: None,violation,}}pub(crate) fn for_element(- runtime_generation: u64,+ owner: crate::frame_owner_model::FrameDocumentTaskOwner,target: DomHandle,violation: ContentSecurityPolicyUrlViolation,) -> Self {Self {- runtime_generation,+ owner,target: Some(target),violation,}}- pub(crate) fn runtime_generation(&self) -> u64 {- self.runtime_generation+ pub(crate) fn owner(&self) -> crate::frame_owner_model::FrameDocumentTaskOwner {+ self.owner}pub(crate) fn violation(&self) -> &ContentSecurityPolicyUrlViolation {diff --git a/moli-renderer-v8/src/parser_script/runner.rs b/moli-renderer-v8/src/parser_script/runner.rsindex 844d0c6d4..90c7c5d58 100644--- a/moli-renderer-v8/src/parser_script/runner.rs+++ b/moli-renderer-v8/src/parser_script/runner.rs@@ -809,9 +809,7 @@ mod tests {ParserScriptReadyOwner, ParserScriptSourceFailureOwner,},parser_script::projection::ParserClassicScriptNextActionWithBlockedScript,- planning::{- PreparedScript, PreparedScriptRuntimeGeneration, ScriptFetchMetadata, ScriptSource,- },+ planning::{PreparedScript, ScriptFetchMetadata, ScriptSource},types::{ScriptKind, ScriptMode, ScriptSourceKind},};use url::Url;@@ -943,7 +941,6 @@ mod tests {base_url: script_url.clone(),initiator_url: script_url,host_script_handle: None,- runtime_generation: PreparedScriptRuntimeGeneration::PendingBinding,};ParserPreparedClassicScript::new(ParserClassicScriptMetadata::new(script_handle, start_line),diff --git a/moli-renderer-v8/src/planning.rs b/moli-renderer-v8/src/planning.rsindex 1eda45964..9cba635eb 100644--- a/moli-renderer-v8/src/planning.rs+++ b/moli-renderer-v8/src/planning.rs@@ -18,8 +18,7 @@ use crate::{pub(crate) use moli_parser::{ParserPlanningReadView, ParserScriptRead, PrepareScriptOutcome, PreparedScript,- PreparedScriptRuntimeGeneration, ScriptFetchMetadata, ScriptSource, build_prepared_script,- classify_parser_script,+ ScriptFetchMetadata, ScriptSource, build_prepared_script, classify_parser_script,};#[derive(Clone)]@@ -770,7 +769,6 @@ mod tests {base_url: url.clone(),initiator_url: url,host_script_handle: None,- runtime_generation: PreparedScriptRuntimeGeneration::PendingBinding,}}@@ -834,7 +832,6 @@ mod tests {base_url: url.clone(),initiator_url,host_script_handle: None,- runtime_generation: PreparedScriptRuntimeGeneration::PendingBinding,}}diff --git a/moli-renderer-v8/src/runtime/page_vm/tests/main_document_post_parse_completion.rs b/moli-renderer-v8/src/runtime/page_vm/tests/main_document_post_parse_completion.rsindex b98a7814f..7db6f624f 100644--- a/moli-renderer-v8/src/runtime/page_vm/tests/main_document_post_parse_completion.rs+++ b/moli-renderer-v8/src/runtime/page_vm/tests/main_document_post_parse_completion.rs@@ -35,7 +35,10 @@ fn csp_violation_task(.url().to_string();crate::page_task_queue::ContentSecurityPolicyViolationEventTask::new(- page_vm.vm().document_runtime.runtime_reset_generation(),+ page_vm+ .vm()+ .current_main_document_task_owner()+ .expect("main Document owner"),crate::content_security_policy::ContentSecurityPolicyUrlViolation {effective_directive: "script-src",blocked_uri: "https://blocked-post-parse.test/script.js".to_owned(),diff --git a/moli-renderer-v8/src/runtime/page_vm/tests/mod.rs b/moli-renderer-v8/src/runtime/page_vm/tests/mod.rsindex e90ec4524..02cf5a9ba 100644--- a/moli-renderer-v8/src/runtime/page_vm/tests/mod.rs+++ b/moli-renderer-v8/src/runtime/page_vm/tests/mod.rs@@ -38,8 +38,8 @@ use crate::page_task_queue::{use crate::page_task_queue::{PostParseLifecycleWork, PostParsePageOwnedWork};use crate::parser::HtmlParser;use crate::planning::{- PreparedScript, PreparedScriptRuntimeGeneration, PreparedScriptSourceLoadOutcome,- ScriptFetchMetadata, ScriptSource, SharedScriptSourceLoad,+ PreparedScript, PreparedScriptSourceLoadOutcome, ScriptFetchMetadata, ScriptSource,+ SharedScriptSourceLoad,};use crate::runtime::{RendererOwnerResourceActivitySource, RendererPageCommand, RendererRuntimeObservableSourceItem,@@ -1851,9 +1851,6 @@ fn prepared_external_module_for_page_vm_test_with_node(base_url: url.clone(),url,host_script_handle: None,- runtime_generation: PreparedScriptRuntimeGeneration::Live(- page_vm.vm().document_runtime.runtime_reset_generation(),- ),}}@@ -2081,9 +2078,6 @@ fn prepared_inline_module_for_page_vm_test(base_url: page_vm.vm().document_runtime.document_url().clone(),url: page_vm.vm().document_runtime.document_url().clone(),host_script_handle: None,- runtime_generation: PreparedScriptRuntimeGeneration::Live(- page_vm.vm().document_runtime.runtime_reset_generation(),- ),}}@@ -2104,9 +2098,6 @@ fn prepared_loaded_classic_for_page_vm_test(base_url: page_vm.vm().document_runtime.document_url().clone(),url: page_vm.vm().document_runtime.document_url().clone(),host_script_handle: None,- runtime_generation: PreparedScriptRuntimeGeneration::Live(- page_vm.vm().document_runtime.runtime_reset_generation(),- ),}}@@ -2159,9 +2150,6 @@ fn append_parser_owned_external_classic_defer_for_page_vm_test(base_url: script_url.clone(),url: script_url,host_script_handle: Some(host_script_handle),- runtime_generation: PreparedScriptRuntimeGeneration::Live(- page_vm.vm().document_runtime.runtime_reset_generation(),- ),}}diff --git a/moli-renderer-v8/src/runtime/phase_one/mod.rs b/moli-renderer-v8/src/runtime/phase_one/mod.rsindex 7dba8a46c..c22a49215 100644--- a/moli-renderer-v8/src/runtime/phase_one/mod.rs+++ b/moli-renderer-v8/src/runtime/phase_one/mod.rs@@ -1688,7 +1688,6 @@ document.body.setAttribute('data-error-state', [base_url: url.clone(),url,host_script_handle: None,- runtime_generation: crate::planning::PreparedScriptRuntimeGeneration::PendingBinding,}}diff --git a/moli-renderer-v8/src/runtime/phase_one/parser_turn.rs b/moli-renderer-v8/src/runtime/phase_one/parser_turn.rsindex d67c4ed43..1b73e63cd 100644--- a/moli-renderer-v8/src/runtime/phase_one/parser_turn.rs+++ b/moli-renderer-v8/src/runtime/phase_one/parser_turn.rs@@ -403,14 +403,6 @@ fn script_handoff_from_main_parser_blocking_execution(pub(super) fn bind_parser_owned_script_handle(page_vm: &mut PageVm, script: &mut PreparedScript) {if script.host_script_handle.is_some() {- if matches!(- script.runtime_generation,- crate::planning::PreparedScriptRuntimeGeneration::PendingBinding- ) {- script.runtime_generation = crate::planning::PreparedScriptRuntimeGeneration::Live(- page_vm.vm().document_runtime.runtime_reset_generation(),- );- }return;}let handle = page_vm@@ -428,9 +420,6 @@ pub(super) fn bind_parser_owned_script_handle(page_vm: &mut PageVm, script: &mut),);script.host_script_handle = Some(handle);- script.runtime_generation = crate::planning::PreparedScriptRuntimeGeneration::Live(- page_vm.vm().document_runtime.runtime_reset_generation(),- );}pub(super) struct ParserDriver<'loader, 'state> {diff --git a/moli-renderer-v8/src/runtime/phase_one/streaming.rs b/moli-renderer-v8/src/runtime/phase_one/streaming.rsindex 1acb3930e..7c4d0746a 100644--- a/moli-renderer-v8/src/runtime/phase_one/streaming.rs+++ b/moli-renderer-v8/src/runtime/phase_one/streaming.rs@@ -1041,7 +1041,6 @@ mod tests {base_url: url.clone(),url,host_script_handle: None,- runtime_generation: crate::planning::PreparedScriptRuntimeGeneration::PendingBinding,}}diff --git a/moli-renderer-v8/src/runtime/script_preloads.rs b/moli-renderer-v8/src/runtime/script_preloads.rsindex 4aaf634a5..f17a652ba 100644--- a/moli-renderer-v8/src/runtime/script_preloads.rs+++ b/moli-renderer-v8/src/runtime/script_preloads.rs@@ -1043,7 +1043,6 @@ impl BufferedScriptPreloadRequest {base_url: self.url.clone(),initiator_url: self.initiator_url.clone(),host_script_handle: None,- runtime_generation: crate::planning::PreparedScriptRuntimeGeneration::PendingBinding,}}diff --git a/moli-renderer-v8/src/script_vm.rs b/moli-renderer-v8/src/script_vm.rsindex 62d9172ee..c04bd47d4 100644--- a/moli-renderer-v8/src/script_vm.rs+++ b/moli-renderer-v8/src/script_vm.rs@@ -617,7 +617,7 @@ use super::{JsContextHost, JsContextHostBridgeRef, RuntimeObservableContextToken,SharedPrebootstrappedChildDefaultContexts, node_runtime_and_handle_from_object,},- planning::{PreparedScript, PreparedScriptRuntimeGeneration},+ planning::PreparedScript,renderer_resource_scheduler::RendererResourceScheduler,runtime::{RendererActivityDiagnostics, RendererInputDispatchOutcome, RendererPageContextCancelReason,@@ -6113,37 +6113,7 @@ impl ScriptVm {handle}- fn prepared_script_is_bound_for_live_execution(&mut self, script: &PreparedScript) -> bool {- match script.runtime_generation {- PreparedScriptRuntimeGeneration::PendingBinding => {- let node_is_live_script = self- .document_runtime- .dom_host()- .node(script.node_id)- .is_some_and(|node| node.is_connected() && node.is_script_element());- self.record_runtime_warning(format_args!(- "skipping prepared script `{}` because runtime generation is still pending binding",- script.url- ));- debug_assert!(- !node_is_live_script,- "prepared script execution requires a live runtime generation binding"- );- return false;- }- PreparedScriptRuntimeGeneration::Live(runtime_generation)- if runtime_generation != self.document_runtime.runtime_reset_generation() =>- {- self.record_runtime_warning(format_args!(- "skipping stale prepared script `{}` because generation {} != live {}",- script.url,- runtime_generation,- self.document_runtime.runtime_reset_generation()- ));- return false;- }- PreparedScriptRuntimeGeneration::Live(_) => {}- }+ fn prepared_script_is_live_for_execution(&mut self, script: &PreparedScript) -> bool {let Some(handle) = script.host_script_handle.as_deref() else {let allow_missing_handle = script.kind == ScriptKind::Classic&& script.source_kind == ScriptSourceKind::Inline@@ -7627,7 +7597,7 @@ impl ScriptVm {>,>,) -> std::result::Result<Option<PreparedScriptRunInput>, PreparedScriptExecutionError> {- if !self.prepared_script_is_bound_for_live_execution(script) {+ if !self.prepared_script_is_live_for_execution(script) {return Ok(None);}debug!(diff --git a/moli-renderer-v8/src/script_vm/main_document_post_parse_body.rs b/moli-renderer-v8/src/script_vm/main_document_post_parse_body.rsindex cbd61d9cd..67cb17368 100644--- a/moli-renderer-v8/src/script_vm/main_document_post_parse_body.rs+++ b/moli-renderer-v8/src/script_vm/main_document_post_parse_body.rs@@ -23,9 +23,8 @@ impl ScriptVm {pub(crate) fn current_main_document_post_parse_owner(&self,) -> Option<MainDocumentPostParseOwner> {- self.current_main_document_task_owner().map(|owner| {- MainDocumentPostParseOwner::new(owner, self.document_runtime.runtime_reset_generation())- })+ self.current_main_document_task_owner()+ .map(MainDocumentPostParseOwner::new)}fn applied_main_document_post_parse_target(@@ -75,14 +74,14 @@ impl ScriptVm {)}MainDocumentPostParseWork::DispatchContentSecurityPolicyViolation(task) => {- if task.runtime_generation() != selected_owner.runtime_generation() {+ if task.owner() != selected_owner.document_owner() {return MainDocumentPostParseWork::DispatchContentSecurityPolicyViolation(task).discarded_stale(self.current_main_document_post_parse_owner());}let settlement = match self.dispatch_content_security_policy_violation_event_body(&task){- ContentSecurityPolicyViolationBodyExecution::DiscardedStaleRuntime => {+ ContentSecurityPolicyViolationBodyExecution::DiscardedStaleDocument => {return MainDocumentPostParseWork::DispatchContentSecurityPolicyViolation(task,)diff --git a/moli-renderer-v8/src/script_vm/page_task_enqueue.rs b/moli-renderer-v8/src/script_vm/page_task_enqueue.rsindex 32180e206..240c9fbca 100644--- a/moli-renderer-v8/src/script_vm/page_task_enqueue.rs+++ b/moli-renderer-v8/src/script_vm/page_task_enqueue.rs@@ -456,10 +456,9 @@ impl ScriptVm {));return;};- let runtime_generation = self.document_runtime.runtime_reset_generation();let producer = self.post_domcontentloaded_page_task_tx- .bind_main_document_runtime_producer(document_owner, runtime_generation);+ .bind_main_document_runtime_producer(document_owner);if producer.send_post_parse_work_when_ready(work).is_err() {self.record_runtime_warning(format_args!("main-Document runtime work could not bind its ready-source admission"@@ -480,7 +479,7 @@ impl ScriptVm {}let continuation = self.page_runtime_wake_tx- .bind_main_document_runtime_continuation(document_owner, runtime_generation);+ .bind_main_document_runtime_continuation(document_owner);if continuation.send_runtime_script_continuation().is_ok() {self.queued_main_document_runtime_continuation_generation = Some(runtime_generation);} else {@@ -514,7 +513,7 @@ impl ScriptVm {}let queued = self.page_runtime_wake_tx- .bind_main_document_runtime_continuation(document_owner, runtime_generation)+ .bind_main_document_runtime_continuation(document_owner).send_parser_owned_module_continuation().is_ok();if queued {diff --git a/moli-renderer-v8/src/script_vm/post_parse_lifecycle.rs b/moli-renderer-v8/src/script_vm/post_parse_lifecycle.rsindex 69eead6b6..5f9e09d6f 100644--- a/moli-renderer-v8/src/script_vm/post_parse_lifecycle.rs+++ b/moli-renderer-v8/src/script_vm/post_parse_lifecycle.rs@@ -38,7 +38,6 @@ use crate::page_task_queue::{post_parse_lifecycle_queue_stats,};use crate::planning::PreparedScript;-use crate::planning::PreparedScriptRuntimeGeneration;use crate::script_vm::{ImmediateRuntimeScriptWorkSignal, ParserFinishDomContentLoadedTask,ParserFinishDomContentLoadedWork, PostParseDriverStep, PostParseLifecycleAdvance,@@ -465,7 +464,7 @@ impl ScriptVm {}let queued = self.page_runtime_wake_tx- .bind_main_document_runtime_continuation(document_owner, runtime_generation)+ .bind_main_document_runtime_continuation(document_owner).send_runtime_module_continuation().is_ok();if queued {@@ -2118,9 +2117,6 @@ impl ScriptVm {base_url: Url::parse("https://example.com/pending-runtime.js").unwrap(),initiator_url: Url::parse("https://example.com/").unwrap(),host_script_handle: None,- runtime_generation: PreparedScriptRuntimeGeneration::Live(- self.document_runtime.runtime_reset_generation(),- ),}}@@ -2171,9 +2167,6 @@ impl ScriptVm {base_url: self.document_runtime.document_url().clone(),initiator_url: self.document_runtime.document_url().clone(),host_script_handle: Some(host_script_handle),- runtime_generation: PreparedScriptRuntimeGeneration::Live(- self.document_runtime.runtime_reset_generation(),- ),};self.document_runtime.runtime_script_work_mut()@@ -2199,10 +2192,7 @@ impl ScriptVm {};let continuation = self.page_runtime_wake_tx- .bind_main_document_runtime_continuation(- document_owner,- self.document_runtime.runtime_reset_generation(),- );+ .bind_main_document_runtime_continuation(document_owner);self.document_runtime.runtime_script_work_mut().dynamic_scripts@@ -2288,14 +2278,6 @@ impl ScriptVm {script: &mut PreparedScript,source: ScriptHandleSource,) {- if matches!(- script.runtime_generation,- PreparedScriptRuntimeGeneration::PendingBinding- ) {- script.runtime_generation = PreparedScriptRuntimeGeneration::Live(- self.document_runtime.runtime_reset_generation(),- );- }let allow_missing_handle = script.kind == ScriptKind::Classic&& script.source_kind == ScriptSourceKind::Inline&& script.mode == ScriptMode::Normal;diff --git a/moli-renderer-v8/src/script_vm/security_policy.rs b/moli-renderer-v8/src/script_vm/security_policy.rsindex 611b812b3..bf37ce879 100644--- a/moli-renderer-v8/src/script_vm/security_policy.rs+++ b/moli-renderer-v8/src/script_vm/security_policy.rs@@ -13,11 +13,11 @@ use crate::{/// Body-only result for one queued `securitypolicyviolation` task.///-/// Runtime-generation rejection happens before entering V8. Once dispatch is+/// Exact-Document rejection happens before entering V8. Once dispatch is/// attempted, its `Result` remains separate so a best-effort failure cannot be/// mistaken for a stale task that owes no task-end checkpoint.pub(super) enum ContentSecurityPolicyViolationBodyExecution {- DiscardedStaleRuntime,+ DiscardedStaleDocument,DispatchAttempted(Result<()>),}@@ -83,8 +83,8 @@ impl ScriptVm {&mut self,task: &ContentSecurityPolicyViolationEventTask,) -> ContentSecurityPolicyViolationBodyExecution {- if task.runtime_generation() != self.document_runtime.runtime_reset_generation() {- return ContentSecurityPolicyViolationBodyExecution::DiscardedStaleRuntime;+ if self.current_main_document_task_owner() != Some(task.owner()) {+ return ContentSecurityPolicyViolationBodyExecution::DiscardedStaleDocument;}let result = self.renderer_document_isolatediff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/security_policy.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/security_policy.rsindex e804ed4e1..5ac058326 100644--- a/moli-renderer-v8/src/script_vm/tests/browser_api/security_policy.rs+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/security_policy.rs@@ -1024,7 +1024,6 @@ async fn prepared_parser_inline_script_csp_blocks_before_v8_execution_and_reportbase_url: document_url.clone(),initiator_url: document_url,host_script_handle: Some(host_script_handle),- runtime_generation: PreparedScriptRuntimeGeneration::Live(0),};vm.execute_loaded_prepared_script_source(&script, source, None).awaitdiff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/trusted_types.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/trusted_types.rsindex a37ba228d..ca72c3df3 100644--- a/moli-renderer-v8/src/script_vm/tests/browser_api/trusted_types.rs+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/trusted_types.rs@@ -437,7 +437,6 @@ fn inline_module_graph_roots_use_trusted_types_compliant_source() {);let document_url = vm.document_runtime.document_url().clone();- let generation = vm.document_runtime.runtime_reset_generation();let prepared = |node_id, position| PreparedScript {position,node_id,@@ -450,7 +449,6 @@ fn inline_module_graph_roots_use_trusted_types_compliant_source() {base_url: document_url.clone(),initiator_url: document_url.clone(),host_script_handle: None,- runtime_generation: PreparedScriptRuntimeGeneration::Live(generation),};let html_module = prepared(html_script, 1);let svg_module = prepared(svg_script, 2);diff --git a/moli-renderer-v8/src/script_vm/tests/mod.rs b/moli-renderer-v8/src/script_vm/tests/mod.rsindex ec3bb645e..666b9e60f 100644--- a/moli-renderer-v8/src/script_vm/tests/mod.rs+++ b/moli-renderer-v8/src/script_vm/tests/mod.rs@@ -27,8 +27,8 @@ use crate::page_task_queue::{use crate::page_task_queue::{PostParseLifecycleQueueStats, PostParsePageOwnedWork};use crate::parser::HtmlParser;use crate::planning::{- ParserPlanningReadView, PrepareScriptOutcome, PreparedScript, PreparedScriptRuntimeGeneration,- build_prepared_script, classify_parser_script,+ ParserPlanningReadView, PrepareScriptOutcome, PreparedScript, build_prepared_script,+ classify_parser_script,};use crate::runtime::PageDomManipulationTestFamily;use crate::types::{@@ -7403,7 +7403,6 @@ async fn child_module_producer_boundaries_require_exact_task_owner() {base_url: request_url.clone(),initiator_url: request_url,host_script_handle: None,- runtime_generation: crate::planning::PreparedScriptRuntimeGeneration::PendingBinding,};let document_owner = owner.document_owner();vm._context_host@@ -7581,7 +7580,6 @@ globalThis.__childParserModuleEvalValue = 144;"#base_url: key.url().clone(),initiator_url: key.url().clone(),host_script_handle: None,- runtime_generation: crate::planning::PreparedScriptRuntimeGeneration::PendingBinding,};let pending_script_id = vm._context_host@@ -8205,7 +8203,6 @@ parent.__childParserModuleTlaEvents.push("module-after");"#base_url: key.url().clone(),initiator_url: key.url().clone(),host_script_handle: None,- runtime_generation: crate::planning::PreparedScriptRuntimeGeneration::PendingBinding,};let pending_script_id = vm._context_host@@ -8386,7 +8383,6 @@ async fn child_parser_module_graph_failure_dispatches_error_from_scheduler_lane(base_url: key.url().clone(),initiator_url: key.url().clone(),host_script_handle: None,- runtime_generation: crate::planning::PreparedScriptRuntimeGeneration::PendingBinding,};let pending_script_id = vm._context_hostdiff --git a/moli-renderer-v8/src/script_vm/tests/post_parse.rs b/moli-renderer-v8/src/script_vm/tests/post_parse.rsindex 12f91cfb7..a0d4e92a2 100644--- a/moli-renderer-v8/src/script_vm/tests/post_parse.rs+++ b/moli-renderer-v8/src/script_vm/tests/post_parse.rs@@ -74,7 +74,6 @@ fn ready_dynamic_runtime_script(position: usize) -> PreparedScript {base_url: Url::parse(&format!("https://example.com/dynamic-{position}.js")).unwrap(),initiator_url: Url::parse("https://example.com/").unwrap(),host_script_handle: None,- runtime_generation: PreparedScriptRuntimeGeneration::PendingBinding,}}@@ -242,7 +241,6 @@ fn ready_dynamic_runtime_module_script(position: usize, node_id: NodeId) -> Prepbase_url: Url::parse(&format!("https://example.com/dynamic-module-{position}.js")).unwrap(),initiator_url: Url::parse("https://example.com/").unwrap(),host_script_handle: Some(format!("runtime-module-{position}")),- runtime_generation: PreparedScriptRuntimeGeneration::Live(0),}}@@ -289,7 +287,6 @@ fn external_script_redirect_final_url_obeys_script_src_csp() {base_url: Url::parse("https://app.test/redirect.js").unwrap(),initiator_url: Url::parse("https://app.test/page.html").unwrap(),host_script_handle: None,- runtime_generation: PreparedScriptRuntimeGeneration::PendingBinding,};let final_url = Url::parse("https://cdn.test/final.js").unwrap();let response = Ok(crate::types::NavigationResponse::from_head_and_text_body(@@ -3228,7 +3225,6 @@ fn explicitly_domcontentloaded_gated_runtime_head_is_not_admitted_early() {let mut script = ready_dynamic_runtime_script(9);script.node_id = script_node;script.host_script_handle = Some(handle);- script.runtime_generation = PreparedScriptRuntimeGeneration::Live(0);vm.document_runtime.runtime_script_work_mut().dynamic_scripts@@ -3294,7 +3290,6 @@ async fn reentrant_runtime_admission_survives_page_task_claim_in_stable_authoritlet mut script = ready_dynamic_runtime_script(8);script.node_id = script_node;script.host_script_handle = Some("runtime-classic-8".to_owned());- script.runtime_generation = PreparedScriptRuntimeGeneration::Live(0);script.source_kind = ScriptSourceKind::Inline;script.source = ScriptSource::Inline("globalThis.runtimeClassicRan = true;".to_owned());let owner = vm@@ -3333,7 +3328,6 @@ async fn reentrant_runtime_admission_survives_page_task_claim_in_stable_authoritlet mut second_script = ready_dynamic_runtime_script(9);second_script.node_id = second_script_node;second_script.host_script_handle = Some(second_handle);- second_script.runtime_generation = PreparedScriptRuntimeGeneration::Live(0);second_script.source_kind = ScriptSourceKind::Inline;second_script.source =ScriptSource::Inline("globalThis.runtimeClassicSecondRan = true;".to_owned());@@ -3567,7 +3561,6 @@ fn runtime_dynamic_script_terminal_consumes_its_accepted_document_lease_inline()script.kind = ScriptKind::Module;script.source_kind = ScriptSourceKind::Inline;script.source = ScriptSource::Inline("globalThis.__dynamicBindingRan = true;".to_owned());- script.runtime_generation = PreparedScriptRuntimeGeneration::Live(0);let owner = vm.current_main_document_task_owner()@@ -3699,7 +3692,6 @@ fn runtime_owned_inline_importmap_bypasses_dcl_gate() {base_url: Url::parse("https://example.com/").unwrap(),initiator_url: Url::parse("https://example.com/").unwrap(),host_script_handle: Some(handle),- runtime_generation: PreparedScriptRuntimeGeneration::Live(0),};assert!(@@ -3929,7 +3921,6 @@ fn document_write_owned_inline_normal_defers_already_started_until_execution_witbase_url: Url::parse("https://example.com/inline.js").unwrap(),initiator_url: Url::parse("https://example.com/").unwrap(),host_script_handle: None,- runtime_generation: PreparedScriptRuntimeGeneration::PendingBinding,};assert!(