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

Change how we reflect DOM objects in codegen

Browse source 
We now go through <Root<MaybeUnreflectedDom<T>>>::reflect_with,
to decrease the amount of bad stuff we can end up doing. This
avoids a source of vtable pointer instability that could cause
issues down the road.
This commit is contained in:
Anthony Ramine 2020-03-06 18:45:29 +01:00
parent 356c4e0bc8
commit 05077d31c8
2 changed files with 23 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
components/script/dom/bindings/root.rs
View file

@ -26,7 +26,7 @@
use crate::dom::bindings::conversions::DerivedFrom;
use crate::dom::bindings::inheritance::Castable;
use crate::dom::bindings::reflector::{DomObject, Reflector};
use crate::dom::bindings::reflector::{DomObject, MutDomObject, Reflector};
use crate::dom::bindings::trace::trace_reflector;
use crate::dom::bindings::trace::JSTraceable;
use crate::dom::node::Node;
@ -385,15 +385,25 @@ where
}
}
impl<T> Deref for MaybeUnreflectedDom<T>
impl<T> Root<MaybeUnreflectedDom<T>>
where
T: DomObject,
{
type Target = T;
pub fn as_ptr(&self) -> *const T {
self.value.ptr.as_ptr()
}
}
fn deref(&self) -> &T {
debug_assert!(thread_state::get().is_script());
unsafe { &*self.ptr.as_ptr() }
impl<T> Root<MaybeUnreflectedDom<T>>
where
T: MutDomObject,
{
pub unsafe fn reflect_with(self, obj: *mut JSObject) -> DomRoot<T> {
let ptr = self.as_ptr();
drop(self);
let root = DomRoot::from_ref(&*ptr);
root.init_reflector(obj);
root
}
}