diff options
Diffstat (limited to 'components/script/dom')
| -rw-r--r-- | components/script/dom/bindings/codegen/CodegenRust.py | 44 | ||||
| -rw-r--r-- | components/script/dom/bindings/conversions.rs | 569 | ||||
| -rw-r--r-- | components/script/dom/bindings/utils.rs | 13 | ||||
| -rw-r--r-- | components/script/dom/htmliframeelement.rs | 23 | ||||
| -rw-r--r-- | components/script/dom/webglrenderingcontext.rs | 23 | ||||
| -rw-r--r-- | components/script/dom/websocket.rs | 38 | ||||
| -rw-r--r-- | components/script/dom/window.rs | 3 | ||||
| -rw-r--r-- | components/script/dom/xmlhttprequest.rs | 44 |
8 files changed, 144 insertions, 613 deletions
diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py index fbe2c46e9de..14a26268efd 100644 --- a/components/script/dom/bindings/codegen/CodegenRust.py +++ b/components/script/dom/bindings/codegen/CodegenRust.py @@ -3413,7 +3413,7 @@ pub const strings: &'static [&'static str] = &[ ]; impl ToJSValConvertible for super::%s { - fn to_jsval(&self, cx: *mut JSContext, rval: MutableHandleValue) { + unsafe fn to_jsval(&self, cx: *mut JSContext, rval: MutableHandleValue) { strings[*self as usize].to_jsval(cx, rval); } } @@ -3534,7 +3534,7 @@ pub enum %s { } impl ToJSValConvertible for %s { - fn to_jsval(&self, cx: *mut JSContext, rval: MutableHandleValue) { + unsafe fn to_jsval(&self, cx: *mut JSContext, rval: MutableHandleValue) { match *self { %s } @@ -3644,12 +3644,12 @@ class CGUnionConversionStruct(CGThing): names.append(name) conversions.append(CGGeneric( - "unsafe { throw_not_in_union(cx, \"%s\"); }\n" + "throw_not_in_union(cx, \"%s\");\n" "Err(())" % ", ".join(names))) method = CGWrapper( CGIndenter(CGList(conversions, "\n\n")), - pre="fn from_jsval(cx: *mut JSContext,\n" - " value: HandleValue, _option: ()) -> Result<%s, ()> {\n" % self.type, + pre="unsafe fn from_jsval(cx: *mut JSContext,\n" + " value: HandleValue, _option: ()) -> Result<%s, ()> {\n" % self.type, post="\n}") return CGWrapper( CGIndenter(CGList([ @@ -3666,7 +3666,7 @@ class CGUnionConversionStruct(CGThing): return CGWrapper( CGIndenter(jsConversion, 4), - pre="fn TryConvertTo%s(cx: *mut JSContext, value: HandleValue) -> %s {\n" % (t.name, returnType), + pre="unsafe fn TryConvertTo%s(cx: *mut JSContext, value: HandleValue) -> %s {\n" % (t.name, returnType), post="\n}") def define(self): @@ -4967,8 +4967,8 @@ class CGDictionary(CGThing): "}\n" "\n" "impl ToJSValConvertible for ${selfName} {\n" - " fn to_jsval(&self, cx: *mut JSContext, rval: MutableHandleValue) {\n" - " let obj = unsafe { RootedObject::new(cx, JS_NewObject(cx, ptr::null())) };\n" + " unsafe fn to_jsval(&self, cx: *mut JSContext, rval: MutableHandleValue) {\n" + " let obj = RootedObject::new(cx, JS_NewObject(cx, ptr::null()));\n" "${insertMembers}" " rval.set(ObjectOrNullValue(obj.ptr))\n" " }\n" @@ -5459,7 +5459,7 @@ impl CallbackContainer for ${type} { } impl ToJSValConvertible for ${type} { - fn to_jsval(&self, cx: *mut JSContext, rval: MutableHandleValue) { + unsafe fn to_jsval(&self, cx: *mut JSContext, rval: MutableHandleValue) { self.callback().to_jsval(cx, rval); } }\ @@ -5563,10 +5563,10 @@ class CallbackMember(CGNativeMember): "${convertArgs}" "${doCall}" "${returnResult}").substitute(replacements) - return CGList([ + return CGWrapper(CGIndenter(CGList([ CGGeneric(pre), CGGeneric(body), - ], "\n").define() + ], "\n"), 4), pre="unsafe {\n", post="\n}").define() def getResultConversion(self): replacements = { @@ -5709,15 +5709,13 @@ class CallbackMethod(CallbackMember): replacements["argc"] = "0" return string.Template( "${getCallable}" - "let ok = unsafe {\n" - " let rootedThis = RootedObject::new(cx, ${thisObj});\n" - " JS_CallFunctionValue(\n" - " cx, rootedThis.handle(), callable.handle(),\n" - " &HandleValueArray {\n" - " length_: ${argc} as ::libc::size_t,\n" - " elements_: ${argv}\n" - " }, rval.handle_mut())\n" - "};\n" + "let rootedThis = RootedObject::new(cx, ${thisObj});\n" + "let ok = JS_CallFunctionValue(\n" + " cx, rootedThis.handle(), callable.handle(),\n" + " &HandleValueArray {\n" + " length_: ${argc} as ::libc::size_t,\n" + " elements_: ${argv}\n" + " }, rval.handle_mut());\n" "if !ok {\n" " return Err(JSFailed);\n" "}\n").substitute(replacements) @@ -5732,7 +5730,7 @@ class CallCallback(CallbackMethod): return "aThisObj.get()" def getCallableDecl(self): - return "let callable = RootedValue::new(cx, ObjectValue(unsafe {&*self.parent.callback()}));\n" + return "let callable = RootedValue::new(cx, ObjectValue(&*self.parent.callback()));\n" class CallbackOperationBase(CallbackMethod): @@ -5762,11 +5760,11 @@ class CallbackOperationBase(CallbackMethod): if not self.singleOperation: return 'JS::Rooted<JS::Value> callable(cx);\n' + getCallableFromProp return ( - 'let isCallable = unsafe { IsCallable(self.parent.callback()) };\n' + 'let isCallable = IsCallable(self.parent.callback());\n' 'let callable =\n' + CGIndenter( CGIfElseWrapper('isCallable', - CGGeneric('unsafe { RootedValue::new(cx, ObjectValue(&*self.parent.callback())) }'), + CGGeneric('RootedValue::new(cx, ObjectValue(&*self.parent.callback()))'), CGGeneric(getCallableFromProp))).define() + ';\n') diff --git a/components/script/dom/bindings/conversions.rs b/components/script/dom/bindings/conversions.rs index 001d10e574b..dcc1f164d25 100644 --- a/components/script/dom/bindings/conversions.rs +++ b/components/script/dom/bindings/conversions.rs @@ -39,26 +39,23 @@ use dom::bindings::reflector::{Reflectable, Reflector}; use dom::bindings::str::{ByteString, USVString}; use dom::bindings::utils::DOMClass; use js; +pub use js::conversions::{FromJSValConvertible, ToJSValConvertible, ConversionBehavior}; use js::error::throw_type_error; -use js::glue::{GetProxyPrivate, IsWrapper, RUST_JS_NumberValue}; +use js::glue::{GetProxyPrivate, IsWrapper}; use js::glue::{RUST_JSID_IS_STRING, RUST_JSID_TO_STRING, UnwrapObject}; use js::jsapi::{HandleId, HandleObject, HandleValue, JS_GetClass}; -use js::jsapi::{JSClass, JSContext, JSObject, JSString, MutableHandleValue}; +use js::jsapi::{JSClass, JSContext, JSObject, MutableHandleValue}; use js::jsapi::{JS_GetLatin1StringCharsAndLength, JS_GetReservedSlot}; use js::jsapi::{JS_GetTwoByteStringCharsAndLength, JS_NewStringCopyN}; -use js::jsapi::{JS_NewArrayObject1, JS_DefineElement, RootedValue, RootedObject}; -use js::jsapi::{JS_NewUCStringCopyN, JS_StringHasLatin1Chars, JS_WrapValue}; -use js::jsval::{BooleanValue, Int32Value, NullValue, UInt32Value, UndefinedValue}; -use js::jsval::{JSVal, ObjectOrNullValue, ObjectValue, StringValue}; -use js::rust::{ToBoolean, ToNumber, ToString, ToUint16}; -use js::rust::{ToInt32, ToUint32}; -use js::rust::{ToInt64, ToUint64}; +use js::jsapi::{JS_StringHasLatin1Chars, JS_WrapValue}; +use js::jsval::{ObjectValue, StringValue}; +use js::rust::ToString; use libc; use num::Float; -use num::traits::{Bounded, Zero}; -use std::rc::Rc; -use std::{char, ptr, slice}; -use util::str::DOMString; +use std::{ptr, slice}; +use util::str::{DOMString}; +pub use util::str::{StringificationBehavior, jsstring_to_str}; + trait As<O>: Copy { fn cast(self) -> O; @@ -111,290 +108,9 @@ pub trait IDLInterface { #[rustc_on_unimplemented = "The IDL interface `{Self}` is not derived from `{T}`."] pub trait DerivedFrom<T: Castable>: Castable {} -/// A trait to convert Rust types to `JSVal`s. -pub trait ToJSValConvertible { - /// Convert `self` to a `JSVal`. JSAPI failure causes a task failure. - fn to_jsval(&self, cx: *mut JSContext, rval: MutableHandleValue); -} - -/// A trait to convert `JSVal`s to Rust types. -pub trait FromJSValConvertible: Sized { - /// Optional configurable behaviour switch; use () for no configuration. - type Config; - /// Convert `val` to type `Self`. - /// Optional configuration of type `T` can be passed as the `option` - /// argument. - /// If it returns `Err(())`, a JSAPI exception is pending. - fn from_jsval(cx: *mut JSContext, val: HandleValue, option: Self::Config) -> Result<Self, ()>; -} - -/// Behavior for converting out-of-range integers. -#[derive(PartialEq, Eq)] -pub enum ConversionBehavior { - /// Wrap into the integer's range. - Default, - /// Throw an exception. - EnforceRange, - /// Clamp into the integer's range. - Clamp -} - -/// Try to cast the number to a smaller type, but -/// if it doesn't fit, it will return an error. -fn enforce_range<D>(cx: *mut JSContext, d: f64) -> Result<D, ()> - where D: Bounded + As<f64>, - f64: As<D> -{ - if d.is_infinite() { - unsafe { throw_type_error(cx, "value out of range in an EnforceRange argument") }; - return Err(()); - } - - let rounded = d.round(); - if D::min_value().cast() <= rounded && rounded <= D::max_value().cast() { - Ok(rounded.cast()) - } else { - unsafe { throw_type_error(cx, "value out of range in an EnforceRange argument") }; - Err(()) - } -} - -/// Try to cast the number to a smaller type, but if it doesn't fit, -/// round it to the MAX or MIN of the source type before casting it to -/// the destination type. -fn clamp_to<D>(d: f64) -> D - where D: Bounded + As<f64> + Zero, - f64: As<D> -{ - if d.is_nan() { - D::zero() - } else if d > D::max_value().cast() { - D::max_value() - } else if d < D::min_value().cast() { - D::min_value() - } else { - d.cast() - } -} - -//http://heycam.github.io/webidl/#es-void -impl ToJSValConvertible for () { - fn to_jsval(&self, _cx: *mut JSContext, rval: MutableHandleValue) { - rval.set(UndefinedValue()); - } -} - -impl ToJSValConvertible for JSVal { - fn to_jsval(&self, cx: *mut JSContext, rval: MutableHandleValue) { - rval.set(*self); - if unsafe { !JS_WrapValue(cx, rval) } { - panic!("JS_WrapValue failed."); - } - } -} - -impl ToJSValConvertible for HandleValue { - fn to_jsval(&self, cx: *mut JSContext, rval: MutableHandleValue) { - rval.set(self.get()); - if unsafe { !JS_WrapValue(cx, rval) } { - panic!("JS_WrapValue failed."); - } - } -} - -#[inline] -unsafe fn convert_int_from_jsval<T, M>(cx: *mut JSContext, value: HandleValue, - option: ConversionBehavior, - convert_fn: unsafe fn(*mut JSContext, HandleValue) -> Result<M, ()>) - -> Result<T, ()> - where T: Bounded + Zero + As<f64>, - M: Zero + As<T>, - f64: As<T> -{ - match option { - ConversionBehavior::Default => Ok(try!(convert_fn(cx, value)).cast()), - ConversionBehavior::EnforceRange => enforce_range(cx, try!(ToNumber(cx, value))), - ConversionBehavior::Clamp => Ok(clamp_to(try!(ToNumber(cx, value)))), - } -} - -//http://heycam.github.io/webidl/#es-boolean -impl ToJSValConvertible for bool { - fn to_jsval(&self, _cx: *mut JSContext, rval: MutableHandleValue) { - rval.set(BooleanValue(*self)); - } -} - -//http://heycam.github.io/webidl/#es-boolean -impl FromJSValConvertible for bool { - type Config = (); - fn from_jsval(_cx: *mut JSContext, val: HandleValue, _option: ()) -> Result<bool, ()> { - Ok(unsafe { ToBoolean(val) }) - } -} - -//http://heycam.github.io/webidl/#es-byte -impl ToJSValConvertible for i8 { - fn to_jsval(&self, _cx: *mut JSContext, rval: MutableHandleValue) { - rval.set(Int32Value(*self as i32)); - } -} - -//http://heycam.github.io/webidl/#es-byte -impl FromJSValConvertible for i8 { - type Config = ConversionBehavior; - fn from_jsval(cx: *mut JSContext, val: HandleValue, option: ConversionBehavior) -> Result<i8, ()> { - unsafe { convert_int_from_jsval(cx, val, option, ToInt32) } - } -} - -//http://heycam.github.io/webidl/#es-octet -impl ToJSValConvertible for u8 { - fn to_jsval(&self, _cx: *mut JSContext, rval: MutableHandleValue) { - rval.set(Int32Value(*self as i32)); - } -} - -//http://heycam.github.io/webidl/#es-octet -impl FromJSValConvertible for u8 { - type Config = ConversionBehavior; - fn from_jsval(cx: *mut JSContext, val: HandleValue, option: ConversionBehavior) -> Result<u8, ()> { - unsafe { convert_int_from_jsval(cx, val, option, ToInt32) } - } -} - -//http://heycam.github.io/webidl/#es-short -impl ToJSValConvertible for i16 { - fn to_jsval(&self, _cx: *mut JSContext, rval: MutableHandleValue) { - rval.set(Int32Value(*self as i32)); - } -} - -//http://heycam.github.io/webidl/#es-short -impl FromJSValConvertible for i16 { - type Config = ConversionBehavior; - fn from_jsval(cx: *mut JSContext, val: HandleValue, option: ConversionBehavior) -> Result<i16, ()> { - unsafe { convert_int_from_jsval(cx, val, option, ToInt32) } - } -} - -//http://heycam.github.io/webidl/#es-unsigned-short -impl ToJSValConvertible for u16 { - fn to_jsval(&self, _cx: *mut JSContext, rval: MutableHandleValue) { - rval.set(Int32Value(*self as i32)); - } -} - -//http://heycam.github.io/webidl/#es-unsigned-short -impl FromJSValConvertible for u16 { - type Config = ConversionBehavior; - fn from_jsval(cx: *mut JSContext, val: HandleValue, option: ConversionBehavior) -> Result<u16, ()> { - unsafe { convert_int_from_jsval(cx, val, option, ToUint16) } - } -} - -//http://heycam.github.io/webidl/#es-long -impl ToJSValConvertible for i32 { - fn to_jsval(&self, _cx: *mut JSContext, rval: MutableHandleValue) { - rval.set(Int32Value(*self)); - } -} - -//http://heycam.github.io/webidl/#es-long -impl FromJSValConvertible for i32 { - type Config = ConversionBehavior; - fn from_jsval(cx: *mut JSContext, val: HandleValue, option: ConversionBehavior) -> Result<i32, ()> { - unsafe { convert_int_from_jsval(cx, val, option, ToInt32) } - } -} - -//http://heycam.github.io/webidl/#es-unsigned-long -impl ToJSValConvertible for u32 { - fn to_jsval(&self, _cx: *mut JSContext, rval: MutableHandleValue) { - rval.set(UInt32Value(*self)); - } -} - -//http://heycam.github.io/webidl/#es-unsigned-long -impl FromJSValConvertible for u32 { - type Config = ConversionBehavior; - fn from_jsval(cx: *mut JSContext, val: HandleValue, option: ConversionBehavior) -> Result<u32, ()> { - unsafe { convert_int_from_jsval(cx, val, option, ToUint32) } - } -} - -//http://heycam.github.io/webidl/#es-long-long -impl ToJSValConvertible for i64 { - fn to_jsval(&self, _cx: *mut JSContext, rval: MutableHandleValue) { - unsafe { - rval.set(RUST_JS_NumberValue(*self as f64)); - } - } -} - -//http://heycam.github.io/webidl/#es-long-long -impl FromJSValConvertible for i64 { - type Config = ConversionBehavior; - fn from_jsval(cx: *mut JSContext, val: HandleValue, option: ConversionBehavior) -> Result<i64, ()> { - unsafe { convert_int_from_jsval(cx, val, option, ToInt64) } - } -} - -//http://heycam.github.io/webidl/#es-unsigned-long-long -impl ToJSValConvertible for u64 { - fn to_jsval(&self, _cx: *mut JSContext, rval: MutableHandleValue) { - unsafe { - rval.set(RUST_JS_NumberValue(*self as f64)); - } - } -} - -//http://heycam.github.io/webidl/#es-unsigned-long-long -impl FromJSValConvertible for u64 { - type Config = ConversionBehavior; - fn from_jsval(cx: *mut JSContext, val: HandleValue, option: ConversionBehavior) -> Result<u64, ()> { - unsafe { convert_int_from_jsval(cx, val, option, ToUint64) } - } -} - -//http://heycam.github.io/webidl/#es-float -impl ToJSValConvertible for f32 { - fn to_jsval(&self, _cx: *mut JSContext, rval: MutableHandleValue) { - unsafe { - rval.set(RUST_JS_NumberValue(*self as f64)); - } - } -} - -//http://heycam.github.io/webidl/#es-float -impl FromJSValConvertible for f32 { - type Config = (); - fn from_jsval(cx: *mut JSContext, val: HandleValue, _option: ()) -> Result<f32, ()> { - let result = unsafe { ToNumber(cx, val) }; - result.map(|f| f as f32) - } -} - -//http://heycam.github.io/webidl/#es-double -impl ToJSValConvertible for f64 { - fn to_jsval(&self, _cx: *mut JSContext, rval: MutableHandleValue) { - unsafe { - rval.set(RUST_JS_NumberValue(*self)); - } - } -} - -//http://heycam.github.io/webidl/#es-double -impl FromJSValConvertible for f64 { - type Config = (); - fn from_jsval(cx: *mut JSContext, val: HandleValue, _option: ()) -> Result<f64, ()> { - unsafe { ToNumber(cx, val) } - } -} - impl<T: Float + ToJSValConvertible> ToJSValConvertible for Finite<T> { #[inline] - fn to_jsval(&self, cx: *mut JSContext, rval: MutableHandleValue) { + unsafe fn to_jsval(&self, cx: *mut JSContext, rval: MutableHandleValue) { let value = **self; value.to_jsval(cx, rval); } @@ -403,109 +119,18 @@ impl<T: Float + ToJSValConvertible> ToJSValConvertible for Finite<T> { impl<T: Float + FromJSValConvertible<Config=()>> FromJSValConvertible for Finite<T> { type Config = (); - fn from_jsval(cx: *mut JSContext, value: HandleValue, option: ()) -> Result<Finite<T>, ()> { + unsafe fn from_jsval(cx: *mut JSContext, value: HandleValue, option: ()) -> Result<Finite<T>, ()> { let result = try!(FromJSValConvertible::from_jsval(cx, value, option)); match Finite::new(result) { Some(v) => Ok(v), None => { - unsafe { throw_type_error(cx, "this argument is not a finite floating-point value") }; + throw_type_error(cx, "this argument is not a finite floating-point value"); Err(()) }, } } } -impl ToJSValConvertible for str { - fn to_jsval(&self, cx: *mut JSContext, rval: MutableHandleValue) { - let mut string_utf16: Vec<u16> = Vec::with_capacity(self.len()); - unsafe { - string_utf16.extend(self.utf16_units()); - let jsstr = JS_NewUCStringCopyN(cx, string_utf16.as_ptr(), - string_utf16.len() as libc::size_t); - if jsstr.is_null() { - panic!("JS_NewUCStringCopyN failed"); - } - rval.set(StringValue(&*jsstr)); - } - } -} - -//http://heycam.github.io/webidl/#es-DOMString -impl ToJSValConvertible for String { - fn to_jsval(&self, cx: *mut JSContext, rval: MutableHandleValue) { - (**self).to_jsval(cx, rval); - } -} - -//http://heycam.github.io/webidl/#es-DOMString -impl ToJSValConvertible for DOMString { - fn to_jsval(&self, cx: *mut JSContext, rval: MutableHandleValue) { - (**self).to_jsval(cx, rval); - } -} - -/// Behavior for stringification of `JSVal`s. -#[derive(PartialEq)] -pub enum StringificationBehavior { - /// Convert `null` to the string `"null"`. - Default, - /// Convert `null` to the empty string. - Empty, -} - -/// Convert the given `JSString` to a `DOMString`. Fails if the string does not -/// contain valid UTF-16. -pub fn jsstring_to_str(cx: *mut JSContext, s: *mut JSString) -> DOMString { - let mut length = 0; - let latin1 = unsafe { JS_StringHasLatin1Chars(s) }; - DOMString(if latin1 { - let chars = unsafe { - JS_GetLatin1StringCharsAndLength(cx, ptr::null(), s, &mut length) - }; - assert!(!chars.is_null()); - - let mut buf = String::with_capacity(length as usize); - for i in 0..(length as isize) { - unsafe { - buf.push(*chars.offset(i) as char); - } - } - buf - } else { - let chars = unsafe { - JS_GetTwoByteStringCharsAndLength(cx, ptr::null(), s, &mut length) - }; - assert!(!chars.is_null()); - let potentially_ill_formed_utf16 = unsafe { - slice::from_raw_parts(chars as *const u16, length as usize) - }; - let mut s = String::with_capacity(length as usize); - for item in char::decode_utf16(potentially_ill_formed_utf16.iter().cloned()) { - match item { - Ok(c) => s.push(c), - Err(_) => { - // FIXME: Add more info like document URL in the message? - macro_rules! message { - () => { - "Found an unpaired surrogate in a DOM string. \ - If you see this in real web content, \ - please comment on https://github.com/servo/servo/issues/6564" - } - } - if ::util::opts::get().replace_surrogates { - error!(message!()); - s.push('\u{FFFD}'); - } else { - panic!(concat!(message!(), " Use `-Z replace-surrogates` \ - on the command line to make this non-fatal.")); - } - } - } - } - s - }) -} - /// Convert the given `jsid` to a `DOMString`. Fails if the `jsid` is not a /// string, or if the string does not contain valid UTF-16. pub fn jsid_to_str(cx: *mut JSContext, id: HandleId) -> DOMString { @@ -515,30 +140,9 @@ pub fn jsid_to_str(cx: *mut JSContext, id: HandleId) -> DOMString { } } -//http://heycam.github.io/webidl/#es-DOMString -impl FromJSValConvertible for DOMString { - type Config = StringificationBehavior; - fn from_jsval(cx: *mut JSContext, value: HandleValue, - null_behavior: StringificationBehavior) - -> Result<DOMString, ()> { - if null_behavior == StringificationBehavior::Empty && - value.get().is_null() { - Ok(DOMString::new()) - } else { - let jsstr = unsafe { ToString(cx, value) }; - if jsstr.is_null() { - debug!("ToString failed"); - Err(()) - } else { - Ok(jsstring_to_str(cx, jsstr)) - } - } - } -} - //http://heycam.github.io/webidl/#es-USVString impl ToJSValConvertible for USVString { - fn to_jsval(&self, cx: *mut JSContext, rval: MutableHandleValue) { + unsafe fn to_jsval(&self, cx: *mut JSContext, rval: MutableHandleValue) { self.0.to_jsval(cx, rval); } } @@ -546,89 +150,78 @@ impl ToJSValConvertible for USVString { //http://heycam.github.io/webidl/#es-USVString impl FromJSValConvertible for USVString { type Config = (); - fn from_jsval(cx: *mut JSContext, value: HandleValue, _: ()) - -> Result<USVString, ()> { - let jsstr = unsafe { ToString(cx, value) }; + unsafe fn from_jsval(cx: *mut JSContext, value: HandleValue, _: ()) + -> Result<USVString, ()> { + let jsstr = ToString(cx, value); if jsstr.is_null() { debug!("ToString failed"); return Err(()); } - let latin1 = unsafe { JS_StringHasLatin1Chars(jsstr) }; + let latin1 = JS_StringHasLatin1Chars(jsstr); if latin1 { return Ok(USVString(jsstring_to_str(cx, jsstr).0)); } - unsafe { - let mut length = 0; - let chars = JS_GetTwoByteStringCharsAndLength(cx, ptr::null(), jsstr, &mut length); - assert!(!chars.is_null()); - let char_vec = slice::from_raw_parts(chars as *const u16, length as usize); - Ok(USVString(String::from_utf16_lossy(char_vec))) - } + let mut length = 0; + let chars = JS_GetTwoByteStringCharsAndLength(cx, ptr::null(), jsstr, &mut length); + assert!(!chars.is_null()); + let char_vec = slice::from_raw_parts(chars as *const u16, length as usize); + Ok(USVString(String::from_utf16_lossy(char_vec))) } } //http://heycam.github.io/webidl/#es-ByteString impl ToJSValConvertible for ByteString { - fn to_jsval(&self, cx: *mut JSContext, rval: MutableHandleValue) { - unsafe { - let jsstr = JS_NewStringCopyN(cx, self.as_ptr() as *const libc::c_char, - self.len() as libc::size_t); - if jsstr.is_null() { - panic!("JS_NewStringCopyN failed"); - } - rval.set(StringValue(&*jsstr)); + unsafe fn to_jsval(&self, cx: *mut JSContext, rval: MutableHandleValue) { + let jsstr = JS_NewStringCopyN(cx, self.as_ptr() as *const libc::c_char, + self.len() as libc::size_t); + if jsstr.is_null() { + panic!("JS_NewStringCopyN failed"); } + rval.set(StringValue(&*jsstr)); } } //http://heycam.github.io/webidl/#es-ByteString impl FromJSValConvertible for ByteString { type Config = (); - fn from_jsval(cx: *mut JSContext, value: HandleValue, _option: ()) -> Result<ByteString, ()> { - let string = unsafe { ToString(cx, value) }; + unsafe fn from_jsval(cx: *mut JSContext, value: HandleValue, _option: ()) -> Result<ByteString, ()> { + let string = ToString(cx, value); if string.is_null() { debug!("ToString failed"); return Err(()); } - let latin1 = unsafe { JS_StringHasLatin1Chars(string) }; + let latin1 = JS_StringHasLatin1Chars(string); if latin1 { let mut length = 0; - let chars = unsafe { - JS_GetLatin1StringCharsAndLength(cx, ptr::null(), - string, &mut length) - }; + let chars = JS_GetLatin1StringCharsAndLength(cx, ptr::null(), + string, &mut length); assert!(!chars.is_null()); - let char_slice = unsafe { - slice::from_raw_parts(chars as *mut u8, length as usize) - }; - + let char_slice = slice::from_raw_parts(chars as *mut u8, length as usize); return Ok(ByteString::new(char_slice.to_vec())); } - unsafe { - let mut length = 0; - let chars = JS_GetTwoByteStringCharsAndLength(cx, ptr::null(), string, &mut length); - let char_vec = slice::from_raw_parts(chars, length as usize); + let mut length = 0; + let chars = JS_GetTwoByteStringCharsAndLength(cx, ptr::null(), string, &mut length); + let char_vec = slice::from_raw_parts(chars, length as usize); - if char_vec.iter().any(|&c| c > 0xFF) { - throw_type_error(cx, "Invalid ByteString"); - Err(()) - } else { - Ok(ByteString::new(char_vec.iter().map(|&c| c as u8).collect())) - } + if char_vec.iter().any(|&c| c > 0xFF) { + throw_type_error(cx, "Invalid ByteString"); + Err(()) + } else { + Ok(ByteString::new(char_vec.iter().map(|&c| c as u8).collect())) } } } impl ToJSValConvertible for Reflector { - fn to_jsval(&self, cx: *mut JSContext, rval: MutableHandleValue) { + unsafe fn to_jsval(&self, cx: *mut JSContext, rval: MutableHandleValue) { let obj = self.get_jsobject().get(); assert!(!obj.is_null()); - rval.set(ObjectValue(unsafe { &*obj })); - if unsafe { !JS_WrapValue(cx, rval) } { + rval.set(ObjectValue(&*obj)); + if !JS_WrapValue(cx, rval) { panic!("JS_WrapValue failed."); } } @@ -771,75 +364,7 @@ pub fn root_from_handleobject<T>(obj: HandleObject) -> Result<Root<T>, ()> } impl<T: Reflectable> ToJSValConvertible for Root<T> { - fn to_jsval(&self, cx: *mut JSContext, rval: MutableHandleValue) { + unsafe fn to_jsval(&self, cx: *mut JSContext, rval: MutableHandleValue) { self.reflector().to_jsval(cx, rval); } } - -impl<'a, T: Reflectable> ToJSValConvertible for &'a T { - fn to_jsval(&self, cx: *mut JSContext, rval: MutableHandleValue) { - self.reflector().to_jsval(cx, rval); - } -} - -impl<T: ToJSValConvertible> ToJSValConvertible for Option<T> { - fn to_jsval(&self, cx: *mut JSContext, rval: MutableHandleValue) { - match self { - &Some(ref value) => value.to_jsval(cx, rval), - &None => rval.set(NullValue()), - } - } -} - -impl<T: ToJSValConvertible> ToJSValConvertible for Option<Rc<T>> { - fn to_jsval(&self, cx: *mut JSContext, rval: MutableHandleValue) { - match self { - &Some(ref value) => (**value).to_jsval(cx, rval), - &None => rval.set(NullValue()), - } - } -} - -impl<T: FromJSValConvertible> FromJSValConvertible for Option<T> { - type Config = T::Config; - fn from_jsval(cx: *mut JSContext, value: HandleValue, option: T::Config) -> Result<Option<T>, ()> { - if value.get().is_null_or_undefined() { - Ok(None) - } else { - let result: Result<T, ()> = FromJSValConvertible::from_jsval(cx, value, option); - result.map(Some) - } - } -} - -impl<T: ToJSValConvertible> ToJSValConvertible for Vec<T> { - fn to_jsval(&self, cx: *mut JSContext, rval: MutableHandleValue) { - let js_array = RootedObject::new(cx, - unsafe { JS_NewArrayObject1(cx, self.len() as libc::size_t) }); - assert!(!js_array.handle().is_null()); - - for (index, obj) in self.iter().enumerate() { - let mut val = RootedValue::new(cx, UndefinedValue()); - obj.to_jsval(cx, val.handle_mut()); - - unsafe { - assert!(JS_DefineElement(cx, js_array.handle(), - index as u32, val.handle(), js::JSPROP_ENUMERATE, None, None)); - } - } - - unsafe { - rval.set(ObjectValue(&*js_array.handle().get())); - } - } -} - -//http://heycam.github.io/webidl/#es-object -impl ToJSValConvertible for *mut JSObject { - fn to_jsval(&self, cx: *mut JSContext, rval: MutableHandleValue) { - rval.set(ObjectOrNullValue(*self)); - unsafe { - assert!(JS_WrapValue(cx, rval)); - } - } -} diff --git a/components/script/dom/bindings/utils.rs b/components/script/dom/bindings/utils.rs index 0ce5aeddf5e..774738a3030 100644 --- a/components/script/dom/bindings/utils.rs +++ b/components/script/dom/bindings/utils.rs @@ -6,7 +6,7 @@ use dom::bindings::codegen::PrototypeList; use dom::bindings::codegen::PrototypeList::MAX_PROTO_CHAIN_LENGTH; -use dom::bindings::conversions::{DOM_OBJECT_SLOT, is_dom_class, jsstring_to_str}; +use dom::bindings::conversions::{DOM_OBJECT_SLOT, is_dom_class}; use dom::bindings::conversions::{private_from_proto_check, root_from_handleobject}; use dom::bindings::error::throw_invalid_this; use dom::bindings::inheritance::TopTypeId; @@ -50,6 +50,7 @@ use std::default::Default; use std::ffi::CString; use std::ptr; use util::mem::HeapSizeOf; +use util::str::jsstring_to_str; /// Proxy handler for a WindowProxy. #[allow(raw_pointer_derive)] @@ -441,11 +442,11 @@ pub fn get_array_index_from_id(_cx: *mut JSContext, id: HandleId) -> Option<u32> /// Find the index of a string given by `v` in `values`. /// Returns `Err(())` on JSAPI failure (there is a pending exception), and /// `Ok(None)` if there was no matching string. -pub fn find_enum_string_index(cx: *mut JSContext, - v: HandleValue, - values: &[&'static str]) - -> Result<Option<usize>, ()> { - let jsstr = unsafe { ToString(cx, v) }; +pub unsafe fn find_enum_string_index(cx: *mut JSContext, + v: HandleValue, + values: &[&'static str]) + -> Result<Option<usize>, ()> { + let jsstr = ToString(cx, v); if jsstr.is_null() { return Err(()); } diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs index 6bc48da1c4f..1665c60d58f 100644 --- a/components/script/dom/htmliframeelement.rs +++ b/components/script/dom/htmliframeelement.rs @@ -130,6 +130,7 @@ impl HTMLIFrameElement { self.navigate_child_browsing_context(url); } + #[allow(unsafe_code)] pub fn dispatch_mozbrowser_event(&self, event: MozBrowserEvent) { // TODO(gw): Support mozbrowser event types that have detail which is not a string. // See https://developer.mozilla.org/en-US/docs/Web/API/Using_the_Browser_API @@ -138,16 +139,18 @@ impl HTMLIFrameElement { if self.Mozbrowser() { let window = window_from_node(self); - let cx = window.get_cx(); - let _ar = JSAutoRequest::new(cx); - let _ac = JSAutoCompartment::new(cx, window.reflector().get_jsobject().get()); - let mut detail = RootedValue::new(cx, UndefinedValue()); - event.detail().to_jsval(cx, detail.handle_mut()); - let custom_event = CustomEvent::new(GlobalRef::Window(window.r()), - DOMString(event.name().to_owned()), - true, - true, - detail.handle()); + let custom_event = unsafe { + let cx = window.get_cx(); + let _ar = JSAutoRequest::new(cx); + let _ac = JSAutoCompartment::new(cx, window.reflector().get_jsobject().get()); + let mut detail = RootedValue::new(cx, UndefinedValue()); + event.detail().to_jsval(cx, detail.handle_mut()); + CustomEvent::new(GlobalRef::Window(window.r()), + DOMString(event.name().to_owned()), + true, + true, + detail.handle()) + }; custom_event.upcast::<Event>().fire(self.upcast()); } } diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs index 4855bcc36de..c0a00adf102 100644 --- a/components/script/dom/webglrenderingcontext.rs +++ b/components/script/dom/webglrenderingcontext.rs @@ -189,19 +189,22 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext { receiver.recv().unwrap() } + #[allow(unsafe_code)] // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3 fn GetParameter(&self, cx: *mut JSContext, parameter: u32) -> JSVal { // TODO(ecoal95): Implement the missing parameters from the spec - let mut rval = RootedValue::new(cx, UndefinedValue()); - match parameter { - constants::VERSION => - "WebGL 1.0".to_jsval(cx, rval.handle_mut()), - constants::RENDERER | - constants::VENDOR => - "Mozilla/Servo".to_jsval(cx, rval.handle_mut()), - _ => rval.ptr = NullValue(), - } - rval.ptr + unsafe { + let mut rval = RootedValue::new(cx, UndefinedValue()); + match parameter { + constants::VERSION => + "WebGL 1.0".to_jsval(cx, rval.handle_mut()), + constants::RENDERER | + constants::VENDOR => + "Mozilla/Servo".to_jsval(cx, rval.handle_mut()), + _ => rval.ptr = NullValue(), + } + rval.ptr + } } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3 diff --git a/components/script/dom/websocket.rs b/components/script/dom/websocket.rs index ea9c0e243aa..2f7994c373e 100644 --- a/components/script/dom/websocket.rs +++ b/components/script/dom/websocket.rs @@ -570,32 +570,32 @@ impl Runnable for MessageReceivedTask { // Step 2-5. let global = ws.global.root(); - let cx = global.r().get_cx(); - let _ar = JSAutoRequest::new(cx); - let _ac = JSAutoCompartment::new(cx, ws.reflector().get_jsobject().get()); - let mut message = RootedValue::new(cx, UndefinedValue()); - match self.message { - MessageData::Text(text) => text.to_jsval(cx, message.handle_mut()), - MessageData::Binary(data) => { - match ws.binary_type.get() { - BinaryType::Blob => { - let blob = Blob::new(global.r(), Some(data), ""); - blob.to_jsval(cx, message.handle_mut()); - } - BinaryType::Arraybuffer => { - unsafe { + // global.get_cx() returns a valid `JSContext` pointer, so this is safe. + unsafe { + let cx = global.r().get_cx(); + let _ar = JSAutoRequest::new(cx); + let _ac = JSAutoCompartment::new(cx, ws.reflector().get_jsobject().get()); + let mut message = RootedValue::new(cx, UndefinedValue()); + match self.message { + MessageData::Text(text) => text.to_jsval(cx, message.handle_mut()), + MessageData::Binary(data) => { + match ws.binary_type.get() { + BinaryType::Blob => { + let blob = Blob::new(global.r(), Some(data), ""); + blob.to_jsval(cx, message.handle_mut()); + } + BinaryType::Arraybuffer => { let len = data.len() as uint32_t; let buf = JS_NewArrayBuffer(cx, len); let buf_data: *mut uint8_t = JS_GetArrayBufferData(buf, ptr::null()); ptr::copy_nonoverlapping(data.as_ptr(), buf_data, len as usize); buf.to_jsval(cx, message.handle_mut()); } - } - } - }, + } + }, + } + MessageEvent::dispatch_jsval(ws.upcast(), global.r(), message.handle()); } - - MessageEvent::dispatch_jsval(ws.upcast(), global.r(), message.handle()); } } diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs index c7f0af1b234..09f14f12510 100644 --- a/components/script/dom/window.rs +++ b/components/script/dom/window.rs @@ -574,8 +574,9 @@ impl WindowMethods for Window { breakpoint(); } + #[allow(unsafe_code)] fn WebdriverCallback(&self, cx: *mut JSContext, val: HandleValue) { - let rv = jsval_to_webdriver(cx, val); + let rv = unsafe { jsval_to_webdriver(cx, val) }; let opt_chan = self.webdriver_script_chan.borrow_mut().take(); if let Some(chan) = opt_chan { chan.send(rv).unwrap(); diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs index da5aab7710f..adea59382b3 100644 --- a/components/script/dom/xmlhttprequest.rs +++ b/components/script/dom/xmlhttprequest.rs @@ -684,23 +684,23 @@ impl XMLHttpRequestMethods for XMLHttpRequest { #[allow(unsafe_code)] // https://xhr.spec.whatwg.org/#the-response-attribute fn Response(&self, cx: *mut JSContext) -> JSVal { - let mut rval = RootedValue::new(cx, UndefinedValue()); - match self.response_type.get() { - _empty | Text => { - let ready_state = self.ready_state.get(); - if ready_state == XMLHttpRequestState::Done || ready_state == XMLHttpRequestState::Loading { - self.text_response().to_jsval(cx, rval.handle_mut()); - } else { - "".to_jsval(cx, rval.handle_mut()); - } - }, - _ if self.ready_state.get() != XMLHttpRequestState::Done => { - return NullValue() - }, - Json => { - let decoded = UTF_8.decode(&self.response.borrow(), DecoderTrap::Replace).unwrap().to_owned(); - let decoded: Vec<u16> = decoded.utf16_units().collect(); - unsafe { + unsafe { + let mut rval = RootedValue::new(cx, UndefinedValue()); + match self.response_type.get() { + _empty | Text => { + let ready_state = self.ready_state.get(); + if ready_state == XMLHttpRequestState::Done || ready_state == XMLHttpRequestState::Loading { + self.text_response().to_jsval(cx, rval.handle_mut()); + } else { + "".to_jsval(cx, rval.handle_mut()); + } + }, + _ if self.ready_state.get() != XMLHttpRequestState::Done => { + return NullValue() + }, + Json => { + let decoded = UTF_8.decode(&self.response.borrow(), DecoderTrap::Replace).unwrap().to_owned(); + let decoded: Vec<u16> = decoded.utf16_units().collect(); if !JS_ParseJSON(cx, decoded.as_ptr(), decoded.len() as u32, @@ -709,13 +709,13 @@ impl XMLHttpRequestMethods for XMLHttpRequest { return NullValue(); } } + _ => { + // XXXManishearth handle other response types + self.response.borrow().to_jsval(cx, rval.handle_mut()); + } } - _ => { - // XXXManishearth handle other response types - self.response.borrow().to_jsval(cx, rval.handle_mut()); - } + rval.ptr } - rval.ptr } // https://xhr.spec.whatwg.org/#the-responsetext-attribute |