Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-22 23:03:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Make has_property_on_prototype fallible

Browse source
This commit is contained in:
Anthony Ramine 2016-08-24 15:29:12 +02:00
parent fbc8938bee
commit f70fa98954
2 changed files with 33 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

13
components/script/dom/bindings/utils.rs
View file

@ -284,12 +284,15 @@ pub fn set_dictionary_property(cx: *mut JSContext,
/// Returns whether `proxy` has a property `id` on its prototype.
pub unsafe fn has_property_on_prototype(cx: *mut JSContext,
proxy: HandleObject,
id: HandleId)
id: HandleId,
found: &mut bool)
-> bool {
let mut found = false;
!get_property_on_prototype(
cx, proxy, id, &mut found,
MutableHandleValue::from_marked_location(ptr::null_mut())) || found
rooted!(in(cx) let mut proto = ptr::null_mut());
if !JS_GetPrototype(cx, proxy, proto.handle_mut()) {
return false;
}
assert!(!proto.is_null());
JS_HasPropertyById(cx, proto.handle(), id, found)
}
/// Drop the resources held by reserved slots of a global object