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

JSRef<T> & Root<T> contains '*T' instead of RefCell.

Browse source
This commit is contained in:
Tetsuharu OHZEKI 2014-05-26 03:43:47 +09:00
parent 43b647feff
commit 3e558fdcb1
1 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/components/script/dom/bindings/js.rs
View file

@ -394,7 +394,7 @@ pub struct Root<'a, 'b, T> {
/// Reference to rooted value that must not outlive this container /// Reference to rooted value that must not outlive this container
jsref: JSRef<'b, T>, jsref: JSRef<'b, T>,
/// Pointer to underlying Rust data /// Pointer to underlying Rust data
ptr: RefCell<*mut T>, ptr: *T,
/// On-stack JS pointer to assuage conservative stack scanner /// On-stack JS pointer to assuage conservative stack scanner
js_ptr: *mut JSObject, js_ptr: *mut JSObject,
} }
@ -404,13 +404,14 @@ impl<'a, 'b, T: Reflectable> Root<'a, 'b, T> {
/// It cannot not outlive its associated RootCollection, and it contains a JSRef /// It cannot not outlive its associated RootCollection, and it contains a JSRef
/// which cannot outlive this new Root. /// which cannot outlive this new Root.
fn new(roots: &'a RootCollection, unrooted: &JS<T>) -> Root<'a, 'b, T> { fn new(roots: &'a RootCollection, unrooted: &JS<T>) -> Root<'a, 'b, T> {
let ptr: *T = unrooted.ptr.borrow().clone() as *T;
let root = Root { let root = Root {
root_list: roots, root_list: roots,
jsref: JSRef { jsref: JSRef {
ptr: unrooted.ptr.clone(), ptr: ptr,
chain: ContravariantLifetime, chain: ContravariantLifetime,
}, },
ptr: unrooted.ptr.clone(), ptr: ptr,
js_ptr: unrooted.reflector().get_jsobject(), js_ptr: unrooted.reflector().get_jsobject(),
}; };
roots.root(&root); roots.root(&root);
@ -445,25 +446,23 @@ impl<'a, 'b, T: Reflectable> DerefMut<JSRef<'b, T>> for Root<'a, 'b, T> {
impl<'a, T: Reflectable> Deref<T> for JSRef<'a, T> { impl<'a, T: Reflectable> Deref<T> for JSRef<'a, T> {
fn deref<'b>(&'b self) -> &'b T { fn deref<'b>(&'b self) -> &'b T {
let borrow = self.ptr.borrow();
unsafe { unsafe {
&**borrow &*self.ptr
} }
} }
} }
impl<'a, T: Reflectable> DerefMut<T> for JSRef<'a, T> { impl<'a, T: Reflectable> DerefMut<T> for JSRef<'a, T> {
fn deref_mut<'b>(&'b mut self) -> &'b mut T { fn deref_mut<'b>(&'b mut self) -> &'b mut T {
let mut borrowed = self.ptr.borrow_mut();
unsafe { unsafe {
&mut **borrowed &mut *(self.ptr as *mut T)
} }
} }
} }
/// Encapsulates a reference to something that is guaranteed to be alive. This is freely copyable. /// Encapsulates a reference to something that is guaranteed to be alive. This is freely copyable.
pub struct JSRef<'a, T> { pub struct JSRef<'a, T> {
ptr: RefCell<*mut T>, ptr: *T,
chain: ContravariantLifetime<'a>, chain: ContravariantLifetime<'a>,
} }
@ -495,7 +494,7 @@ impl<'a,T> JSRef<'a,T> {
pub fn unrooted(&self) -> JS<T> { pub fn unrooted(&self) -> JS<T> {
JS { JS {
ptr: self.ptr.clone() ptr: RefCell::new(self.ptr as *mut T)
} }
} }
} }