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

script: use run_a_classic_script algorithm for worker scripts (#39905)

Browse Source 
Workers now call `run_a_classic_worker_script`, also scripts gets
unminified.

Testing: no new tests passes are expected

---------

Signed-off-by: Gae24 <96017547+Gae24@users.noreply.github.com>
This commit is contained in:
Gae24
2025-10-21 09:52:12 +02:00
committed by GitHub
parent cf077efe68
commit 8e689034a2
4 changed files with 92 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -232,11 +232,11 @@ pub(crate) enum SourceCode {
#[derive(JSTraceable, MallocSizeOf)]
pub(crate) struct ScriptOrigin {
code: SourceCode,
pub code: SourceCode,
#[no_trace]
url: ServoUrl,
pub url: ServoUrl,
external: bool,
fetch_options: ScriptFetchOptions,
pub fetch_options: ScriptFetchOptions,
type_: ScriptType,
unminified_dir: Option<String>,
import_map: Fallible<ImportMap>,
@@ -1060,7 +1060,17 @@ impl HTMLScriptElement {
} else {
document.set_current_script(Some(self))
}
self.run_a_classic_script(&script, can_gc, Some(introduction_type));
let line_number = if script.external {
1
} else {
self.line_number as u32
};
self.owner_window().as_global_scope().run_a_classic_script(
&script,
line_number,
Some(introduction_type),
can_gc,
);
document.set_current_script(old_script.as_deref());
},
ScriptType::Module => {
@@ -1085,42 +1095,6 @@ impl HTMLScriptElement {
}
}
// https://html.spec.whatwg.org/multipage/#run-a-classic-script
pub(crate) fn run_a_classic_script(
&self,
script: &ScriptOrigin,
can_gc: CanGc,
introduction_type: Option<&'static CStr>,
) {
// 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;
}
// Steps 4-10
let window = self.owner_window();
let line_number = if script.external {
1
} else {
self.line_number as u32
};
rooted!(in(*GlobalScope::get_cx()) let mut rval = UndefinedValue());
_ = window
.as_global_scope()
.evaluate_script_on_global_with_result(
&script.code,
script.url.as_str(),
rval.handle_mut(),
line_number,
script.fetch_options.clone(),
script.url.clone(),
can_gc,
introduction_type,
);
}
#[allow(unsafe_code)]
/// <https://html.spec.whatwg.org/multipage/#run-a-module-script>
pub(crate) fn run_a_module_script(