Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-02 12:10:29 +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

14
components/script/dom/bindings/codegen/CodegenRust.py
View file

@ -2728,7 +2728,7 @@ assert!(!obj.is_null());
SetProxyReservedSlot( SetProxyReservedSlot(
obj.get(), obj.get(),
0, 0,
&PrivateValue(&*raw as *const %(concreteType)s as *const libc::c_void), &PrivateValue(raw.as_ptr() as *const %(concreteType)s as *const libc::c_void),
); );
""" """
else: else:
@ -2742,7 +2742,7 @@ assert!(!obj.is_null());
JS_SetReservedSlot( JS_SetReservedSlot(
obj.get(), obj.get(),
DOM_OBJECT_SLOT, DOM_OBJECT_SLOT,
&PrivateValue(&*raw as *const %(concreteType)s as *const libc::c_void), &PrivateValue(raw.as_ptr() as *const %(concreteType)s as *const libc::c_void),
); );
""" """
create = create % {"concreteType": self.descriptor.concreteType} create = create % {"concreteType": self.descriptor.concreteType}
@ -2765,11 +2765,11 @@ GetProtoObject(cx, scope, proto.handle_mut());
assert!(!proto.is_null()); assert!(!proto.is_null());
%(createObject)s %(createObject)s
raw.init_reflector(obj.get()); let root = raw.reflect_with(obj.get());
%(copyUnforgeable)s %(copyUnforgeable)s
DomRoot::from_ref(&*raw)\ DomRoot::from_ref(&*root)\
""" % {'copyUnforgeable': unforgeable, 'createObject': create}) """ % {'copyUnforgeable': unforgeable, 'createObject': create})
@ -2809,12 +2809,12 @@ rooted!(in(*cx) let mut obj = ptr::null_mut::<JSObject>());
create_global_object( create_global_object(
cx, cx,
&Class.base, &Class.base,
&*raw as *const %(concreteType)s as *const libc::c_void, raw.as_ptr() as *const %(concreteType)s as *const libc::c_void,
_trace, _trace,
obj.handle_mut()); obj.handle_mut());
assert!(!obj.is_null()); assert!(!obj.is_null());
raw.init_reflector(obj.get()); let root = raw.reflect_with(obj.get());
let _ac = JSAutoRealm::new(*cx, obj.get()); let _ac = JSAutoRealm::new(*cx, obj.get());
rooted!(in(*cx) let mut proto = ptr::null_mut::<JSObject>()); rooted!(in(*cx) let mut proto = ptr::null_mut::<JSObject>());
@ -2828,7 +2828,7 @@ assert!(immutable);
%(unforgeable)s %(unforgeable)s
DomRoot::from_ref(&*raw)\ DomRoot::from_ref(&*root)\
""" % values) """ % values)

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

@ -26,7 +26,7 @@
use crate::dom::bindings::conversions::DerivedFrom; use crate::dom::bindings::conversions::DerivedFrom;
use crate::dom::bindings::inheritance::Castable; 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::trace_reflector;
use crate::dom::bindings::trace::JSTraceable; use crate::dom::bindings::trace::JSTraceable;
use crate::dom::node::Node; use crate::dom::node::Node;
@ -385,15 +385,25 @@ where
} }
} }
impl<T> Deref for MaybeUnreflectedDom<T> impl<T> Root<MaybeUnreflectedDom<T>>
where where
T: DomObject, T: DomObject,
{ {
type Target = T; pub fn as_ptr(&self) -> *const T {
self.value.ptr.as_ptr()
}
}
fn deref(&self) -> &T { impl<T> Root<MaybeUnreflectedDom<T>>
debug_assert!(thread_state::get().is_script()); where
unsafe { &*self.ptr.as_ptr() } 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
} }
} }