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

Make GetCallableProperty more rustic.

Browse source
This commit is contained in:
Ms2ger 2014-04-10 15:05:52 +02:00
parent 986664f527
commit d11316fa05
2 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/components/script/dom/bindings/callback.rs
View file

@ -5,7 +5,7 @@
use dom::bindings::utils::Reflectable;
use js::jsapi::{JSContext, JSObject, JS_WrapObject, JS_ObjectIsCallable};
use js::jsapi::{JS_GetProperty, JSTracer, JS_CallTracer};
use js::jsval::JSVal;
use js::jsval::{JSVal, UndefinedValue};
use js::JSTRACE_OBJECT;
use std::cast;
@ -61,20 +61,20 @@ impl CallbackInterface {
}
}
pub fn GetCallableProperty(&self, cx: *JSContext, name: *libc::c_char, callable: &mut JSVal) -> bool {
pub fn GetCallableProperty(&self, cx: *JSContext, name: &str) -> Result<JSVal, ()> {
let mut callable = UndefinedValue();
unsafe {
if JS_GetProperty(cx, self.callback, name, &*callable) == 0 {
return false;
if name.to_c_str().with_ref(|name| JS_GetProperty(cx, self.callback, name, &mut callable as *mut JSVal as *JSVal)) == 0 {
return Err(());
}
if !callable.is_object() ||
JS_ObjectIsCallable(cx, callable.to_object()) == 0 {
//ThrowErrorMessage(cx, MSG_NOT_CALLABLE, description.get());
return false;
return Err(());
}
return true;
}
Ok(callable)
}
}