mirror of
https://github.com/servo/servo
synced 2026-04-25 17:15:48 +02:00
script: Pass &mut JSContext to FetchResponseListener::process_response (#43259)
Add the cx parameter to `fn process_response` in the `FetchResponseListener` trait and the traits that that interface change requires. Chose to add it as the first parameter, following the same order that `FetchResponseListener::process_response_eof` uses. Testing: Checked that servo builds locally as well as `./mach fmt` and `./mach test-tidy`. I don't think more tests are needed as we are not introducing new functionality Fixes: #42840 --------- Signed-off-by: Javier Olaechea <pirata@gmail.com>
This commit is contained in:
@@ -3871,7 +3871,7 @@ impl ScriptThread {
|
||||
|
||||
match message {
|
||||
FetchResponseMsg::ProcessResponse(request_id, metadata) => {
|
||||
self.handle_fetch_metadata(pipeline_id, request_id, metadata)
|
||||
self.handle_fetch_metadata(cx, pipeline_id, request_id, metadata)
|
||||
},
|
||||
FetchResponseMsg::ProcessResponseChunk(request_id, chunk) => {
|
||||
self.handle_fetch_chunk(pipeline_id, request_id, chunk.0)
|
||||
@@ -3889,6 +3889,7 @@ impl ScriptThread {
|
||||
|
||||
fn handle_fetch_metadata(
|
||||
&self,
|
||||
cx: &mut js::context::JSContext,
|
||||
id: PipelineId,
|
||||
request_id: RequestId,
|
||||
fetch_metadata: Result<FetchMetadata, NetworkError>,
|
||||
@@ -3906,7 +3907,7 @@ impl ScriptThread {
|
||||
.iter_mut()
|
||||
.find(|&&mut (pipeline_id, _)| pipeline_id == id);
|
||||
if let Some(&mut (_, ref mut ctxt)) = parser {
|
||||
ctxt.process_response(request_id, fetch_metadata);
|
||||
ctxt.process_response(cx, request_id, fetch_metadata);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4057,7 +4058,7 @@ impl ScriptThread {
|
||||
self.incomplete_loads.borrow_mut().push(incomplete);
|
||||
|
||||
let dummy_request_id = RequestId::default();
|
||||
context.process_response(dummy_request_id, Ok(FetchMetadata::Unfiltered(meta)));
|
||||
context.process_response(cx, dummy_request_id, Ok(FetchMetadata::Unfiltered(meta)));
|
||||
context.set_policy_container(policy_container.as_ref());
|
||||
context.set_about_base_url(about_base_url);
|
||||
context.process_response_chunk(dummy_request_id, chunk);
|
||||
@@ -4095,7 +4096,7 @@ impl ScriptThread {
|
||||
ParserContext::new(webview_id, pipeline_id, url, creation_sandboxing_flag_set);
|
||||
let dummy_request_id = RequestId::default();
|
||||
|
||||
context.process_response(dummy_request_id, Ok(FetchMetadata::Unfiltered(meta)));
|
||||
context.process_response(cx, dummy_request_id, Ok(FetchMetadata::Unfiltered(meta)));
|
||||
context.set_policy_container(policy_container.as_ref());
|
||||
context.set_about_base_url(about_base_url);
|
||||
context.process_response_chunk(dummy_request_id, chunk);
|
||||
|
||||
Reference in New Issue
Block a user