Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-10-13 06:50:28 +01:00
Code Issues Projects Releases Packages Wiki Activity

Replace str_to_jsval and domstring_to_jsval by a ToJSValConvertible implementation.

Browse source
This commit is contained in:
Ms2ger 2014-03-10 11:40:13 +01:00
parent 476699a114
commit 17411db8ca
3 changed files with 23 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/components/script/dom/bindings/conversions.rs
View file

@ -2,13 +2,17 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use servo_util::str::DOMString;
use js::jsapi::{JSBool, JSContext};
use js::jsapi::{JS_ValueToUint64, JS_ValueToInt64};
use js::jsapi::{JS_ValueToECMAUint32, JS_ValueToECMAInt32};
use js::jsapi::{JS_ValueToUint16, JS_ValueToNumber, JS_ValueToBoolean};
use js::jsapi::{JS_NewUCStringCopyN};
use js::jsval::JSVal;
use js::jsval::{NullValue, BooleanValue, Int32Value, UInt32Value};
use js::jsval::{NullValue, BooleanValue, Int32Value, UInt32Value, StringValue};
use js::glue::RUST_JS_NumberValue;
use std::libc;
pub trait ToJSValConvertible {
fn to_jsval(&self, cx: *JSContext) -> JSVal;
@ -176,6 +180,19 @@ impl FromJSValConvertible<()> for f64 {
}
}
impl ToJSValConvertible for DOMString {
fn to_jsval(&self, cx: *JSContext) -> JSVal {
unsafe {
let string_utf16 = self.to_utf16();
let jsstr = JS_NewUCStringCopyN(cx, string_utf16.as_ptr(), string_utf16.len() as libc::size_t);
if jsstr.is_null() {
fail!("JS_NewUCStringCopyN failed");
}
StringValue(&*jsstr)
}
}
}
impl<T: ToJSValConvertible> ToJSValConvertible for Option<T> {
fn to_jsval(&self, cx: *JSContext) -> JSVal {
match self {