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

Return *const T from JS::unsafe_get() (fixes #4712).

Browse source
This commit is contained in:
Ms2ger 2015-01-24 16:36:54 +01:00
parent 4c9d7ce5d0
commit 801949556d
2 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/layout/wrapper.rs
View file

@ -369,10 +369,8 @@ impl<'ln> TNode<'ln, LayoutElement<'ln>> for LayoutNode<'ln> {
None => panic!("not an element")
};
let element = &*elem.unsafe_get();
LayoutElement {
element: mem::transmute(element),
element: &*elem.unsafe_get(),
}
}
}
@ -719,7 +717,7 @@ impl<'ln> TLayoutNode for ThreadSafeLayoutNode<'ln> {
}
unsafe fn get<'a>(&'a self) -> &'a Node { // this change.
mem::transmute::<*mut Node,&'a Node>(self.get_jsmanaged().unsafe_get())
&*self.get_jsmanaged().unsafe_get()
}
fn first_child(&self) -> Option<ThreadSafeLayoutNode<'ln>> {
@ -819,7 +817,7 @@ impl<'ln> ThreadSafeLayoutNode<'ln> {
// FIXME(pcwalton): Workaround until Rust gets multiple lifetime parameters on
// implementations.
ThreadSafeLayoutElement {
element: &mut *element,
element: &*element,
}
}
}