eliott/servo
1
0
Fork 0
mirror of https://github.com/servo/servo synced 2026-04-26 01:25:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

script: Pass &mut JSContext in FetchResponseListener::process_response_eof (#42729)

Browse Source 
`process_response_eof` is the only method that needs cx at least right
now. This PR removes one temp_cx and introduces one, removing that one
will is hard (needs VirtualMethods and a lot of work)

Testing: Just refactor
Part of #40600

---------

Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>
This commit is contained in:
Sam
2026-02-20 17:03:21 +01:00
committed by GitHub
parent 0bc3b61a74
commit 9f1e5d084e
20 changed files with 89 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
components/script/script_module.rs
View File

@@ -743,6 +743,7 @@ impl FetchResponseListener for ModuleContext {
/// Step 13
fn process_response_eof(
mut self,
cx: &mut js::context::JSContext,
_: RequestId,
response: Result<(), NetworkError>,
timing: ResourceFetchTiming,
@@ -753,10 +754,10 @@ impl FetchResponseListener for ModuleContext {
if let Some(window) = global.downcast::<Window>() {
window
.Document()
.finish_load(LoadType::Script(url.clone()), CanGc::note());
.finish_load(LoadType::Script(url.clone()), CanGc::from_cx(cx));
}
network_listener::submit_timing(&self, &response, &timing, CanGc::note());
network_listener::submit_timing(&self, &response, &timing, CanGc::from_cx(cx));
let Some(ModuleStatus::Fetching(pending)) =
global.get_module_map_entry(&self.module_request)
@@ -773,7 +774,7 @@ impl FetchResponseListener for ModuleContext {
if let (Err(error), _) | (_, Err(error)) = (response.as_ref(), self.status.as_ref()) {
error!("Fetching module script failed {:?}", error);
global.set_module_map(self.module_request, ModuleStatus::Loaded(None));
return promise.resolve_native(&(), CanGc::note());
return promise.resolve_native(&(), CanGc::from_cx(cx));
}
let metadata = self.metadata.take().unwrap();
@@ -822,7 +823,7 @@ impl FetchResponseListener for ModuleContext {
true,
1,
self.introduction_type,
CanGc::note(),
CanGc::from_cx(cx),
));
module_script = Some(module_tree);
}
@@ -835,14 +836,14 @@ impl FetchResponseListener for ModuleContext {
&global,
&final_url,
self.introduction_type,
CanGc::note(),
CanGc::from_cx(cx),
));
module_script = Some(module_tree);
}
}
// Step 8. Set moduleMap[(url, moduleType)] to moduleScript, and run onComplete given moduleScript.
global.set_module_map(self.module_request, ModuleStatus::Loaded(module_script));
promise.resolve_native(&(), CanGc::note());
promise.resolve_native(&(), CanGc::from_cx(cx));
}
fn process_csp_violations(&mut self, _request_id: RequestId, violations: Vec<Violation>) {