mirror of
https://github.com/servo/servo
synced 2026-05-05 06:32:13 +02:00
Make DOMString a newtype around String, rather than a typedef.
This should make it somewhat easier to experiment with alternative representations in the future. To reduce churn, this commit leaves the String field public, though. Also, this will allow us to use the default String type to represent the IDL USVString type, which explicitly forbids unpaired surrogates, ans as such is a better match to the Rust String type.
This commit is contained in:
@@ -80,7 +80,7 @@ fn collect_text(element: &Element, value: &mut DOMString) {
|
||||
for child in element.upcast::<Node>().children() {
|
||||
if child.is::<Text>() {
|
||||
let characterdata = child.downcast::<CharacterData>().unwrap();
|
||||
value.push_str(&characterdata.Data());
|
||||
value.0.push_str(&characterdata.Data());
|
||||
} else if let Some(element_child) = child.downcast() {
|
||||
collect_text(element_child, value);
|
||||
}
|
||||
@@ -98,7 +98,7 @@ impl HTMLOptionElementMethods for HTMLOptionElement {
|
||||
fn Text(&self) -> DOMString {
|
||||
let mut content = DOMString::new();
|
||||
collect_text(self.upcast(), &mut content);
|
||||
str_join(split_html_space_chars(&content), " ")
|
||||
DOMString(str_join(split_html_space_chars(&content), " "))
|
||||
}
|
||||
|
||||
// https://html.spec.whatwg.org/multipage/#dom-option-text
|
||||
|
||||
Reference in New Issue
Block a user