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

script: Pass &mut JSContext to Location (#43481)

Browse Source 
Part of #42638

Testing: It compiles

Signed-off-by: Tim van der Lippe <tvanderlippe@gmail.com>
This commit is contained in:
Tim van der Lippe
2026-03-20 13:54:38 +01:00
committed by GitHub
parent ffae45327c
commit dc9e442b17
9 changed files with 151 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
components/script/script_thread.rs
View File

@@ -1863,9 +1863,7 @@ impl ScriptThread {
ScriptThreadMessage::ReportCSSError(pipeline_id, filename, line, column, msg) => {
self.handle_css_error_reporting(pipeline_id, filename, line, column, msg)
},
ScriptThreadMessage::Reload(pipeline_id) => {
self.handle_reload(pipeline_id, CanGc::from_cx(cx))
},
ScriptThreadMessage::Reload(pipeline_id) => self.handle_reload(pipeline_id, cx),
ScriptThreadMessage::Resize(id, size, size_type) => {
self.handle_resize_message(id, size, size_type);
},
@@ -2239,7 +2237,7 @@ impl ScriptThread {
DevtoolScriptControlMsg::GoForward(pipeline_id) => {
self.handle_traverse_history(pipeline_id, TraversalDirection::Forward(1))
},
DevtoolScriptControlMsg::Reload(id) => self.handle_reload(id, CanGc::from_cx(cx)),
DevtoolScriptControlMsg::Reload(id) => self.handle_reload(id, cx),
DevtoolScriptControlMsg::GetCssDatabase(reply) => {
devtools::handle_get_css_database(reply)
},
@@ -4159,10 +4157,10 @@ impl ScriptThread {
}
}
fn handle_reload(&self, pipeline_id: PipelineId, can_gc: CanGc) {
fn handle_reload(&self, pipeline_id: PipelineId, cx: &mut js::context::JSContext) {
let window = self.documents.borrow().find_window(pipeline_id);
if let Some(window) = window {
window.Location().reload_without_origin_check(can_gc);
window.Location(cx).reload_without_origin_check(cx);
}
}