eliott/servo
1
0
Fork 0
mirror of https://github.com/servo/servo synced 2026-05-01 20:07:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Replaced DOMString constructor by conversion functions.

Browse Source 
Replaced DOMString(...) by DOMString::from(...).
Replaced ....0 by String::from(...).
Removed any uses of .to_owner() in DOMString::from("...").
This commit is contained in:
Alan Jeffrey
2015-11-11 16:26:53 -06:00
parent 736323a779
commit 84bde75b42
64 changed files with 256 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
components/script/dom/htmloptionelement.rs
View File

@@ -70,7 +70,8 @@ impl HTMLOptionElement {
}
}
fn collect_text(element: &Element, value: &mut DOMString) {
// FIXME(ajeffrey): Provide a way of buffering DOMStrings other than using Strings
fn collect_text(element: &Element, value: &mut String) {
let svg_script = *element.namespace() == ns!(SVG) && element.local_name() == &atom!("script");
let html_script = element.is::<HTMLScriptElement>();
if svg_script || html_script {
@@ -80,7 +81,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.0.push_str(&characterdata.Data());
value.push_str(&characterdata.Data());
} else if let Some(element_child) = child.downcast() {
collect_text(element_child, value);
}
@@ -96,9 +97,9 @@ impl HTMLOptionElementMethods for HTMLOptionElement {
// https://html.spec.whatwg.org/multipage/#dom-option-text
fn Text(&self) -> DOMString {
let mut content = DOMString::new();
let mut content = String::new();
collect_text(self.upcast(), &mut content);
DOMString(str_join(split_html_space_chars(&content), " "))
DOMString::from(str_join(split_html_space_chars(&content), " "))
}
// https://html.spec.whatwg.org/multipage/#dom-option-text