eliott/servo
1
0
Fork 0
mirror of https://github.com/servo/servo synced 2026-04-27 18:07:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

script: Pass down &mut JSContext in servoparser and event loop. (#42635)

Browse Source 
I only wanted to get `&mut JSContext` in microtask chunk and checkpoint,
but this in turn needed `&mut JSContext` in servoparser, which then
caused need for even more changes in script.

I tried to limit the size by putting some `temp_cx` in:
- drops of `LoadBlocker`, `GenericAutoEntryScript`
- methods of `VirtualMethods`
- methods of `FetchResponseListener`

Testing: Just refactor, but should be covered by WPT tests.
Part of #40600

---------

Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>
This commit is contained in:
Sam
2026-02-25 08:14:23 +01:00
committed by GitHub
parent a4d98df1a9
commit 3e2f14c455
37 changed files with 862 additions and 676 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
components/script/dom/html/htmlscriptelement.rs
View File

@@ -263,7 +263,7 @@ fn finish_fetching_a_classic_script(
script_kind: ExternalScriptKind,
url: ServoUrl,
load: ScriptResult,
can_gc: CanGc,
cx: &mut js::context::JSContext,
) {
// Step 33. The "steps to run when the result is ready" for each type of script in 33.2-33.5.
// of https://html.spec.whatwg.org/multipage/#prepare-the-script-element
@@ -272,23 +272,23 @@ fn finish_fetching_a_classic_script(
match script_kind {
ExternalScriptKind::Asap => {
document = elem.preparation_time_document.get().unwrap();
document.asap_script_loaded(elem, load, can_gc)
document.asap_script_loaded(elem, load, CanGc::from_cx(cx))
},
ExternalScriptKind::AsapInOrder => {
document = elem.preparation_time_document.get().unwrap();
document.asap_in_order_script_loaded(elem, load, can_gc)
document.asap_in_order_script_loaded(elem, load, CanGc::from_cx(cx))
},
ExternalScriptKind::Deferred => {
document = elem.parser_document.as_rooted();
document.deferred_script_loaded(elem, load, can_gc);
document.deferred_script_loaded(elem, load, CanGc::from_cx(cx));
},
ExternalScriptKind::ParsingBlocking => {
document = elem.parser_document.as_rooted();
document.pending_parsing_blocking_script_loaded(elem, load, can_gc);
document.pending_parsing_blocking_script_loaded(elem, load, cx);
},
}
document.finish_load(LoadType::Script(url), can_gc);
document.finish_load(LoadType::Script(url), cx);
}
pub(crate) type ScriptResult = Result<Script, ()>;
@@ -387,7 +387,7 @@ impl FetchResponseListener for ClassicContext {
self.kind,
self.url.clone(),
Err(()),
CanGc::from_cx(cx),
cx,
);
// Resource timing is expected to be available before "error" or "load" events are fired.
@@ -463,13 +463,7 @@ impl FetchResponseListener for ClassicContext {
}
} else {*/
let load = Script::Classic(script);
finish_fetching_a_classic_script(
&elem,
self.kind,
self.url.clone(),
Ok(load),
CanGc::from_cx(cx),
);
finish_fetching_a_classic_script(&elem, self.kind, self.url.clone(), Ok(load), cx);
// }
network_listener::submit_timing(&self, &response, &timing, CanGc::from_cx(cx));