Skip to content

armgit / moli

Public Imported from GitHub
0

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

fix(iframe): retire nested frames in disconnected shadow trees

ldm03aecdcf81fdb
diff --git a/moli-renderer-v8/src/native_bridge/context_host/child_frames/discovery.rs b/moli-renderer-v8/src/native_bridge/context_host/child_frames/discovery.rs
index feaf72171..ad1b21dc4 100644
--- a/moli-renderer-v8/src/native_bridge/context_host/child_frames/discovery.rs
+++ b/moli-renderer-v8/src/native_bridge/context_host/child_frames/discovery.rs
@@ -269,6 +269,11 @@ impl JsContextHost {
if self.is_child_browsing_context_host_handle(root) {
out.push(root);
}
+ // Disconnected hosts no longer use the connected-tree candidate index.
+ // Their shadow trees still contain browsing contexts to unload and retire.
+ if let Some(shadow_root) = self.dom_host().shadow_root_handle(root) {
+ self.collect_child_browsing_context_host_handles(shadow_root, out);
+ }
for child in self.dom_host().child_handles(root) {
self.collect_child_browsing_context_host_handles(child, out);
}
diff --git a/moli-renderer-v8/src/script_vm/tests/mod.rs b/moli-renderer-v8/src/script_vm/tests/mod.rs
index 8af0a1a08..b0df07c4c 100644
--- a/moli-renderer-v8/src/script_vm/tests/mod.rs
+++ b/moli-renderer-v8/src/script_vm/tests/mod.rs
@@ -2255,3 +2255,5 @@ mod payment_events;
mod file_value_receivers;
mod detached_node_producer_host;
+
+mod shadow_frame_unload_discovery;
diff --git a/moli-renderer-v8/src/script_vm/tests/shadow_frame_unload_discovery.rs b/moli-renderer-v8/src/script_vm/tests/shadow_frame_unload_discovery.rs
new file mode 100644
index 000000000..a908fe1dd
--- /dev/null
+++ b/moli-renderer-v8/src/script_vm/tests/shadow_frame_unload_discovery.rs
@@ -0,0 +1,67 @@
+use super::*;
+
+#[tokio::test(flavor = "current_thread")]
+async fn removing_shadow_subtrees_retires_nested_windows_before_reinsertion() {
+ for shadow in [false, true] {
+ for mode in ["remove", "replace", "ancestor", "fragment"] {
+ let server = StaticHttpServer::spawn_with_bodies(vec![
+ "<!doctype html><body>Window removal target</body>".to_owned(); 3
+ ])
+ .await;
+ let loader = static_http_loader([server.resolve_entry("www.example.test")]);
+ let parent_url = server.url_for_host("www.example.test", "/page.html");
+ let mut vm =
+ new_storage_page_task_executor_test_vm_with_loader(parent_url.as_str(), &loader);
+ let script = include_str!(concat!(
+ env!("CARGO_MANIFEST_DIR"),
+ "/tests/fixtures/shadow-frame-retirement.js"
+ ));
+ vm.exec(
+ &format!(
+ r#"
+if (!document.documentElement) document.appendChild(document.createElement('html'));
+if (!document.body) document.documentElement.appendChild(document.createElement('body'));
+globalThis.__removedWindowResult = null;
+({script})({{mode: {mode:?}, shadow: {shadow}}}).then(
+ result => {{ __removedWindowResult = result; }},
+ error => {{ __removedWindowResult = {{error: String(error)}}; }}
+);
+"#
+ ),
+ None,
+ )
+ .expect("Window removal probe should start");
+ advance_page_task_executor_until_eval_equals(
+ &mut vm,
+ &loader,
+ "String(__removedWindowResult !== null)",
+ "true",
+ "Window removal probe should finish",
+ )
+ .await;
+ let result: serde_json::Value = serde_json::from_str(
+ &vm.eval("JSON.stringify(__removedWindowResult)")
+ .expect("Window removal observations"),
+ )
+ .unwrap();
+ assert_eq!(
+ result,
+ serde_json::json!({
+ "after": [true, true], "reinserted": [true, true],
+ "fresh": {"top": true, "parent": true, "frameElement": true,
+ "closed": false, "different": true},
+ }),
+ "{mode}/shadow={shadow}: {result}"
+ );
+ assert_eq!(
+ server.finish_targets().await,
+ vec![
+ "/history.html?root",
+ "/history.html?child",
+ "/history.html?replacement"
+ ],
+ "{mode}/shadow={shadow}"
+ );
+ }
+ }
+}
diff --git a/moli-renderer-v8/tests/fixtures/shadow-frame-retirement.js b/moli-renderer-v8/tests/fixtures/shadow-frame-retirement.js
new file mode 100644
index 000000000..434ebbbc6
--- /dev/null
+++ b/moli-renderer-v8/tests/fixtures/shadow-frame-retirement.js
@@ -0,0 +1,43 @@
+async function removedWindowLifecycle({mode, shadow}) {
+ const container = document.createElement('div');
+ document.body.append(container);
+ const mount = shadow ? container.attachShadow({mode: 'closed'}) : container;
+ const frame = document.createElement('iframe');
+ frame.src = '/history.html?root';
+ let loaded = new Promise(resolve => frame.onload = resolve);
+ mount.append(frame);
+ await loaded;
+
+ const child = frame.contentDocument.createElement('iframe');
+ child.src = '/history.html?child';
+ loaded = new Promise(resolve => child.onload = resolve);
+ frame.contentDocument.body.append(child);
+ await loaded;
+
+ const windows = [frame.contentWindow, child.contentWindow];
+ const snapshot = win => win.closed;
+ if (mode === 'remove') frame.remove();
+ else if (mode === 'replace') mount.replaceChildren();
+ else if (mode === 'ancestor') container.remove();
+ else if (mode === 'fragment') document.createDocumentFragment().append(frame);
+ else throw new Error('Unknown removal operation');
+
+ const after = windows.map(snapshot);
+ if (mode === 'ancestor') {
+ frame.remove();
+ document.body.append(container);
+ }
+ frame.src = '/history.html?replacement';
+ loaded = new Promise(resolve => frame.onload = resolve);
+ mount.append(frame);
+ await loaded;
+
+ const reinserted = windows.map(snapshot);
+ const fresh = {top: frame.contentWindow.top === window,
+ parent: frame.contentWindow.parent === window,
+ frameElement: frame.contentWindow.frameElement === frame,
+ closed: frame.contentWindow.closed, different: windows[0] !== frame.contentWindow};
+ const result = {after, reinserted, fresh};
+ container.remove();
+ return result;
+}