aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/bindings
diff options
context:
space:
mode:
authorAlan Jeffrey <ajeffrey@mozilla.com>2015-11-11 16:26:53 -0600
committerAlan Jeffrey <ajeffrey@mozilla.com>2015-11-12 17:52:59 -0600
commit84bde75b420e7035cee891781a3805d5c8c4cdeb (patch)
tree061040f39149d530b059a998be832c7f9b0a8134 /components/script/dom/bindings
parent736323a7796594a5b966ab6ae690e5cc51225a14 (diff)
downloadservo-84bde75b420e7035cee891781a3805d5c8c4cdeb.tar.gz
servo-84bde75b420e7035cee891781a3805d5c8c4cdeb.zip
Replaced DOMString constructor by conversion functions.
Replaced DOMString(...) by DOMString::from(...). Replaced ....0 by String::from(...). Removed any uses of .to_owner() in DOMString::from("...").
Diffstat (limited to 'components/script/dom/bindings')
-rw-r--r--components/script/dom/bindings/conversions.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/components/script/dom/bindings/conversions.rs b/components/script/dom/bindings/conversions.rs
index dcc1f164d25..29997ebb55b 100644
--- a/components/script/dom/bindings/conversions.rs
+++ b/components/script/dom/bindings/conversions.rs
@@ -159,7 +159,8 @@ impl FromJSValConvertible for USVString {
}
let latin1 = JS_StringHasLatin1Chars(jsstr);
if latin1 {
- return Ok(USVString(jsstring_to_str(cx, jsstr).0));
+ // FIXME(ajeffrey): Convert directly from DOMString to USVString
+ return Ok(USVString(String::from(jsstring_to_str(cx, jsstr))));
}
let mut length = 0;
let chars = JS_GetTwoByteStringCharsAndLength(cx, ptr::null(), jsstr, &mut length);