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

Replace jsval_to_str and jsval_to_domstring with a FromJSValConvertible implementation.

Browse source
This commit is contained in:
Ms2ger 2014-03-06 10:56:35 +01:00
parent 17411db8ca
commit 58382471d5
3 changed files with 49 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/components/script/dom/bindings/utils.rs
View file

@ -161,41 +161,6 @@ pub fn jsid_to_str(cx: *JSContext, id: jsid) -> DOMString {
}
}
#[deriving(Eq)]
pub enum StringificationBehavior {
Default,
Empty,
}
pub fn jsval_to_str(cx: *JSContext, v: JSVal,
nullBehavior: StringificationBehavior) -> Result<DOMString, ()> {
if v.is_null() && nullBehavior == Empty {
Ok(~"")
} else {
let jsstr = unsafe { JS_ValueToString(cx, v) };
if jsstr.is_null() {
debug!("JS_ValueToString failed");
Err(())
} else {
Ok(jsstring_to_str(cx, jsstr))
}
}
}
pub fn jsval_to_domstring(cx: *JSContext, v: JSVal) -> Result<Option<DOMString>, ()> {
if v.is_null_or_undefined() {
Ok(None)
} else {
let jsstr = unsafe { JS_ValueToString(cx, v) };
if jsstr.is_null() {
debug!("JS_ValueToString failed");
Err(())
} else {
Ok(Some(jsstring_to_str(cx, jsstr)))
}
}
}
// We use slot 0 for holding the raw object. This is safe for both
// globals and non-globals.
pub static DOM_OBJECT_SLOT: uint = 0;