Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

script: Move TaskManager to GlobalScope (#34827)

Browse source 
This is a simplification of the internal `TaskQueue` API that moves the
`TaskManager` to the `GlobalScope` itself. In addition, the handling of
cancellers is moved to the `TaskManager` as well. This means that no
arguments other than the `task` are necessary for queueing tasks, which
makes the API a lot easier to use and cleaner.

`TaskSource` now also keeps a copy of the canceller with it, so that
they always know the proper way to cancel any tasks queued on them.

There is one complication here. The event loop `sender` for dedicated
workers is constantly changing as it is set to `None` when not handling
messages. This is because this sender keeps a handle to the main
thread's `Worker` object, preventing garbage collection while any
messages are still in flight or being handled. This change allows
setting the `sender` on the `TaskManager` to `None` to allow proper
garbabge collection.

Signed-off-by: Martin Robinson <mrobinson@igalia.com>
This commit is contained in:
Martin Robinson 2025-01-04 09:41:50 +01:00 • committed by GitHub
parent 75a22cfe2e
commit b2eda71952
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
54 changed files with 1060 additions and 1516 deletions
Download patch file Download diff file Expand all files Collapse all files

13
components/script/dom/htmlscriptelement.rs
View file

@ -64,7 +64,6 @@ use crate::script_module::{
fetch_external_module_script, fetch_inline_module_script, ModuleOwner, ScriptFetchOptions,
};
use crate::script_runtime::CanGc;
use crate::task::TaskCanceller;
use crate::task_source::{TaskSource, TaskSourceName};
use crate::unminify::{unminify_js, ScriptSource};
@ -102,7 +101,6 @@ impl ScriptSource for ScriptOrigin {
final_url: ServoUrl,
url: ServoUrl,
task_source: TaskSource,
canceller: TaskCanceller,
script_text: String,
fetch_options: ScriptFetchOptions,
}
@ -123,7 +121,7 @@ unsafe extern "C" fn off_thread_compilation_callback(
let fetch_options = context.fetch_options.clone();
// Continue with <https://html.spec.whatwg.org/multipage/#fetch-a-classic-script>
let _ = context.task_source.queue_with_canceller(
let _ = context.task_source.queue(
task!(off_thread_compile_continue: move || {
let elem = script_element.root();
let global = elem.global();
@ -157,8 +155,7 @@ unsafe extern "C" fn off_thread_compilation_callback(
};
finish_fetching_a_classic_script(&elem, script_kind, url, load);
}),
&context.canceller,
})
);
}*/
@ -476,7 +473,6 @@ impl FetchResponseListener for ClassicContext {
final_url,
url: self.url.clone(),
task_source: global.task_manager().dom_manipulation_task_source(),
canceller: global.task_canceller(TaskSourceName::DOMManipulation),
script_text: source_string,
fetch_options: self.fetch_options.clone(),
});
@ -1061,11 +1057,10 @@ impl HTMLScriptElement {
}
pub fn queue_error_event(&self) {
let window = self.owner_window();
window
self.owner_window()
.task_manager()
.dom_manipulation_task_source()
.queue_simple_event(self.upcast(), atom!("error"), &window);
.queue_simple_event(self.upcast(), atom!("error"));
}
pub fn dispatch_load_event(&self, can_gc: CanGc) {