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

Make DOM own the style and layout data, in an UnsafeCell

Browse source 
The previous Cell was a lie.
This commit is contained in:
Anthony Ramine 2020-04-03 18:54:11 +02:00
parent 516e8e0aa6
commit 185a402d9c
17 changed files with 74 additions and 180 deletions
Download patch file Download diff file Expand all files Collapse all files

20
components/script_layout_interface/lib.rs
View file

@ -26,7 +26,6 @@ use net_traits::image_cache::PendingImageId;
use script_traits::UntrustedNodeAddress;
use servo_url::{ImmutableOrigin, ServoUrl};
use std::any::Any;
use std::ptr::NonNull;
use std::sync::atomic::AtomicIsize;
use style::data::ElementData;
@ -51,12 +50,11 @@ impl StyleData {
}
}
#[derive(Clone, Copy, MallocSizeOf)]
#[derive(MallocSizeOf)]
pub struct OpaqueStyleAndLayoutData {
// NB: We really store a `StyleAndLayoutData` here, so be careful!
#[ignore_malloc_size_of = "TODO(#6910) Box value that should be counted but \
the type lives in layout"]
ptr: NonNull<dyn Any + Send + Sync>,
#[ignore_malloc_size_of = "Trait objects are hard"]
ptr: Box<dyn Any + Send + Sync>,
}
impl OpaqueStyleAndLayoutData {
@ -66,23 +64,17 @@ impl OpaqueStyleAndLayoutData {
T: Any + Send + Sync,
{
Self {
ptr: Box::into_raw_non_null(Box::new(value) as Box<dyn Any + Send + Sync>),
ptr: Box::new(value) as Box<dyn Any + Send + Sync>,
}
}
#[inline]
pub fn as_ptr(&self) -> *mut (dyn Any + Send + Sync) {
self.ptr.as_ptr()
}
/// Extremely cursed.
#[allow(unsafe_code)]
#[inline]
pub unsafe fn downcast_ref<'extended, T>(&self) -> Option<&'extended T>
pub fn downcast_ref<T>(&self) -> Option<&T>
where
T: Any + Send + Sync,
{
(*self.ptr.as_ptr()).downcast_ref()
self.ptr.downcast_ref()
}
}