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

43
components/script/script_thread.rs
View File

@@ -85,7 +85,7 @@ use profile_traits::mem::{ProcessReports, ReportsChan, perform_memory_report};
use profile_traits::time::ProfilerCategory;
use profile_traits::time_profile;
use rustc_hash::{FxHashMap, FxHashSet};
use script_bindings::script_runtime::JSContext;
use script_bindings::script_runtime::{JSContext, temp_cx};
use script_traits::{
ConstellationInputEvent, DiscardBrowsingContext, DocumentActivity, InitialScriptState,
NewPipelineInfo, Painter, ProgressiveWebMetricType, ScriptThreadMessage,
@@ -2076,7 +2076,7 @@ impl ScriptThread {
pipeline_id,
message,
} => {
self.handle_navigation_response(pipeline_id, *message);
self.handle_navigation_response(cx, pipeline_id, *message);
},
MainThreadScriptMsg::WorkletLoaded(pipeline_id) => {
self.handle_worklet_loaded(pipeline_id)
@@ -2668,7 +2668,10 @@ impl ScriptThread {
}
}
#[expect(unsafe_code)]
pub(crate) fn spawn_pipeline(&self, new_pipeline_info: NewPipelineInfo) {
let mut cx = unsafe { temp_cx() };
let cx = &mut cx;
self.profile_event(
ScriptThreadEventCategory::SpawnPipeline,
Some(new_pipeline_info.new_pipeline_id),
@@ -2697,7 +2700,7 @@ impl ScriptThread {
};
// Kick off the fetch for the new resource.
self.pre_page_load(InProgressLoad::new(new_pipeline_info, origin));
self.pre_page_load(cx, InProgressLoad::new(new_pipeline_info, origin));
},
);
}
@@ -3720,14 +3723,14 @@ impl ScriptThread {
/// Instructs the constellation to fetch the document that will be loaded. Stores the InProgressLoad
/// argument until a notification is received that the fetch is complete.
fn pre_page_load(&self, mut incomplete: InProgressLoad) {
fn pre_page_load(&self, cx: &mut js::context::JSContext, mut incomplete: InProgressLoad) {
let url_str = incomplete.load_data.url.as_str();
if url_str == "about:blank" {
self.start_page_load_about_blank(incomplete);
self.start_page_load_about_blank(cx, incomplete);
return;
}
if url_str == "about:srcdoc" {
self.page_load_about_srcdoc(incomplete);
self.page_load_about_srcdoc(cx, incomplete);
return;
}
@@ -3753,7 +3756,12 @@ impl ScriptThread {
self.incomplete_loads.borrow_mut().push(incomplete);
}
fn handle_navigation_response(&self, pipeline_id: PipelineId, message: FetchResponseMsg) {
fn handle_navigation_response(
&self,
cx: &mut js::context::JSContext,
pipeline_id: PipelineId,
message: FetchResponseMsg,
) {
if let Some(metadata) = NavigationListener::http_redirect_metadata(&message) {
self.handle_navigation_redirect(pipeline_id, metadata);
return;
@@ -3767,7 +3775,7 @@ impl ScriptThread {
self.handle_fetch_chunk(pipeline_id, request_id, chunk.0)
},
FetchResponseMsg::ProcessResponseEOF(request_id, eof, timing) => {
self.handle_fetch_eof(pipeline_id, request_id, eof, timing)
self.handle_fetch_eof(cx, pipeline_id, request_id, eof, timing)
},
FetchResponseMsg::ProcessCspViolations(request_id, violations) => {
self.handle_csp_violations(pipeline_id, request_id, violations)
@@ -3812,6 +3820,7 @@ impl ScriptThread {
fn handle_fetch_eof(
&self,
cx: &mut js::context::JSContext,
id: PipelineId,
request_id: RequestId,
eof: Result<(), NetworkError>,
@@ -3842,11 +3851,11 @@ impl ScriptThread {
// submit_timing will only accept timing that is of type ResourceTimingType::Resource
let mut resource_timing = timing.clone();
resource_timing.timing_type = ResourceTimingType::Resource;
submit_timing(&iframe_ctx, &eof, &resource_timing, CanGc::note());
submit_timing(&iframe_ctx, &eof, &resource_timing, CanGc::from_cx(cx));
}
}
context.process_response_eof(request_id, eof, timing);
context.process_response_eof(cx, request_id, eof, timing);
}
}
@@ -3912,7 +3921,11 @@ impl ScriptThread {
/// Synchronously fetch `about:blank`. Stores the `InProgressLoad`
/// argument until a notification is received that the fetch is complete.
fn start_page_load_about_blank(&self, mut incomplete: InProgressLoad) {
fn start_page_load_about_blank(
&self,
cx: &mut js::context::JSContext,
mut incomplete: InProgressLoad,
) {
let url = ServoUrl::parse("about:blank").unwrap();
let mut context = ParserContext::new(
incomplete.webview_id,
@@ -3946,6 +3959,7 @@ impl ScriptThread {
context.set_about_base_url(about_base_url);
context.process_response_chunk(dummy_request_id, chunk);
context.process_response_eof(
cx,
dummy_request_id,
Ok(()),
ResourceFetchTiming::new(ResourceTimingType::None),
@@ -3953,7 +3967,11 @@ impl ScriptThread {
}
/// Synchronously parse a srcdoc document from a giving HTML string.
fn page_load_about_srcdoc(&self, mut incomplete: InProgressLoad) {
fn page_load_about_srcdoc(
&self,
cx: &mut js::context::JSContext,
mut incomplete: InProgressLoad,
) {
let url = ServoUrl::parse("about:srcdoc").unwrap();
let mut meta = Metadata::default(url.clone());
meta.set_content_type(Some(&mime::TEXT_HTML));
@@ -3979,6 +3997,7 @@ impl ScriptThread {
context.set_about_base_url(about_base_url);
context.process_response_chunk(dummy_request_id, chunk);
context.process_response_eof(
cx,
dummy_request_id,
Ok(()),
ResourceFetchTiming::new(ResourceTimingType::None),