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

Move run_a_module_script() to GlobalScope (#41459)

Browse Source 
Prerequisite for #40365.

Moving `run_a_module_script()` to `GlobalScope` will allow us to execute
module scripts on `WorkerGlobalScope`.

---

Relates to #23308

Signed-off-by: pylbrecht <pylbrecht@mailbox.org>
This commit is contained in:
Philipp Albrecht
2026-02-22 10:14:39 +01:00
committed by GitHub
parent c2333e1521
commit adee703046
2 changed files with 58 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
components/script/dom/html/htmlscriptelement.rs
View File

@@ -14,7 +14,6 @@ use dom_struct::dom_struct;
use encoding_rs::Encoding;
use html5ever::{LocalName, Prefix, local_name, ns};
use js::context::JSContext;
use js::jsval::UndefinedValue;
use js::rust::{HandleObject, Stencil};
use net_traits::http_status::HttpStatus;
use net_traits::request::{
@@ -41,7 +40,6 @@ use crate::dom::bindings::inheritance::Castable;
use crate::dom::bindings::refcounted::Trusted;
use crate::dom::bindings::reflector::DomGlobal;
use crate::dom::bindings::root::{Dom, DomRoot, MutNullableDom};
use crate::dom::bindings::settings_stack::AutoEntryScript;
use crate::dom::bindings::str::DOMString;
use crate::dom::csp::{CspReporting, GlobalCspReporting, InlineCheckType, Violation};
use crate::dom::document::Document;
@@ -1017,7 +1015,11 @@ impl HTMLScriptElement {
document.set_current_script(None);
// Step 6."module".2. Run the module script given by el's result.
self.run_a_module_script(module_tree, false, can_gc);
self.owner_window().as_global_scope().run_a_module_script(
module_tree,
false,
can_gc,
);
},
Script::ImportMap(script) => {
// Step 6."importmap".1. Register an import map given el's relevant global object and el's result.
@@ -1037,47 +1039,6 @@ impl HTMLScriptElement {
}
}
/// <https://html.spec.whatwg.org/multipage/#run-a-module-script>
pub(crate) fn run_a_module_script(
&self,
module_tree: Rc<ModuleTree>,
_rethrow_errors: bool,
can_gc: CanGc,
) {
// TODO use a settings object rather than this element's document/window
// Step 2
let document = self.owner_document();
if !document.is_fully_active() || !document.scripting_enabled() {
return;
}
// Step 4
let window = self.owner_window();
let global = window.as_global_scope();
let _aes = AutoEntryScript::new(global);
// Step 6.
{
let module_error = module_tree.get_rethrow_error().borrow();
if module_error.is_some() {
module_tree.report_error(global, can_gc);
return;
}
}
let record = module_tree.get_record().map(|record| record.handle());
if let Some(record) = record {
rooted!(in(*GlobalScope::get_cx()) let mut rval = UndefinedValue());
let evaluated = module_tree.execute_module(global, record, rval.handle_mut(), can_gc);
if let Err(exception) = evaluated {
module_tree.set_rethrow_error(exception);
module_tree.report_error(global, can_gc);
}
}
}
pub(crate) fn queue_error_event(&self) {
self.owner_global()
.task_manager()