Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-26 18:14:34 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use DOMString for internal data of Trusted Types (#37472)

Browse source 
This avoids various conversions back and forth between DOMString and
String. By using DOMString consistently, we avoid these
double-conversions. The only caveat are the USVString which are
initially passed into
TrustedScriptURL.

Part of #36258

Signed-off-by: Tim van der Lippe <tvanderlippe@gmail.com>
This commit is contained in:
Tim van der Lippe 2025-06-15 16:12:33 +02:00 • committed by GitHub
parent dfbd5b7d21
commit 576c7445b8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 72 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -672,8 +672,7 @@ impl HTMLScriptElement {
"HTMLScriptElement",
"text",
can_gc,
)?
.into();
)?;
}
Ok(())
@ -1436,7 +1435,11 @@ impl HTMLScriptElementMethods<crate::DomTypeHolder> for HTMLScriptElement {
local_name,
can_gc,
)?;
element.set_attribute(local_name, AttrValue::String(value), can_gc);
element.set_attribute(
local_name,
AttrValue::String(value.as_ref().to_owned()),
can_gc,
);
Ok(())
}
@ -1524,7 +1527,6 @@ impl HTMLScriptElementMethods<crate::DomTypeHolder> for HTMLScriptElement {
"innerText",
can_gc,
)?;
let value = DOMString::from(value);
*self.script_text.borrow_mut() = value.clone();
// Step 3: Run set the inner text steps with this and value.
self.upcast::<HTMLElement>().set_inner_text(value, can_gc);
@ -1548,7 +1550,6 @@ impl HTMLScriptElementMethods<crate::DomTypeHolder> for HTMLScriptElement {
can_gc,
)?;
// Step 2: Set this's script text value to the given value.
let value = DOMString::from(value);
*self.script_text.borrow_mut() = value.clone();
// Step 3: String replace all with the given value within this.
Node::string_replace_all(value, self.upcast::<Node>(), can_gc);
@ -1575,7 +1576,6 @@ impl HTMLScriptElementMethods<crate::DomTypeHolder> for HTMLScriptElement {
can_gc,
)?;
// Step 2: Set this's script text value to value.
let value = DOMString::from(value);
*self.script_text.borrow_mut() = value.clone();
// Step 3: Run set text content with this and value.
self.upcast::<Node>().SetTextContent(Some(value), can_gc);