Skip to content

armgit / moli

Public Imported from GitHub
0

Best headless browser for AI agents. Lite, Fast, High-Compatibility. Built in Rust

fix(renderer): route navigation targets by native window owner

ldm0e32dacb88836
diff --git a/moli-renderer-v8/src/context_bootstrap.rs b/moli-renderer-v8/src/context_bootstrap.rs
index 19477d5d2..c9c656e27 100644
--- a/moli-renderer-v8/src/context_bootstrap.rs
+++ b/moli-renderer-v8/src/context_bootstrap.rs
@@ -81,6 +81,7 @@ mod navigation_traversal_coordinator;
mod navigation_traversal_execution;
mod navigation_traversal_plan;
mod navigation_window;
+pub(crate) use navigation_window::runtime_window_dispatch_scope;
mod navigator_runtime;
mod platform_object_worlds;
mod session_history;
diff --git a/moli-renderer-v8/src/context_bootstrap/navigation_window.rs b/moli-renderer-v8/src/context_bootstrap/navigation_window.rs
index 51bc7b5c5..2912f7cc7 100644
--- a/moli-renderer-v8/src/context_bootstrap/navigation_window.rs
+++ b/moli-renderer-v8/src/context_bootstrap/navigation_window.rs
@@ -106,7 +106,7 @@ pub(in crate::context_bootstrap) fn child_browsing_context_handle_for_runtime_ow
})
}
-pub(super) fn runtime_window_dispatch_scope<'s>(
+pub(crate) fn runtime_window_dispatch_scope<'s>(
scope: &mut v8::PinScope<'s, '_>,
window: v8::Local<'s, v8::Object>,
) -> Option<crate::native_bridge::OwnerDispatchScope> {
diff --git a/moli-renderer-v8/src/native_bridge/element/activation/targets.rs b/moli-renderer-v8/src/native_bridge/element/activation/targets.rs
index b853fec00..f0f539c56 100644
--- a/moli-renderer-v8/src/native_bridge/element/activation/targets.rs
+++ b/moli-renderer-v8/src/native_bridge/element/activation/targets.rs
@@ -1,6 +1,8 @@
use crate::{
RendererPendingPopupActivation, RendererPendingWindowOpenEvent, RendererPopupDisposition,
- context_bootstrap::dispatch_cross_document_navigation_navigate_event_for_window,
+ context_bootstrap::{
+ dispatch_cross_document_navigation_navigate_event_for_window, runtime_window_dispatch_scope,
+ },
document_runtime::{DocumentPolicyContainer, DomHandle},
native_bridge::context_host::ChildBrowsingContextNavigationRequest,
util::v8str,
@@ -486,7 +488,6 @@ fn navigate_special_target_from_window<'s>(
target: Option<SpecialBrowsingContextTarget>,
resolved_url: &str,
) -> Option<v8::Local<'s, v8::Object>> {
- let global = scope.get_current_context().global(scope);
let target_window = match target {
None | Some(SpecialBrowsingContextTarget::Current) => source_window,
Some(SpecialBrowsingContextTarget::Top) => source_window
@@ -499,7 +500,11 @@ fn navigate_special_target_from_window<'s>(
};
let navigated = if resolved_url.is_empty() {
true
- } else if target_window.strict_equals(global.into()) {
+ } else if matches!(
+ runtime_window_dispatch_scope(scope, target_window),
+ Some(crate::native_bridge::OwnerDispatchScope::Top)
+ ) {
+ // A borrowed click/submit method can execute in a child Window realm.
queue_top_level_location_navigation(scope, runtime_ptr, resolved_url)
} else {
navigate_target_window_location(scope, target_window, resolved_url)
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 35bdb91b4..a1c49d3fc 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
@@ -1,5 +1,82 @@
use super::*;
+#[test]
+fn anchor_navigation_fires_once_when_click_is_borrowed_from_child_realm() {
+ for target in ["", "_sElF"] {
+ for use_child_realm in [true, false] {
+ for cancel_top in [false, true] {
+ let mut vm = new_parsed_test_vm(
+ "https://anchor-navigation-target.test/source",
+ "<!doctype html><body></body>",
+ );
+ let description = format!(
+ "target={target:?} child_realm={use_child_realm} cancel_top={cancel_top}"
+ );
+ let result = vm
+ .eval(&format!(
+ r#"
+ (() => {{
+ const seen = [];
+ const frame = document.createElement('iframe');
+ document.body.appendChild(frame);
+ frame.srcdoc = '<body></body>';
+ frame.contentWindow.navigation.onnavigate = event => {{
+ seen.push('child');
+ event.preventDefault();
+ }};
+ const anchor = document.createElement('a');
+ anchor.href = 'https://anchor-navigation-target.test/destination';
+ anchor.target = {target:?};
+ document.body.appendChild(anchor);
+ navigation.onnavigate = event => {{
+ seen.push([
+ 'top',
+ event.target === navigation,
+ event.currentTarget === navigation,
+ event.sourceElement === anchor,
+ event.destination.url
+ ]);
+ event.signal.onabort = () => seen.push('top-abort');
+ if ({cancel_top}) event.preventDefault();
+ }};
+ navigation.onnavigateerror = () => seen.push('top-error');
+ const realm = {use_child_realm} ? frame.contentWindow : window;
+ if ({use_child_realm} && realm.HTMLElement === HTMLElement)
+ throw new Error('click must use the child realm');
+ realm.HTMLElement.prototype.click.call(anchor);
+ return JSON.stringify(seen);
+ }})()
+ "#,
+ ))
+ .expect(&description);
+ let expected_url = "https://anchor-navigation-target.test/destination";
+ let mut expected = vec![serde_json::json!(["top", true, true, true, expected_url])];
+ if cancel_top {
+ expected.extend([
+ serde_json::json!("top-abort"),
+ serde_json::json!("top-error"),
+ ]);
+ }
+ assert_eq!(
+ serde_json::from_str::<serde_json::Value>(&result).unwrap(),
+ serde_json::json!(expected),
+ "{description}"
+ );
+ let pending = vm.take_pending_location_navigation_with_seed();
+ if cancel_top {
+ assert!(pending.is_none(), "{description}");
+ } else {
+ assert_eq!(
+ pending.expect(&description).url.as_str(),
+ expected_url,
+ "{description}"
+ );
+ }
+ }
+ }
+ }
+}
+
#[test]
fn form_navigation_events_use_resolved_top_window_across_realms() {
for (depth, target) in [(1, "_top"), (1, "_PARENT"), (2, "_ToP")] {