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

Add a VecRootableType bound to RootedVec's type parameter.

Browse source
This commit is contained in:
Ms2ger 2015-05-01 21:21:26 +02:00
parent 568b7f3a53
commit 9a97a7e30c
1 changed files with 27 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

38
components/script/dom/bindings/trace.rs
View file

@ -318,16 +318,20 @@ impl JSTraceable for () {
/// Holds a set of vectors that need to be rooted /// Holds a set of vectors that need to be rooted
pub struct RootedCollectionSet { pub struct RootedCollectionSet {
set: Vec<HashSet<*const RootedVec<()>>> set: Vec<HashSet<*const RootedVec<Void>>>
} }
/// TLV Holds a set of vectors that need to be rooted /// TLV Holds a set of vectors that need to be rooted
thread_local!(pub static ROOTED_COLLECTIONS: Rc<RefCell<RootedCollectionSet>> = thread_local!(pub static ROOTED_COLLECTIONS: Rc<RefCell<RootedCollectionSet>> =
Rc::new(RefCell::new(RootedCollectionSet::new()))); Rc::new(RefCell::new(RootedCollectionSet::new())));
enum CollectionType { /// Type of `RootedVec`
pub enum CollectionType {
/// DOM objects
DOMObjects, DOMObjects,
/// `JSVal`s
JSVals, JSVals,
/// `*mut JSObject`s
JSObjects, JSObjects,
} }
@ -356,10 +360,12 @@ impl RootedCollectionSet {
} }
unsafe fn trace(&self, tracer: *mut JSTracer) { unsafe fn trace(&self, tracer: *mut JSTracer) {
fn trace_collection_type<T: JSTraceable>(tracer: *mut JSTracer, fn trace_collection_type<T>(tracer: *mut JSTracer,
collections: &HashSet<*const RootedVec<()>>) { collections: &HashSet<*const RootedVec<Void>>)
where T: JSTraceable + VecRootableType
{
for collection in collections { for collection in collections {
let collection: *const RootedVec<()> = *collection; let collection: *const RootedVec<Void> = *collection;
let collection = collection as *const RootedVec<T>; let collection = collection as *const RootedVec<T>;
unsafe { unsafe {
let _ = (*collection).trace(tracer); let _ = (*collection).trace(tracer);
@ -367,10 +373,10 @@ impl RootedCollectionSet {
} }
} }
let dom_collections = &self.set[CollectionType::DOMObjects as usize] as *const _ as *const HashSet<*const RootedVec<*const Reflector>>; let dom_collections = &self.set[CollectionType::DOMObjects as usize] as *const _ as *const HashSet<*const RootedVec<JS<Void>>>;
for dom_collection in (*dom_collections).iter() { for dom_collection in (*dom_collections).iter() {
for reflector in (**dom_collection).iter() { for reflector in (**dom_collection).iter() {
trace_reflector(tracer, "", &**reflector); trace_reflector(tracer, "", reflector.reflector());
} }
} }
@ -381,7 +387,7 @@ impl RootedCollectionSet {
/// Trait implemented by all types that can be used with RootedVec /// Trait implemented by all types that can be used with RootedVec
trait VecRootableType { pub trait VecRootableType {
/// Return the type tag used to determine how to trace RootedVec /// Return the type tag used to determine how to trace RootedVec
fn tag(_a: Option<Self>) -> CollectionType; fn tag(_a: Option<Self>) -> CollectionType;
} }
@ -398,11 +404,21 @@ impl VecRootableType for *mut JSObject {
fn tag(_a: Option<*mut JSObject>) -> CollectionType { CollectionType::JSObjects } fn tag(_a: Option<*mut JSObject>) -> CollectionType { CollectionType::JSObjects }
} }
enum Void {}
impl VecRootableType for Void {
fn tag(_a: Option<Void>) -> CollectionType { unreachable!() }
}
impl Reflectable for Void {
fn reflector<'a>(&'a self) -> &'a Reflector { unreachable!() }
}
/// A vector of items that are rooted for the lifetime /// A vector of items that are rooted for the lifetime
/// of this struct /// of this struct
#[allow(unrooted_must_root)] #[allow(unrooted_must_root)]
#[no_move] #[no_move]
pub struct RootedVec<T> { pub struct RootedVec<T: VecRootableType> {
v: Vec<T> v: Vec<T>
} }
@ -435,14 +451,14 @@ impl<T: VecRootableType> Drop for RootedVec<T> {
} }
} }
impl<T> Deref for RootedVec<T> { impl<T: VecRootableType> Deref for RootedVec<T> {
type Target = Vec<T>; type Target = Vec<T>;
fn deref(&self) -> &Vec<T> { fn deref(&self) -> &Vec<T> {
&self.v &self.v
} }
} }
impl<T> DerefMut for RootedVec<T> { impl<T: VecRootableType> DerefMut for RootedVec<T> {
fn deref_mut(&mut self) -> &mut Vec<T> { fn deref_mut(&mut self) -> &mut Vec<T> {
&mut self.v &mut self.v
} }