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

Use unsafe Heap::handle wherever needed

Browse source
This commit is contained in:
Igor Matuszewski 2018-03-23 14:29:10 +01:00
parent ed0091f86f
commit f7c039516c
3 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
components/script/dom/bindings/reflector.rs
View file

@ -46,7 +46,8 @@ impl Reflector {
/// Get the reflector. /// Get the reflector.
#[inline] #[inline]
pub fn get_jsobject(&self) -> HandleObject { pub fn get_jsobject(&self) -> HandleObject {
self.object.handle() // We're rooted, so it's safe to hand out a handle to object in Heap
unsafe { self.object.handle() }
} }
/// Initialize the reflector. (May be called only once.) /// Initialize the reflector. (May be called only once.)

3
components/script/dom/customelementregistry.rs
View file

@ -604,7 +604,8 @@ impl CustomElementReaction {
match *self { match *self {
CustomElementReaction::Upgrade(ref definition) => upgrade_element(definition.clone(), element), CustomElementReaction::Upgrade(ref definition) => upgrade_element(definition.clone(), element),
CustomElementReaction::Callback(ref callback, ref arguments) => { CustomElementReaction::Callback(ref callback, ref arguments) => {
let arguments = arguments.iter().map(|arg| arg.handle()).collect(); // We're rooted, so it's safe to hand out a handle to objects in Heap
let arguments = arguments.iter().map(|arg| unsafe { arg.handle() }).collect();
let _ = callback.Call_(&*element, arguments, ExceptionHandling::Report); let _ = callback.Call_(&*element, arguments, ExceptionHandling::Report);
} }
} }

9
components/script/timers.rs
View file

@ -500,7 +500,7 @@ impl JsTimerTask {
code_str, rval.handle_mut()); code_str, rval.handle_mut());
}, },
InternalTimerCallback::FunctionTimerCallback(ref function, ref arguments) => { InternalTimerCallback::FunctionTimerCallback(ref function, ref arguments) => {
let arguments = arguments.iter().map(|arg| arg.handle()).collect(); let arguments = self.collect_heap_args(arguments);
let _ = function.Call_(this, arguments, Report); let _ = function.Call_(this, arguments, Report);
}, },
}; };
@ -516,4 +516,11 @@ impl JsTimerTask {
timers.initialize_and_schedule(&this.global(), self); timers.initialize_and_schedule(&this.global(), self);
} }
} }
// Returning Handles directly from Heap values is inherently unsafe, but here it's
// always done via rooted JsTimers, which is safe.
#[allow(unsafe_code)]
fn collect_heap_args(&self, args: &[Heap<JSVal>]) -> Vec<HandleValue> {
args.iter().map(|arg| unsafe { arg.handle() }).collect()
}
} }