Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-09-30 16:49:16 +01:00
Code Issues Projects Releases Packages Wiki Activity

Script: Change script/dom/{bluetooth,canvas,html} to not rely on Deref<str> for DOMString (#39480)

Browse source 
This is part of the future work of implementing LazyDOMString as
outlined in https://github.com/servo/servo/issues/39479.

We use str() method or direct implementations on DOMString for these
methods. We also change some types.

Signed-off-by: Narfinger <Narfinger@users.noreply.github.com>


Testing: This is essentially just renaming a method and a type and
should not change functionality.

Signed-off-by: Narfinger <Narfinger@users.noreply.github.com>
This commit is contained in:
Narfinger 2025-09-25 17:53:21 +02:00 • committed by GitHub
parent 1e471b9b41
commit a4c8ffe753
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
23 changed files with 97 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/script/dom/html/htmlfontelement.rs
View file

@ -177,12 +177,12 @@ impl HTMLFontElementLayoutHelpers for LayoutDom<'_, HTMLFontElement> {
}
/// <https://html.spec.whatwg.org/multipage/#rules-for-parsing-a-legacy-font-size>
fn parse_size(mut input: &str) -> AttrValue {
fn parse_size(input: &DOMString) -> AttrValue {
let original_input = input;
// Steps 1 & 2 are not relevant
// Step 3
input = input.trim_matches(HTML_SPACE_CHARACTERS);
let input = input.str().trim_matches(HTML_SPACE_CHARACTERS);
enum ParseMode {
RelativePlus,
@ -192,7 +192,7 @@ fn parse_size(mut input: &str) -> AttrValue {
let mut input_chars = input.chars().peekable();
let parse_mode = match input_chars.peek() {
// Step 4
None => return AttrValue::String(original_input.into()),
None => return AttrValue::String(original_input.str().into()),
// Step 5
Some(&'+') => {
@ -209,7 +209,7 @@ fn parse_size(mut input: &str) -> AttrValue {
// Steps 6, 7, 8
let mut value = match read_numbers(input_chars) {
(Some(v), _) if v >= 0 => v,
_ => return AttrValue::String(original_input.into()),
_ => return AttrValue::String(original_input.str().into()),
};
// Step 9
@ -220,5 +220,5 @@ fn parse_size(mut input: &str) -> AttrValue {
}
// Steps 10, 11, 12
AttrValue::UInt(original_input.into(), value as u32)
AttrValue::UInt(original_input.str().into(), value as u32)
}