From 66675db7117f3564e839ff68c19a5260245c7ef1 Mon Sep 17 00:00:00 2001 From: ldm0 Date: Sun, 27 Sep 2026 04:43:47 +0800 Subject: [PATCH] fix(runtime): reconcile WPT changes with native state on main Restore native History cursors from sparse serialized positions, preserve shared Window history across isolated realms, and keep entry identity and structured state through document.open and cross-realm settlement. Move event subclass and precommit state access onto shared native backing. Respect published iframe layout snapshots and align history, rendering, and rejection tests with their owning task boundaries. Remove duplicate upstream tests and obsolete helpers from the main rebase. Validation: cargo fmt --all; workspace/all-targets/all-features Clippy with -D warnings; full Nextest (20,319 passed, 16 skipped); fresh CLI HTTP/CDP fetch resource timing fixture (36/36). Build and tests used 32-way parallelism. --- moli-core/tests/web_apis/abort_signal.rs | 2 +- .../nested_history.rs | 10 +- moli-renderer-v8/src/context_bootstrap.rs | 2 +- .../events/subclasses/data.rs | 23 ++-- .../src/context_bootstrap/events/wrappers.rs | 27 ++++- .../src/context_bootstrap/history_mutation.rs | 40 ++----- .../history_runtime/native.rs | 2 +- .../indexed_db/event_target/dispatch.rs | 3 +- .../context_bootstrap/navigation_bootstrap.rs | 11 +- .../navigation_callbacks/navigation.rs | 3 +- .../src/context_bootstrap/navigation_entry.rs | 10 -- .../context_bootstrap/navigation_events.rs | 14 ++- .../context_bootstrap/navigation_restore.rs | 6 +- .../src/context_bootstrap/navigation_seed.rs | 25 ++-- .../context_bootstrap/navigation_serialize.rs | 3 +- .../navigation_surface/runtime.rs | 4 +- .../src/document_runtime/document_write.rs | 18 +-- .../src/document_runtime/events.rs | 6 + moli-renderer-v8/src/host/events.rs | 3 +- moli-renderer-v8/src/host/timers.rs | 12 ++ .../context_host/host_environment.rs | 11 +- .../src/native_bridge/context_host/layout.rs | 36 ------ .../runtime/page_vm/tests/user_interaction.rs | 4 +- .../tests/extracted/owner_lifecycle.rs | 4 +- .../extracted/page_lifecycle_isolation.rs | 36 ++++-- .../src/script_vm/page_task_enqueue.rs | 6 + .../tests/browser_api/history_worlds.rs | 110 ++++++++++++++++-- .../navigation/element_navigation.rs | 79 +------------ .../navigation/history_traversal.rs | 5 +- .../script_vm/tests/browser_api/traversal.rs | 10 ++ .../stylesheet_and_document_lifecycle.rs | 13 ++- .../script_vm/tests/dom_xhr/cors_preflight.rs | 2 +- .../script_vm/tests/dom_xhr/forms/dialog.rs | 4 +- moli-renderer-v8/src/script_vm/tests/mod.rs | 1 + .../src/script_vm/tests/observer_documents.rs | 20 +++- moli-renderer-v8/src/util.rs | 2 +- .../webidl_callback_source_boundary_tests.rs | 4 +- .../fixtures/navigation-document-open.js | 2 + .../moli-page-types/src/navigation_history.rs | 2 - 39 files changed, 311 insertions(+), 264 deletions(-) diff --git a/moli-core/tests/web_apis/abort_signal.rs b/moli-core/tests/web_apis/abort_signal.rs index 87929a54c7c..786318393ea 100644 --- a/moli-core/tests/web_apis/abort_signal.rs +++ b/moli-core/tests/web_apis/abort_signal.rs @@ -11,7 +11,7 @@ async fn assert_abort_signal_dependencies(scenario: &str, events: &[&str]) -> Re for target in ["window", "child", "worker"] { let observed = tokio::time::timeout( Duration::from_secs(10), - super::pipe_disturbed::run_probe(&browser, &server, target, &source), + super::event_dispatch::run_probe(&browser, &server, target, &source), ) .await??; assert_eq!( diff --git a/moli-protocol/src/domains/target/tests/tests_cdp_chromium_imports/nested_history.rs b/moli-protocol/src/domains/target/tests/tests_cdp_chromium_imports/nested_history.rs index 2bf4323b1f5..f11d6861693 100644 --- a/moli-protocol/src/domains/target/tests/tests_cdp_chromium_imports/nested_history.rs +++ b/moli-protocol/src/domains/target/tests/tests_cdp_chromium_imports/nested_history.rs @@ -265,14 +265,20 @@ async fn check_interleaved_frames_after_parent_document_replacement() -> Result< .collect::>(); // The URL changes at commit, before the restored child document // finishes parsing. Read its body only after that load completes. - wait( + let loaded = wait( &mut page, &format!( "({list}).every(f=>f.contentDocument?.readyState === 'complete') && JSON.stringify(({list}).map(f=>f.contentWindow.location.href)) === {}", serde_json::to_string(&serde_json::to_string(&urls)?)? ), ) - .await?; + .await; + if let Err(error) = loaded { + let observed = snapshot(&mut page, root).await; + return Err(error.context(format!( + "popup={popup}, {layout}: traversing {urls:?}; observed={observed:?}" + ))); + } let current = snapshot(&mut page, root).await.with_context(|| { format!("popup={popup}, {layout}: traversed child entries {urls:?}") })?; diff --git a/moli-renderer-v8/src/context_bootstrap.rs b/moli-renderer-v8/src/context_bootstrap.rs index a98e24daf51..7db412dcfde 100644 --- a/moli-renderer-v8/src/context_bootstrap.rs +++ b/moli-renderer-v8/src/context_bootstrap.rs @@ -126,11 +126,11 @@ pub(crate) use navigation_window::{ mod navigator_runtime; mod platform_object_worlds; mod session_history; +mod session_history_traversal; mod shared_event_targets; pub(crate) use shared_event_targets::resolve_event_target; #[cfg(test)] pub(crate) use shared_event_targets::{bind_dispatch_target, bind_shared_target}; -mod session_history_traversal; mod world_wrappers; #[cfg(test)] pub(crate) use navigator_runtime::{ diff --git a/moli-renderer-v8/src/context_bootstrap/events/subclasses/data.rs b/moli-renderer-v8/src/context_bootstrap/events/subclasses/data.rs index d393de0c43e..853d79aa038 100644 --- a/moli-renderer-v8/src/context_bootstrap/events/subclasses/data.rs +++ b/moli-renderer-v8/src/context_bootstrap/events/subclasses/data.rs @@ -292,6 +292,12 @@ pub(in crate::context_bootstrap) fn run_navigate_event_precommit_handlers<'s>( } install_navigate_event_precommit_transition(scope, event); let controller = create_precommit_controller(scope, event); + crate::context_bootstrap::set_event_private_value( + scope, + event, + NAVIGATE_EVENT_PRECOMMIT_CONTROLLER_SLOT, + controller.into(), + ); let arguments = [controller.into()]; run_navigation_handler_array( scope, @@ -367,16 +373,9 @@ fn create_precommit_controller<'s>( scope: &mut v8::PinScope<'s, '_>, event: v8::Local<'s, v8::Object>, ) -> v8::Local<'s, v8::Object> { - let controller = PrecommitControllerDeclaration::new(event, true) + PrecommitControllerDeclaration::new(event, true) .bind(scope) - .expect("precommit controller declaration should bind"); - set_private_value( - scope, - event, - NAVIGATE_EVENT_PRECOMMIT_CONTROLLER_SLOT, - controller.into(), - ); - controller + .expect("precommit controller declaration should bind") } fn precommit_controller_event<'s>( @@ -395,7 +394,7 @@ fn precommit_controller_event<'s>( } let event = get_private_value(scope, controller, PRECOMMIT_CONTROLLER_EVENT_SLOT) .and_then(|value| v8::Local::::try_from(value).ok())?; - let owner_is_active = get_private_value( + let owner_is_active = crate::context_bootstrap::event_private_value( scope, event, NAVIGATE_EVENT_PRECOMMIT_TRANSITION_NAVIGATION_SLOT, @@ -407,7 +406,7 @@ fn precommit_controller_event<'s>( }); if !owner_is_active || !navigate_event_target_is_connected(scope, event) - || object_bool_property(scope, event, "defaultPrevented").unwrap_or(false) + || crate::context_bootstrap::event_bool_attribute(scope, event, "defaultPrevented") { navigate_event_throw_invalid_state(scope); return None; @@ -489,7 +488,7 @@ fn precommit_controller_redirect_callback<'s>( navigate_event_throw_invalid_state(scope); return; }; - let Some(navigation) = get_private_value( + let Some(navigation) = crate::context_bootstrap::event_private_value( scope, event, NAVIGATE_EVENT_PRECOMMIT_TRANSITION_NAVIGATION_SLOT, diff --git a/moli-renderer-v8/src/context_bootstrap/events/wrappers.rs b/moli-renderer-v8/src/context_bootstrap/events/wrappers.rs index bf27c0f84a5..2d620b6bcdf 100644 --- a/moli-renderer-v8/src/context_bootstrap/events/wrappers.rs +++ b/moli-renderer-v8/src/context_bootstrap/events/wrappers.rs @@ -11,8 +11,7 @@ use crate::context_bootstrap::{exposed_interfaces, world_wrappers}; pub(in crate::context_bootstrap) use moli_webapi::events::state::event_value_attribute_getter; pub(crate) use moli_webapi::events::state::{ - event_attribute, event_bool_attribute, event_private_value, new_event_state, - set_event_private_value, + event_bool_attribute, event_private_value, new_event_state, set_event_private_value, }; const EVENT_ATTRIBUTE_GETTERS_SLOT: &str = "__moliEventAttributeGetters"; @@ -321,6 +320,30 @@ pub(super) fn event_attribute_in_wrapper<'s>( AttributeProjection::for_property(property).project(scope, wrapper, value) } +/// Engine reads must bypass the public wrapper, including own shadows and +/// getters. Constructors initialize these fields on the private state directly. +pub(crate) fn event_attribute<'s>( + scope: &mut v8::PinScope<'s, '_>, + event: v8::Local<'_, v8::Object>, + property: &str, +) -> Option> { + let state = event_backing(scope, event); + // CommandEvent and ToggleEvent expose source through prototype accessors; + // their native state holds the value in a private slot, not an own field. + if property == "source" { + match event_subclass_kind(scope, state) { + Some(EventSubclassKind::CommandEvent) => { + return get_private_value(scope, state, COMMAND_EVENT_SOURCE_SLOT); + } + Some(EventSubclassKind::ToggleEvent) => { + return get_private_value(scope, state, TOGGLE_EVENT_SOURCE_SLOT); + } + _ => {} + } + } + moli_webapi::events::state::event_attribute(scope, state, property) +} + #[cfg(test)] mod tests { use super::*; diff --git a/moli-renderer-v8/src/context_bootstrap/history_mutation.rs b/moli-renderer-v8/src/context_bootstrap/history_mutation.rs index 3acec70fb7b..3169f33d7ed 100644 --- a/moli-renderer-v8/src/context_bootstrap/history_mutation.rs +++ b/moli-renderer-v8/src/context_bootstrap/history_mutation.rs @@ -46,38 +46,22 @@ pub(crate) fn update_history_for_document_open<'s>( let Some(history) = window_history_for_holder(scope, window) else { return; }; - let Some(entries) = history_entries(scope, history) else { + let Some(history_record) = super::history_runtime::native::history(scope, history) else { return; }; - let index = history_index(scope, history); - let Some(previous) = entries - .get_index(scope, index) - .and_then(|value| v8::Local::::try_from(value).ok()) - else { + let Some(previous_record) = history_record.borrow().current_entry().cloned() else { return; }; - let navigation_index = navigation_current_entry_index(scope, window).unwrap_or(index); - let key = navigation_entry_key_value(scope, previous) - .unwrap_or_else(|| new_navigation_entry_key().as_str().to_owned()); - let state = - clone_history_entry_state(scope, previous).unwrap_or_else(|| v8::null(scope).into()); - let state_json = stringify_history_state(scope, state); - let entry = create_navigation_entry( - scope, - window, - url.as_str(), - state_json.as_deref(), - None, - None, - navigation_index, - &new_navigation_entry_id(), - &key, - ); - copy_navigation_entry_document_id(scope, previous, entry); - bind_navigation_entry_runtime_owner(scope, entry, window); - set_history_entry_state(scope, entry, state); - let _ = entries.set_index(scope, index, entry.into()); - set_history_entries(scope, history, entries); + let previous = + super::history_runtime::native::entry_wrapper(scope, window, previous_record.clone()); + let mut record = previous_record.borrow().clone(); + record.url = url.as_str().to_owned(); + record.id = + super::navigation_entry::navigation_entry_public_token(new_navigation_entry_id().as_str()); + let entry = super::history_runtime::native::entry_wrapper(scope, window, record.into_ref()); + let state = super::history_runtime::state::history_state_value(scope, history); + replace_history_entry(scope, history, entry); + cache_current_history_state(scope, history, state); sync_navigation_current_entry_from_history_entry(scope, window, entry); super::session_history::commit( scope, diff --git a/moli-renderer-v8/src/context_bootstrap/history_runtime/native.rs b/moli-renderer-v8/src/context_bootstrap/history_runtime/native.rs index 4bcbdde51f1..0d463592888 100644 --- a/moli-renderer-v8/src/context_bootstrap/history_runtime/native.rs +++ b/moli-renderer-v8/src/context_bootstrap/history_runtime/native.rs @@ -165,7 +165,7 @@ pub(in crate::context_bootstrap) fn find_entry_wrapper<'s>( }; for candidate in candidates { if let Some(wrapper) = candidate.to_local(scope) - && wrapper.get_creation_context(scope) == Some(context) + && super::super::world_wrappers::belongs_to_world(scope, wrapper, context) { return Some(wrapper); } diff --git a/moli-renderer-v8/src/context_bootstrap/indexed_db/event_target/dispatch.rs b/moli-renderer-v8/src/context_bootstrap/indexed_db/event_target/dispatch.rs index 4a9c7938994..4877f128737 100644 --- a/moli-renderer-v8/src/context_bootstrap/indexed_db/event_target/dispatch.rs +++ b/moli-renderer-v8/src/context_bootstrap/indexed_db/event_target/dispatch.rs @@ -35,7 +35,8 @@ pub(in crate::context_bootstrap::indexed_db) fn dispatch_idb_named_event_with_re event_type == "error", ); events::mark_event_trusted(scope, event); - extras(scope, event); + let backing = events::event_backing(scope, event); + extras(scope, backing); dispatch_idb_event_object_with_result(scope, target, event) } diff --git a/moli-renderer-v8/src/context_bootstrap/navigation_bootstrap.rs b/moli-renderer-v8/src/context_bootstrap/navigation_bootstrap.rs index 5b5e726b931..3297ff7c56c 100644 --- a/moli-renderer-v8/src/context_bootstrap/navigation_bootstrap.rs +++ b/moli-renderer-v8/src/context_bootstrap/navigation_bootstrap.rs @@ -113,6 +113,11 @@ pub(crate) fn reset_window_location_history_navigation_runtime_state<'s>( window: v8::Local<'s, v8::Object>, href: &str, ) -> Result<()> { + // A child isolated realm shares the default Window's native records. + // Guard the entire reset, including History and Navigation ownership. + if window_has_shared_history(scope, window) { + return Ok(()); + } reset_window_location_runtime_state(scope, window, href)?; let initial_seed = initial_navigation_history_seed(scope, window, href); @@ -123,9 +128,9 @@ pub(crate) fn reset_window_location_history_navigation_runtime_state<'s>( set_runtime_window_owner(scope, history, window); install_history_scroll_restoration_runtime_state(scope, history, "auto"); install_history_state_runtime_state(scope, history, v8::null(scope).into()); - let entries = build_history_entries_from_seed(scope, window, &initial_seed); + let (entries, current_index) = build_history_entries_from_seed(scope, window, &initial_seed); let current_entry = entries - .get(initial_seed.current_index as usize) + .get(current_index as usize) .map(|entry| entry_wrappers::for_window(scope, window, entry.clone())) .unwrap_or_else(|| { build_current_navigation_entry_from_seed( @@ -136,7 +141,7 @@ pub(crate) fn reset_window_location_history_navigation_runtime_state<'s>( ) }); set_history_entries(scope, history, entries); - set_history_index(scope, history, initial_seed.current_index); + set_history_index(scope, history, current_index); set_private_value(scope, window, WINDOW_HISTORY_SLOT, history.into()); let navigation = match window_runtime_object(scope, window, WINDOW_NAVIGATION_SLOT) { diff --git a/moli-renderer-v8/src/context_bootstrap/navigation_callbacks/navigation.rs b/moli-renderer-v8/src/context_bootstrap/navigation_callbacks/navigation.rs index 5bbd365735f..3074776617d 100644 --- a/moli-renderer-v8/src/context_bootstrap/navigation_callbacks/navigation.rs +++ b/moli-renderer-v8/src/context_bootstrap/navigation_callbacks/navigation.rs @@ -1175,9 +1175,8 @@ fn precommit_commit_fulfilled_callback<'s>( Some("reload"), ); } - let receiver = v8::undefined(scope).into(); if let Some(resolve) = data.committed_resolve { - let _ = resolve.call(scope, receiver, &[resolved_value]); + settle_navigation_finished_resolved_immediately(scope, resolve, resolved_value); } resolve_navigation_transition_committed(scope, data.navigation); let outcome = NavigationDispatchOutcome { diff --git a/moli-renderer-v8/src/context_bootstrap/navigation_entry.rs b/moli-renderer-v8/src/context_bootstrap/navigation_entry.rs index e913dcc1363..de440e1028f 100644 --- a/moli-renderer-v8/src/context_bootstrap/navigation_entry.rs +++ b/moli-renderer-v8/src/context_bootstrap/navigation_entry.rs @@ -196,16 +196,6 @@ pub(super) fn navigation_entry_origin<'s>( navigation_entry_stored_string(scope, entry, EntryStringField::Origin) } -pub(super) fn set_navigation_entry_origin<'s>( - scope: &mut v8::PinScope<'s, '_>, - entry: v8::Local<'s, v8::Object>, - origin: &str, -) { - if let Some(entry) = native::entry(scope, entry) { - entry.borrow_mut().document_origin = origin.to_owned(); - } -} - pub(super) fn navigation_entries_share_origin<'s>( scope: &mut v8::PinScope<'s, '_>, left: v8::Local<'s, v8::Object>, diff --git a/moli-renderer-v8/src/context_bootstrap/navigation_events.rs b/moli-renderer-v8/src/context_bootstrap/navigation_events.rs index 6603ed02408..d9bf9270cd3 100644 --- a/moli-renderer-v8/src/context_bootstrap/navigation_events.rs +++ b/moli-renderer-v8/src/context_bootstrap/navigation_events.rs @@ -900,9 +900,12 @@ pub(super) fn finish_navigation_precommit<'s>( scope: &mut v8::PinScope<'s, '_>, event: v8::Local<'s, v8::Object>, ) { - if let Some(controller) = - get_private_value(scope, event, NAVIGATE_EVENT_PRECOMMIT_CONTROLLER_SLOT) - .and_then(|value| v8::Local::::try_from(value).ok()) + if let Some(controller) = crate::context_bootstrap::event_private_value( + scope, + event, + NAVIGATE_EVENT_PRECOMMIT_CONTROLLER_SLOT, + ) + .and_then(|value| v8::Local::::try_from(value).ok()) { set_private_value( scope, @@ -910,7 +913,7 @@ pub(super) fn finish_navigation_precommit<'s>( "__lmPrecommitControllerActive", v8::Boolean::new(scope, false).into(), ); - set_private_value( + crate::context_bootstrap::set_event_private_value( scope, event, NAVIGATE_EVENT_PRECOMMIT_CONTROLLER_SLOT, @@ -1257,8 +1260,9 @@ fn create_navigation_destination_for_entry<'s>( .and_then(|history| history_entries(scope, history)) .and_then(|entries| { let current = navigation_current_entry(scope, owner); + let record = super::history_runtime::native::entry(scope, entry)?; super::navigation_projection::visible_navigation_index_for_entry( - scope, entries, current, entry, + scope, &entries, current, &record, ) }) .map(|_| entry); diff --git a/moli-renderer-v8/src/context_bootstrap/navigation_restore.rs b/moli-renderer-v8/src/context_bootstrap/navigation_restore.rs index 7d43c494cb5..0d1600031cd 100644 --- a/moli-renderer-v8/src/context_bootstrap/navigation_restore.rs +++ b/moli-renderer-v8/src/context_bootstrap/navigation_restore.rs @@ -167,9 +167,9 @@ pub(crate) fn install_navigation_entry_view_for_holder<'s>( let Some(navigation) = window_navigation_for_holder(scope, owner) else { return; }; - let entries = build_history_entries_from_seed(scope, owner, entry_seed); + let (entries, current_index) = build_history_entries_from_seed(scope, owner, entry_seed); let current_entry = entries - .get(entry_seed.current_index as usize) + .get(current_index as usize) .map(|entry| entry_wrappers::for_window(scope, owner, entry.clone())) .unwrap_or_else(|| { build_current_navigation_entry_from_seed( @@ -182,7 +182,7 @@ pub(crate) fn install_navigation_entry_view_for_holder<'s>( let current_state = clone_history_entry_state(scope, current_entry).unwrap_or_else(|| v8::null(scope).into()); set_history_entries(scope, history, entries); - set_history_index(scope, history, entry_seed.current_index); + set_history_index(scope, history, current_index); cache_current_history_state(scope, history, current_state); set_navigation_current_entry(scope, navigation, current_entry); if let Some(snapshot) = entry_seed diff --git a/moli-renderer-v8/src/context_bootstrap/navigation_seed.rs b/moli-renderer-v8/src/context_bootstrap/navigation_seed.rs index 4be8d1eac09..39ba6010b01 100644 --- a/moli-renderer-v8/src/context_bootstrap/navigation_seed.rs +++ b/moli-renderer-v8/src/context_bootstrap/navigation_seed.rs @@ -54,19 +54,23 @@ pub(super) fn build_history_entries_from_seed<'s>( scope: &mut v8::PinScope<'s, '_>, owner: v8::Local<'s, v8::Object>, seed: &NavigationHistoryEntrySeed, -) -> Vec { +) -> (Vec, u32) { let mut snapshots: Vec<_> = seed.entries.iter().collect(); snapshots.sort_by_key(|snapshot| snapshot.history_index); - snapshots - .into_iter() + // Serialized history positions can have gaps after pruning. Native History + // stores a dense vector, so restore its cursor from the sorted position. + let current_index = snapshots + .iter() + .position(|entry| entry.history_index == seed.current_index) + .map_or(seed.current_index, |index| index as u32); + let current_document = snapshots + .get(current_index as usize) + .map(|entry| &entry.document_id); + let entries = snapshots + .iter() .map(|snapshot| { let entry = history_entry_from_snapshot(snapshot); - if seed - .entries - .iter() - .find(|entry| entry.history_index == seed.current_index) - .is_some_and(|current| current.document_id == snapshot.document_id) - { + if current_document.is_some_and(|document| document == &snapshot.document_id) { entry.borrow_mut().document_origin = super::navigation_entry::navigation_document_origin( scope, @@ -76,7 +80,8 @@ pub(super) fn build_history_entries_from_seed<'s>( } entry }) - .collect() + .collect(); + (entries, current_index) } pub(super) fn build_current_navigation_entry_from_seed<'s>( diff --git a/moli-renderer-v8/src/context_bootstrap/navigation_serialize.rs b/moli-renderer-v8/src/context_bootstrap/navigation_serialize.rs index 916b5a6557b..486f24087bd 100644 --- a/moli-renderer-v8/src/context_bootstrap/navigation_serialize.rs +++ b/moli-renderer-v8/src/context_bootstrap/navigation_serialize.rs @@ -1,6 +1,7 @@ use super::navigation_activation::navigation_activation_value; use super::navigation_entry::{ - history_index, navigation_current_entry, navigation_entry_referrer_policy_value, + history_index, navigation_current_entry, navigation_entry_document_id, + navigation_entry_referrer_policy_value, }; use super::navigation_window::{ child_browsing_context_handle_for_runtime_owner, runtime_window_is_global, diff --git a/moli-renderer-v8/src/context_bootstrap/navigation_surface/runtime.rs b/moli-renderer-v8/src/context_bootstrap/navigation_surface/runtime.rs index ef18d8b2468..bea57ce1b27 100644 --- a/moli-renderer-v8/src/context_bootstrap/navigation_surface/runtime.rs +++ b/moli-renderer-v8/src/context_bootstrap/navigation_surface/runtime.rs @@ -42,10 +42,10 @@ pub(in crate::context_bootstrap) fn build_history_runtime_state<'s>( anyhow::anyhow!("isolated History is missing its native Window history") })? } else { - let records = build_history_entries_from_seed(scope, window, initial_seed); + let (records, current_index) = build_history_entries_from_seed(scope, window, initial_seed); std::rc::Rc::new(std::cell::RefCell::new(moli_history::WindowHistory::new( records, - initial_seed.current_index, + current_index, ))) }; let history = HistoryRuntimeObjectDeclaration::new() diff --git a/moli-renderer-v8/src/document_runtime/document_write.rs b/moli-renderer-v8/src/document_runtime/document_write.rs index 2d3edd1ed7d..5800b24b200 100644 --- a/moli-renderer-v8/src/document_runtime/document_write.rs +++ b/moli-renderer-v8/src/document_runtime/document_write.rs @@ -52,20 +52,10 @@ struct DocumentWriteParserMutationOwner<'a, 'scope, 'pin> { enum DocumentWriteParserMutationTarget { LiveDocument, WindowlessDocument { owner_document: DomHandle }, - DetachedFragment { owner_document: DomHandle }, + DetachedFragment, } impl DocumentWriteParserMutationOwner<'_, '_, '_> { - fn owner_document_handle(&self) -> DomHandle { - match self.target { - DocumentWriteParserMutationTarget::LiveDocument => self.runtime.document_handle(), - DocumentWriteParserMutationTarget::WindowlessDocument { owner_document } - | DocumentWriteParserMutationTarget::DetachedFragment { owner_document } => { - owner_document - } - } - } - fn targets_live_document(&self) -> bool { matches!(self.target, DocumentWriteParserMutationTarget::LiveDocument) } @@ -77,7 +67,7 @@ impl ParserMutationEffectConsumer for DocumentWriteParserMutationOwner<'_, '_, ' fn consume_parser_mutation_effects(&mut self, effects: DomMutationEffects) { if matches!( self.target, - DocumentWriteParserMutationTarget::DetachedFragment { .. } + DocumentWriteParserMutationTarget::DetachedFragment ) { return; } @@ -196,7 +186,7 @@ impl ParserDomMutationConsumer for DocumentWriteParserMutationOwner<'_, '_, '_> fn apply_parser_dom_mutation(&mut self, mutation: ParserDomMutation) { if matches!( self.target, - DocumentWriteParserMutationTarget::DetachedFragment { .. } + DocumentWriteParserMutationTarget::DetachedFragment ) { let _ = mutation .apply_to_detached_dom_host(self.runtime.dom_host_mut_for_active_parser_step()); @@ -253,7 +243,7 @@ impl ParserDomMutationConsumer for DocumentWriteParserMutationOwner<'_, '_, '_> // attributes also need registration without waiting for connection. let window_handlers = if matches!( self.target, - DocumentWriteParserMutationTarget::DetachedFragment { .. } + DocumentWriteParserMutationTarget::DetachedFragment ) || self.runtime.dom_host().is_connected(node_id) { crate::native_bridge::element::ParserAddedEventHandlers::capture( diff --git a/moli-renderer-v8/src/document_runtime/events.rs b/moli-renderer-v8/src/document_runtime/events.rs index 8f140efb17b..5985297b4a5 100644 --- a/moli-renderer-v8/src/document_runtime/events.rs +++ b/moli-renderer-v8/src/document_runtime/events.rs @@ -366,6 +366,12 @@ impl DocumentRuntime { self.timeouts.has_ready_timer() } + // Rendering wakes are independent of callbacks queued by an API. + #[cfg(test)] + pub(crate) fn has_ready_callback_timer(&self) -> bool { + self.timeouts.has_ready_callback_timer() + } + pub(crate) fn next_ready_timeout_deadline( &self, selection: crate::page_task_queue::RendererPageTimerSelection, diff --git a/moli-renderer-v8/src/host/events.rs b/moli-renderer-v8/src/host/events.rs index 85d9b0dec42..1b93ea039fc 100644 --- a/moli-renderer-v8/src/host/events.rs +++ b/moli-renderer-v8/src/host/events.rs @@ -2485,8 +2485,7 @@ fn event_source_target_handle( host_ptr: *mut PageScriptHost, event: v8::Local<'_, v8::Object>, ) -> Option { - let value = crate::context_bootstrap::event_backing(scope, event) - .get(scope, v8str(scope, "source").into())?; + let value = crate::context_bootstrap::event_attribute(scope, event, "source")?; if value.is_null_or_undefined() || !value.is_object() { return None; } diff --git a/moli-renderer-v8/src/host/timers.rs b/moli-renderer-v8/src/host/timers.rs index f2ef8277978..a10f69de3fc 100644 --- a/moli-renderer-v8/src/host/timers.rs +++ b/moli-renderer-v8/src/host/timers.rs @@ -842,6 +842,18 @@ impl HostTimeoutScheduler { self.scheduler.has_ready_timer(Instant::now()) } + #[cfg(test)] + pub(crate) fn has_ready_callback_timer(&self) -> bool { + self.scheduler + .next_ready_deadline_matching(Instant::now(), min_delay_ready_allowance(), |task| { + !matches!( + task.callback, + ScheduledTimerCallback::AnimationFrameWake { .. } + ) + }) + .is_some() + } + pub(crate) fn has_ready_from_schedule_ranges(&self, ranges: &[TimerScheduleRange]) -> bool { self.scheduler .has_ready_from_schedule_ranges(ranges, Instant::now()) diff --git a/moli-renderer-v8/src/native_bridge/context_host/host_environment.rs b/moli-renderer-v8/src/native_bridge/context_host/host_environment.rs index 760fee4b486..fd822806c6a 100644 --- a/moli-renderer-v8/src/native_bridge/context_host/host_environment.rs +++ b/moli-renderer-v8/src/native_bridge/context_host/host_environment.rs @@ -2504,15 +2504,8 @@ impl PageScriptHost { if style_mutation_effects_affect_layout_metric(effects) { self.clear_layout_rect_cache(); } - let changed_iframe_attributes = effects.iter().filter_map(|effect| { - let StyleMutationEffect::Attribute { element, name, .. } = effect else { - return None; - }; - (StyleAttributeImpact::for_attribute_name(name).affects_layout_metric() - && self.dom_host().is_html_element_named(*element, "iframe")) - .then_some(*element) - }); - self.invalidate_published_frame_viewports(changed_iframe_attributes); + // Frame viewports belong to the last published layout. Style mutations + // invalidate style inputs; the next layout publishes their new sizes. let validity_containers = self.validity_containers_for_child_list_mutations(effects); let dom_host = self.dom_host() as *const _; let emulated_media = self.emulated_media().clone(); diff --git a/moli-renderer-v8/src/native_bridge/context_host/layout.rs b/moli-renderer-v8/src/native_bridge/context_host/layout.rs index 15faeeceb93..9cf0c0e64aa 100644 --- a/moli-renderer-v8/src/native_bridge/context_host/layout.rs +++ b/moli-renderer-v8/src/native_bridge/context_host/layout.rs @@ -188,42 +188,6 @@ impl PageScriptHost { .frame_viewport(frame) } - pub(crate) fn invalidate_published_frame_viewports( - &self, - frames: impl IntoIterator, - ) { - let frames = frames.into_iter().collect::>(); - if frames.is_empty() { - return; - } - let documents = frames - .iter() - .filter_map(|frame| { - let document = self.dom_host().owner_document_handle(*frame)?; - self.top_level_document_for_document(document) - }) - .collect::>(); - let changed = { - let mut state = self.document_layout_state.borrow_mut(); - let changed = - state.update_frame_viewports(frames.into_iter().map(|frame| (frame, None))); - if documents.contains(&self.document_handle()) { - state.clear_latest_layout(); - } - changed - }; - for document in documents { - if let Some(cache) = self.lightweight_popup_layout_cache(document) { - cache.borrow_mut().clear(); - } - } - if changed { - self.style_viewport_generation - .set(self.style_viewport_generation.get().saturating_add(1)); - } - } - - #[cfg(debug_assertions)] pub(crate) fn style_viewport_generation(&self) -> u64 { self.style_viewport_generation.get() } diff --git a/moli-renderer-v8/src/runtime/page_vm/tests/user_interaction.rs b/moli-renderer-v8/src/runtime/page_vm/tests/user_interaction.rs index 2f94d34a5b0..7406bbdac23 100644 --- a/moli-renderer-v8/src/runtime/page_vm/tests/user_interaction.rs +++ b/moli-renderer-v8/src/runtime/page_vm/tests/user_interaction.rs @@ -545,8 +545,8 @@ getSelection().collapse(text, 1); )?; assert!( - !page_vm.vm().has_ready_timeout(), - "user-interaction tasks must not acquire PageTimer descriptors" + !page_vm.vm().has_ready_callback_timer(), + "user-interaction callbacks must stay on their task source; rendering wakes are separate" ); // The value setter already queued selectionchange before the range // setter queues select; later selection changes coalesce with it. diff --git a/moli-renderer-v8/src/runtime/tests/extracted/owner_lifecycle.rs b/moli-renderer-v8/src/runtime/tests/extracted/owner_lifecycle.rs index cda793db7ef..2f647e2cdca 100644 --- a/moli-renderer-v8/src/runtime/tests/extracted/owner_lifecycle.rs +++ b/moli-renderer-v8/src/runtime/tests/extracted/owner_lifecycle.rs @@ -517,7 +517,9 @@ document.body.appendChild(frame); } let (observed, _) = page .run_async_command(RendererPageCommand::EvaluateExpression { - expression: "globalThis.__childSelfNavigateEvents.join('|')".to_owned(), + // Each owner-driven completion is required exactly once. Posted + // messages and load events use separate task sources. + expression: "globalThis.__childSelfNavigateEvents.slice().sort().join('|')".to_owned(), await_promise: false, }) .await diff --git a/moli-renderer-v8/src/runtime/tests/extracted/page_lifecycle_isolation.rs b/moli-renderer-v8/src/runtime/tests/extracted/page_lifecycle_isolation.rs index 8b8cb6a2054..fd42e6f9628 100644 --- a/moli-renderer-v8/src/runtime/tests/extracted/page_lifecycle_isolation.rs +++ b/moli-renderer-v8/src/runtime/tests/extracted/page_lifecycle_isolation.rs @@ -333,9 +333,16 @@ async fn per_page_isolate_policy_routes_unhandled_rejections_to_originating_page expression: r#"(() => { globalThis.__lm_shared_isolate_unhandled_rejections = []; globalThis.__lm_shared_isolate_rejectionhandled = []; + globalThis.__lm_shared_isolate_unhandled_done = new Promise(resolve => { + globalThis.__lm_shared_isolate_resolve_unhandled = resolve; + }); + globalThis.__lm_shared_isolate_handled_done = new Promise(resolve => { + globalThis.__lm_shared_isolate_resolve_handled = resolve; + }); addEventListener("unhandledrejection", event => { event.preventDefault(); globalThis.__lm_shared_isolate_unhandled_rejections.push(String(event.reason)); + globalThis.__lm_shared_isolate_resolve_unhandled(); }); addEventListener("rejectionhandled", event => { globalThis.__lm_shared_isolate_rejectionhandled.push( @@ -343,6 +350,7 @@ async fn per_page_isolate_policy_routes_unhandled_rejections_to_originating_page ? "same-promise" : "wrong-promise" ); + globalThis.__lm_shared_isolate_resolve_handled(); }); return "installed"; })()"# @@ -373,13 +381,18 @@ async fn per_page_isolate_policy_routes_unhandled_rejections_to_originating_page Some(serde_json::json!("scheduled")) ); - let (second_rejections, _) = second_page - .run_async_command(RendererPageCommand::EvaluateExpression { - expression: r#"JSON.stringify(globalThis.__lm_shared_isolate_unhandled_rejections)"# + // Rejection notifications are queued tasks. A later Evaluate command is + // not a barrier for their delivery; await the originating page's event. + let (second_rejections, _) = tokio::time::timeout( + Duration::from_secs(2), + second_page.run_async_command(RendererPageCommand::EvaluateExpression { + expression: r#"__lm_shared_isolate_unhandled_done.then(() => JSON.stringify(__lm_shared_isolate_unhandled_rejections))"# .to_owned(), - await_promise: false, - }) + await_promise: true, + }), + ) .await + .expect("second page must receive its unhandled rejection task") .expect("second page rejection list should evaluate"); assert_eq!( renderer_json_value(second_rejections), @@ -417,13 +430,16 @@ async fn per_page_isolate_policy_routes_unhandled_rejections_to_originating_page Some(serde_json::json!("handler-added")) ); - let (second_rejectionhandled, _) = second_page - .run_async_command(RendererPageCommand::EvaluateExpression { - expression: r#"JSON.stringify(globalThis.__lm_shared_isolate_rejectionhandled)"# + let (second_rejectionhandled, _) = tokio::time::timeout( + Duration::from_secs(2), + second_page.run_async_command(RendererPageCommand::EvaluateExpression { + expression: r#"__lm_shared_isolate_handled_done.then(() => JSON.stringify(__lm_shared_isolate_rejectionhandled))"# .to_owned(), - await_promise: false, - }) + await_promise: true, + }), + ) .await + .expect("second page must receive its rejectionhandled task") .expect("second page rejectionhandled list should evaluate"); assert_eq!( renderer_json_value(second_rejectionhandled), diff --git a/moli-renderer-v8/src/script_vm/page_task_enqueue.rs b/moli-renderer-v8/src/script_vm/page_task_enqueue.rs index 3e14c3544c6..cc41a77038f 100644 --- a/moli-renderer-v8/src/script_vm/page_task_enqueue.rs +++ b/moli-renderer-v8/src/script_vm/page_task_enqueue.rs @@ -771,6 +771,12 @@ impl ScriptVm { self.document_runtime.has_ready_timeout() } + // Rendering wakes are independent of callbacks queued by an API. + #[cfg(test)] + pub(crate) fn has_ready_callback_timer(&self) -> bool { + self.document_runtime.has_ready_callback_timer() + } + pub(crate) fn next_ready_timeout_deadline( &self, selection: crate::page_task_queue::RendererPageTimerSelection, diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/history_worlds.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/history_worlds.rs index 9e56688ee14..96cbccb1bf1 100644 --- a/moli-renderer-v8/src/script_vm/tests/browser_api/history_worlds.rs +++ b/moli-renderer-v8/src/script_vm/tests/browser_api/history_worlds.rs @@ -1212,6 +1212,7 @@ async fn history_worlds_child_mutations_share_only_the_child_window_history() { r##" history.replaceState({owner: 'top'}, '', '#top'); const frame = document.createElement('iframe'); + frame.srcdoc = '

History owner

'; (document.body || document.documentElement || document).appendChild(frame); void frame.contentWindow; 'created' @@ -1226,6 +1227,11 @@ async fn history_worlds_child_mutations_share_only_the_child_window_history() { .await .unwrap() ); + // Traversal needs a committed Document: pushState replaces the entry of + // the initial empty Document rather than appending one. + vm.drain_ready_page_task_executor_turns_for_setup(&loader, 128) + .await + .unwrap(); let child = vm .live_child_default_runtime_realm_inventory() .into_iter() @@ -1241,7 +1247,7 @@ async fn history_worlds_child_mutations_share_only_the_child_window_history() { vm.eval_in_child_default_context( child, r##" - history.replaceState({owner: 'child'}, '', '#child'); + history.replaceState({owner: 'child'}, '', 'about:srcdoc#child'); history.scrollRestoration = 'manual'; 'ready' "##, @@ -1261,7 +1267,7 @@ async fn history_worlds_child_mutations_share_only_the_child_window_history() { vm.eval_in_isolated_context( isolated, r##" - history.pushState({owner: 'isolated-child'}, '', '#next'); + history.pushState({owner: 'isolated-child'}, '', 'about:srcdoc#next'); history.scrollRestoration = 'auto'; 'pushed' "##, @@ -1371,6 +1377,8 @@ async fn history_worlds_preserve_the_shared_backing_when_initial_child_window_is vm.eval( r#" const frame = document.createElement('iframe'); + // Keep the initial empty Window pending until the srcdoc commit. + frame.srcdoc = '

pending initial load

'; (document.body || document.documentElement || document).appendChild(frame); void frame.contentWindow; "#, @@ -1394,7 +1402,7 @@ async fn history_worlds_preserve_the_shared_backing_when_initial_child_window_is vm.eval_in_isolated_context( isolated, r##" - originalHistory.replaceState({rebound: true}, '', '#rebound'); + originalHistory.replaceState({rebound: true}, '', 'about:srcdoc#rebound'); 'replaced' "##, ) @@ -1450,7 +1458,7 @@ fn history_native_snapshot_survives_isolate_replacement_with_structured_values() history.scrollRestoration = 'manual'; navigation.updateCurrentEntry({state: new Set([7n])}); history.state.map.set('answer', 99n); - location.href = '/next'; + navigation.navigate('/next', {history: 'push'}); 'queued' "##).unwrap(); let pending = vm.take_pending_location_navigation_with_seed().unwrap(); @@ -1494,7 +1502,7 @@ fn history_native_snapshot_survives_isolate_replacement_with_structured_values() } #[test] -fn history_restored_entries_keep_world_identity_and_refresh_reused_ids() { +fn history_restored_sparse_entries_keep_world_identity_and_refresh_reused_ids() { const ENTRIES: &str = r#"JSON.stringify(navigation.entries() .filter(entry => entry.url.includes('#')) .map(entry => [entry.url, entry.id, entry.key, entry.index, entry.sameDocument, @@ -1514,7 +1522,8 @@ fn history_restored_entries_keep_world_identity_and_refresh_reused_ids() { ) .unwrap(); let expected = vm.eval(ENTRIES).unwrap(); - vm.eval("location.href = '/next'; 'queued'").unwrap(); + vm.eval("navigation.navigate('/next', {history: 'push'}); 'queued'") + .unwrap(); let mut seed = vm .take_pending_location_navigation_with_seed() .unwrap() @@ -1527,7 +1536,13 @@ fn history_restored_entries_keep_world_identity_and_refresh_reused_ids() { .unwrap() .history_index; seed.activation = None; - // Snapshot order is not the history position stored in each snapshot. + // Snapshot positions may be sparse and do not follow serialization order. + // The current serialized position still fits in the dense vector, where + // using it as an offset would silently select the wrong entry. + seed.current_index *= 3; + for entry in &mut seed.entries { + entry.history_index *= 3; + } seed.entries.reverse(); (seed, expected) }; @@ -1613,5 +1628,84 @@ fn history_native_fragment_navigation_preserves_structured_navigation_state() { "##, ) .unwrap(); - assert_eq!(vm.eval("String(history.state.value === 5n && navigation.currentEntry.getState().get('value') === 9n && retained.getState().get('value') === 9n)").unwrap(), "true"); + assert_eq!(vm.eval("String(history.state === null && navigation.currentEntry.getState().get('value') === 9n && retained.getState().get('value') === 9n)").unwrap(), "true"); +} + +#[test] +fn event_worlds_beforeunload_return_value_uses_shared_backing() { + let mut vm = new_storage_test_vm("https://example.com/base"); + vm.eval( + r#" + globalThis.event = document.createEvent('BeforeUnloadEvent'); + event.initEvent('beforeunload', false, true); + event.returnValue = 'original'; + event.pageOnly = true; + 'ready' + "#, + ) + .unwrap(); + let isolated = vm + .create_isolated_world("beforeunload-state", false) + .unwrap(); + vm.eval_in_isolated_context( + isolated, + r#" + globalThis.facts = []; + navigation.addEventListener('beforeunload', event => { + facts.push(event instanceof BeforeUnloadEvent, event.returnValue, + event.pageOnly === undefined); + event.returnValue = 'updated'; + event.preventDefault(); + }, {once: true}); + 'ready' + "#, + ) + .unwrap(); + assert_eq!(vm.eval("JSON.stringify([navigation.dispatchEvent(event), event.returnValue, event.defaultPrevented])").unwrap(), + r#"[false,"updated",true]"#); + assert_eq!( + vm.eval_in_isolated_context(isolated, "JSON.stringify(facts)") + .unwrap(), + r#"[true,"original",true]"# + ); +} + +#[tokio::test] +async fn event_worlds_precommit_controllers_expire_after_navigation_settles() { + let loader = ResourceRequestClient::new(&moli_fetch::FetchConfig::default()).unwrap(); + let mut vm = new_storage_test_vm_with_loader("https://example.com/base", &loader); + let isolated = vm.create_isolated_world("precommit-state", false).unwrap(); + vm.eval_in_isolated_context( + isolated, + r##" + globalThis.handlers = 0; + navigation.addEventListener('navigate', event => { + event.intercept({precommitHandler(controller) { + globalThis.savedController = controller; + controller.addHandler(() => { handlers++; }); + }}); + }, {once: true}); + 'ready' + "##, + ) + .unwrap(); + vm.eval("navigation.navigate('#next'); 'started'").unwrap(); + vm.advance_timers_until_deadline_for_test(&loader) + .await + .unwrap(); + assert_eq!( + vm.eval_in_isolated_context( + isolated, + r#" + (() => { + let errorName = ''; + try { savedController.addHandler(() => {}); } + catch (error) { errorName = error.name; } + return JSON.stringify([location.hash, handlers, errorName]); + })() + "# + ) + .unwrap(), + r##"["#next",1,"InvalidStateError"]"## + ); } diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/navigation/element_navigation.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/navigation/element_navigation.rs index 4ee4f137d45..49ecd34f19d 100644 --- a/moli-renderer-v8/src/script_vm/tests/browser_api/navigation/element_navigation.rs +++ b/moli-renderer-v8/src/script_vm/tests/browser_api/navigation/element_navigation.rs @@ -1474,83 +1474,6 @@ async fn navigation_destination_uses_native_webidl_receivers_and_live_entry_stat } } -#[tokio::test] -async fn named_element_navigation_prefers_its_source_frame_over_duplicate_names() { - for action in ["anchor", "submit", "requestSubmit"] { - for name in ["initial", "renamed", "shadowed"] { - let server = - StaticHttpServer::spawn_with_bodies(vec!["selected".into()]) - .await; - let base = server.base_url().origin().ascii_serialization(); - let loader = static_http_loader([]); - let mut vm = new_storage_page_task_executor_test_vm_with_loader( - &format!("{base}/parent"), - &loader, - ); - vm.eval(&format!( - r#" - const earlier = document.createElement('iframe'); earlier.name = 'same'; - const source = document.createElement('iframe'); - source.name = {name:?} === 'renamed' ? 'old-name' : 'same'; - document.body.append(earlier, source); - const childDocument = source.contentDocument; - const nested = childDocument.createElement('iframe'); nested.name = 'same'; - childDocument.body.append(nested); - globalThis.originalDocument = childDocument; - globalThis.nameReads = 0; - if ({name:?} === 'renamed') source.contentWindow.name = 'same'; - if ({name:?} === 'shadowed') Object.defineProperty(source.contentWindow, 'name', {{ - get() {{ ++nameReads; throw new Error('script-visible name was read'); }} - }}); - globalThis.namedAccessIsChild = source.contentWindow.same === nested.contentWindow; - "# - )) - .unwrap(); - vm.drain_ready_page_task_executor_turns_for_setup(&loader, 100) - .await - .unwrap(); - vm.eval(&format!( - r#" - const element = childDocument.createElement({action:?} === 'anchor' ? 'a' : 'form'); - element.target = 'same'; - if ({action:?} === 'anchor') element.href = '/selected?from=anchor'; - else {{ - element.action = '/selected'; - element.innerHTML = ''; - }} - childDocument.body.append(element); - if ({action:?} === 'anchor') element.click(); - else element[{action:?}](); - "# - )) - .unwrap(); - advance_page_task_executor_until_eval_equals( - &mut vm, - &loader, - "String(source.contentDocument.body?.textContent === 'selected')", - "true", - &format!("{action}, {name}"), - ) - .await; - assert_eq!( - vm.eval( - "JSON.stringify([source.contentDocument !== originalDocument, \ - source.contentWindow.length, earlier.contentWindow.location.href, \ - namedAccessIsChild, nameReads])", - ) - .unwrap(), - r#"[true,0,"about:blank",true,0]"#, - "{action}, {name}", - ); - assert_eq!( - server.finish_targets().await, - [format!("/selected?from={action}")], - "{action}, {name}", - ); - } - } -} - #[tokio::test] async fn document_open_preserves_navigation_initialization() { for kind in ["iframe", "popup"] { @@ -1590,7 +1513,7 @@ async fn document_open_preserves_navigation_initialization() { "snapshots": snapshots, "navigated": { "current": "about:blank", "state": 4 }, "loadedOpen": { - "sameNavigation": true, "sameEntryKey": true, "state": 5, + "sameNavigation": true, "sameEntryKey": true, "newPublicId": true, "state": 5, }, }), "{kind}" diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/navigation/history_traversal.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/navigation/history_traversal.rs index 77d67b85526..42f73134763 100644 --- a/moli-renderer-v8/src/script_vm/tests/browser_api/navigation/history_traversal.rs +++ b/moli-renderer-v8/src/script_vm/tests/browser_api/navigation/history_traversal.rs @@ -387,12 +387,11 @@ else frame.setAttribute('sandbox', {changed}); "history.replaceState(0, ''); history.pushState(1, ''); frame.contentWindow.eval('history.back()');", ) .unwrap(); - assert_eq!( + assert!( vm.run_one_history_traversal_executor_turn(&loader) .await .unwrap(), - allowed, - "initial={initial}, changed={changed}, navigated={navigate}" + "the traversal task evaluates the active sandbox: initial={initial}, changed={changed}, navigated={navigate}" ); assert_eq!( vm.eval("String(history.state)").unwrap(), diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/traversal.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/traversal.rs index 449c1f30059..f8bca6116d7 100644 --- a/moli-renderer-v8/src/script_vm/tests/browser_api/traversal.rs +++ b/moli-renderer-v8/src/script_vm/tests/browser_api/traversal.rs @@ -387,6 +387,11 @@ frame.contentWindow; ] { vm.eval(&format!("frame.contentWindow.history.{call}")) .unwrap(); + assert!( + vm.run_one_history_traversal_executor_turn(&loader) + .await + .unwrap() + ); let pending = vm .take_pending_top_level_history_traversal() .map(|pending| pending.delta); @@ -399,6 +404,11 @@ frame.contentWindow; // A method borrowed from the child still uses its top-level History receiver. vm.eval("frame.contentWindow.history.back.call(history)") .unwrap(); + assert!( + vm.run_one_history_traversal_executor_turn(&loader) + .await + .unwrap() + ); assert_eq!( vm.take_pending_top_level_history_traversal().unwrap().delta, -1 diff --git a/moli-renderer-v8/src/script_vm/tests/dom_xhr/computed_style/stylesheet_and_document_lifecycle.rs b/moli-renderer-v8/src/script_vm/tests/dom_xhr/computed_style/stylesheet_and_document_lifecycle.rs index c8e0bacf9ee..e92408d26e6 100644 --- a/moli-renderer-v8/src/script_vm/tests/dom_xhr/computed_style/stylesheet_and_document_lifecycle.rs +++ b/moli-renderer-v8/src/script_vm/tests/dom_xhr/computed_style/stylesheet_and_document_lifecycle.rs @@ -1075,10 +1075,10 @@ fn computed_used_size_clamps_infinite_negative_math_to_zero() { fn computed_style_child_document_media_queries_use_iframe_viewport() { let mut vm = new_storage_test_vm("https://child-document-media-query.test/"); - let result = vm - .eval( - r#" -(() => { + let result = eval_with_layout_publications( + &mut vm, + r#" +(function* () { if (!document.documentElement) { document.appendChild(document.createElement('html')); } @@ -1096,12 +1096,13 @@ fn computed_style_child_document_media_queries_use_iframe_viewport() { document.body.offsetTop; const before = getComputedStyle(childDocument.body).color; frame.style.width = '200px'; + yield; // Publish the new viewport before evaluating the child's media query. const after = getComputedStyle(childDocument.body).color; return `${before}|${after}`; })() "#, - ) - .expect("child document media queries should use iframe viewport"); + ) + .expect("child document media queries should use iframe viewport"); assert_eq!(result, "rgb(255, 0, 0)|rgb(0, 128, 0)"); } diff --git a/moli-renderer-v8/src/script_vm/tests/dom_xhr/cors_preflight.rs b/moli-renderer-v8/src/script_vm/tests/dom_xhr/cors_preflight.rs index 11b550255ff..000adc68866 100644 --- a/moli-renderer-v8/src/script_vm/tests/dom_xhr/cors_preflight.rs +++ b/moli-renderer-v8/src/script_vm/tests/dom_xhr/cors_preflight.rs @@ -424,5 +424,5 @@ async fn cors_preflight_permissions_reach_window_fetch_and_xhr() { #[tokio::test(flavor = "multi_thread", worker_threads = 2)] async fn cors_preflight_permissions_reach_worker_fetch_and_xhr() { - check_preflight_permissions(true, &["fetch", "xhr"]).await; + check_preflight_permissions(true, &["fetch", "xhr", "sync-xhr"]).await; } diff --git a/moli-renderer-v8/src/script_vm/tests/dom_xhr/forms/dialog.rs b/moli-renderer-v8/src/script_vm/tests/dom_xhr/forms/dialog.rs index a9eb049b652..092f28c13c1 100644 --- a/moli-renderer-v8/src/script_vm/tests/dom_xhr/forms/dialog.rs +++ b/moli-renderer-v8/src/script_vm/tests/dom_xhr/forms/dialog.rs @@ -573,8 +573,8 @@ async fn dialog_form_submission_closes_with_submitter_result_and_queues_reentran ); assert!( - !vm.has_ready_timeout(), - "dialog close must not create a synthetic Page timer" + !vm.has_ready_callback_timer(), + "dialog close must not create a callback timer; focus rendering wakes are separate" ); assert!( vm.run_one_dom_manipulation_task_executor_turn( diff --git a/moli-renderer-v8/src/script_vm/tests/mod.rs b/moli-renderer-v8/src/script_vm/tests/mod.rs index d8e48e87d2e..f49d8c6ee1b 100644 --- a/moli-renderer-v8/src/script_vm/tests/mod.rs +++ b/moli-renderer-v8/src/script_vm/tests/mod.rs @@ -2350,6 +2350,7 @@ mod geometry_point_transform; mod headers_list; mod history_document_identity; mod history_referrer; +mod history_replace_forward; mod http_fixture; mod iframe_load_delivery; diff --git a/moli-renderer-v8/src/script_vm/tests/observer_documents.rs b/moli-renderer-v8/src/script_vm/tests/observer_documents.rs index 417d64aa1d4..7f870bf282d 100644 --- a/moli-renderer-v8/src/script_vm/tests/observer_documents.rs +++ b/moli-renderer-v8/src/script_vm/tests/observer_documents.rs @@ -151,7 +151,7 @@ observer.observe(popupTarget); } #[tokio::test(flavor = "current_thread")] -async fn popup_iframe_invalidation_preserves_the_opener_layout() { +async fn popup_iframe_resize_preserves_the_opener_layout() { let loader = ResourceRequestClient::new(&moli_fetch::FetchConfig::default()).unwrap(); let mut vm = new_storage_page_task_executor_test_vm("https://popup-frame-layout.test/"); vm.eval( @@ -162,6 +162,8 @@ mainTarget.style.cssText = 'width:80px;height:20px'; globalThis.popupTarget = popup.document.body.appendChild(popup.document.createElement('div')); popupTarget.style.cssText = 'width:40px;height:20px'; globalThis.frame = popup.document.body.appendChild(popup.document.createElement('iframe')); +frame.style.border = '0'; +frame.setAttribute('width', '300'); frame.contentWindow.document.body.innerHTML = '
child
'; globalThis.observer = new ResizeObserver(() => {}); observer.observe(mainTarget); @@ -173,7 +175,15 @@ observer.observe(popupTarget); .await .unwrap(); assert_eq!(vm.eval("mainTarget.getBoundingClientRect().width + ':' + popupTarget.getBoundingClientRect().width").unwrap(), "80:40"); + assert_eq!( + vm.eval("frame.getBoundingClientRect().width").unwrap(), + "300" + ); vm.eval("frame.setAttribute('width', '200');").unwrap(); + assert_eq!( + vm.eval("frame.getBoundingClientRect().width").unwrap(), + "300" + ); vm.with_default_context_scope_and_checkpoint_for_test(|scope, host_ptr| { let global = scope.get_current_context().global(scope); let key = v8::String::new(scope, "popupTarget").unwrap(); @@ -188,8 +198,8 @@ observer.observe(popupTarget); let document = host.dom_host().owner_document_handle(handle).unwrap(); assert!( host.with_latest_layout_tree_for_document(document, |_| ()) - .is_none(), - "changing iframe width must invalidate its popup snapshot" + .is_some(), + "changing iframe width must retain the published popup snapshot until rendering" ); assert!( host.with_latest_layout_tree_for_document(host.document_handle(), |_| ()) @@ -203,6 +213,10 @@ observer.observe(popupTarget); .await .unwrap(); assert_eq!(vm.eval("mainTarget.getBoundingClientRect().width + ':' + popupTarget.getBoundingClientRect().width").unwrap(), "80:40"); + assert_eq!( + vm.eval("frame.getBoundingClientRect().width").unwrap(), + "200" + ); vm.eval("frame.remove();").unwrap(); vm.with_default_context_scope_and_checkpoint_for_test(|_scope, host_ptr| { let host = unsafe { &*host_ptr }; diff --git a/moli-renderer-v8/src/util.rs b/moli-renderer-v8/src/util.rs index e05b855b804..f241ebc288f 100644 --- a/moli-renderer-v8/src/util.rs +++ b/moli-renderer-v8/src/util.rs @@ -10,7 +10,7 @@ pub use moli_v8_util::{ global_constructor_object, global_constructor_prototype, initialize_ecmascript_intrinsic_registry, new_null_prototype_object, object_bool_property, object_chain_contains, object_defined_string_property, object_non_empty_string_property, - object_number_property, object_own_static_property_as_array, object_own_static_string_property, object_property_as_array, + object_number_property, object_own_static_string_property, object_property_as_array, object_property_as_object, object_string_property, private_key, register_ecmascript_intrinsic, registered_ecmascript_constructor, registered_ecmascript_prototype, set_null_prototype, set_private_value, throw_range_error, throw_type_error, v8_string, v8str, walk_object_chain, diff --git a/moli-renderer-v8/src/webidl_callback_source_boundary_tests.rs b/moli-renderer-v8/src/webidl_callback_source_boundary_tests.rs index ab1913027cd..fabaf91119d 100644 --- a/moli-renderer-v8/src/webidl_callback_source_boundary_tests.rs +++ b/moli-renderer-v8/src/webidl_callback_source_boundary_tests.rs @@ -110,8 +110,8 @@ const DIRECT_V8_CALL_ALLOWLIST: &[AllowedDirectCallFile] = &[ ), allowed( "context_bootstrap/navigation_callbacks/navigation.rs", - // Three settlement calls now go through the existing shared helpers. - 8, + // Fulfillment paths share the realm-aware lifecycle settlement helper. + 7, DirectCallOwner::BrowserAlgorithm, ), allowed( diff --git a/moli-renderer-v8/tests/fixtures/navigation-document-open.js b/moli-renderer-v8/tests/fixtures/navigation-document-open.js index 91604220eda..83116b1e9bb 100644 --- a/moli-renderer-v8/tests/fixtures/navigation-document-open.js +++ b/moli-renderer-v8/tests/fixtures/navigation-document-open.js @@ -48,6 +48,7 @@ globalThis.navigationDocumentOpenProbe = async function(kind) { state: loadedNav.currentEntry.getState().value }; const key = loadedNav.currentEntry.key; + const id = loadedNav.currentEntry.id; child.document.open(); child.document.write('

loaded stream

'); child.document.close(); @@ -55,6 +56,7 @@ globalThis.navigationDocumentOpenProbe = async function(kind) { const loadedOpen = { sameNavigation: child.navigation === loadedNav, sameEntryKey: loadedNav.currentEntry.key === key, + newPublicId: loadedNav.currentEntry.id !== id && /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/.test(loadedNav.currentEntry.id), state: loadedNav.currentEntry.getState().value }; return {snapshots, navigated, loadedOpen}; diff --git a/moli-types/moli-page-types/src/navigation_history.rs b/moli-types/moli-page-types/src/navigation_history.rs index 8d85fc533ae..d0aed1327e8 100644 --- a/moli-types/moli-page-types/src/navigation_history.rs +++ b/moli-types/moli-page-types/src/navigation_history.rs @@ -1042,8 +1042,6 @@ mod tests { NavigationHistoryDocumentId::allocate(), NavigationHistoryEntryId::allocate(), NavigationHistoryEntryKey::allocate(), - None, - None, ) }) .collect();