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): isolate stylesheet parser resume authority

ldm012e122c8fe4c
diff --git a/moli-renderer-v8/src/runtime/page_vm/page_networking_task_completion.rs b/moli-renderer-v8/src/runtime/page_vm/page_networking_task_completion.rs
index 7805a0f8e..44b50f9f3 100644
--- a/moli-renderer-v8/src/runtime/page_vm/page_networking_task_completion.rs
+++ b/moli-renderer-v8/src/runtime/page_vm/page_networking_task_completion.rs
@@ -7,7 +7,7 @@
use anyhow::Result;
-use crate::page_task_queue::PageNetworkingTurnAction;
+use crate::page_task_queue::{PageNetworkingTurnAction, PageStylesheetNetworkingTargetEffect};
use super::{IntoPageTaskCompletion, PageVm};
@@ -36,18 +36,37 @@ impl PageVm {
.await?;
}
PageNetworkingTurnAction::StylesheetCompletion(action) => {
+ let completion_owner = action.owner;
+ let applied_to_current_owner = matches!(
+ action.target_effect,
+ PageStylesheetNetworkingTargetEffect::AppliedToCurrentOwner
+ );
self.finish_selected_page_task_completion(
action.into_page_task_completion(),
loader,
)
.await?;
- // A stylesheet terminal may release a parser created by
- // document.write()/Page.setDocumentContent after the initial
- // phase-one driver has retired. Resume that parser at the
- // resource-completion boundary, before the independently
- // queued link/style load event can be selected.
- self.run_ready_document_write_stylesheet_blocked_script()
- .await?;
+ let completion_owner_is_still_current = self.vm().stylesheet_task_owner_is_current(
+ self.document_lifecycle.identity().document,
+ completion_owner,
+ );
+ // Phase one consumes its selected, exact-owner continuation
+ // as the sole parser-resume authority. The direct fallback is
+ // only for a document.write()/Page.setDocumentContent parser
+ // created after that driver retired. A stale completion, or a
+ // checkpoint that replaced its Document, must never touch the
+ // replacement parser.
+ if applied_to_current_owner
+ && completion_owner_is_still_current
+ && self
+ .vm()
+ .document_runtime
+ .main_parser_continuation_producer()
+ .is_none()
+ {
+ self.run_ready_document_write_stylesheet_blocked_script()
+ .await?;
+ }
}
PageNetworkingTurnAction::WorkerHostBridge(action) => {
self.finish_selected_page_task_completion(
diff --git a/moli-renderer-v8/src/runtime/page_vm/tests/stylesheet_task.rs b/moli-renderer-v8/src/runtime/page_vm/tests/stylesheet_task.rs
index 379f06d5e..14850b480 100644
--- a/moli-renderer-v8/src/runtime/page_vm/tests/stylesheet_task.rs
+++ b/moli-renderer-v8/src/runtime/page_vm/tests/stylesheet_task.rs
@@ -1095,6 +1095,12 @@ async fn stale_linked_import_completion_does_not_repopulate_replacement_graph()
".retired-import { color: red; }".to_owned(),
Duration::from_millis(100),
),
+ (
+ "/replacement-blocker.css",
+ "HTTP/1.1 200 OK",
+ "body { color: green; }".to_owned(),
+ Duration::from_secs(2),
+ ),
])
.await;
let loader =
@@ -1142,8 +1148,28 @@ document.head.append(retired);
.take_stylesheet_networking_body_task_for_test()
.expect("the delayed linked import terminal should remain selectable");
+ let replacement_blocker = format!("{base_url}/replacement-blocker.css");
+ page_vm.vm_mut().eval(&format!(
+ r#"
+document.open();
+globalThis.__replacementParserTail = "pending";
+document.write('<!doctype html><html><head><link id="replacement-blocker" rel="stylesheet" href="{replacement_blocker}"></head><body><script>globalThis.__replacementParserTail = "ran";</script><p>tail</p>');
+"replaced"
+"#,
+ ))?;
+ assert!(
+ page_vm
+ .vm()
+ .document_runtime
+ .has_pending_document_write_stylesheet_blocked_script(),
+ "Document B should retain its own stylesheet-blocked parser tail"
+ );
+ assert_eq!(
+ page_vm.vm_mut().eval("__replacementParserTail")?,
+ "pending"
+ );
page_vm.vm_mut().eval(
- "document.open(); document.write('<!doctype html><p>replacement</p>'); document.close();",
+ "document.getElementById('replacement-blocker').remove(); 'removed'",
)?;
assert_eq!(
page_vm
@@ -1197,7 +1223,12 @@ document.head.append(retired);
&loader,
)
.await?;
- server.await.expect("stale linked import fixture server");
+ assert_eq!(
+ page_vm.vm_mut().eval("__replacementParserTail")?,
+ "pending",
+ "Document A's stale completion must not resume Document B's parser"
+ );
+ server.abort();
Ok::<_, anyhow::Error>(())
})
.await