mirror of
https://github.com/servo/servo.git
synced 2025-08-02 12:10:29 +01:00
script: Split style and layout data in DOM nodes (#31985)
This change splits the style and layout data in DOM nodes that is populated by style and layout passes. This makes Servo's data design more like Gecko's. This allows: 1. Removing the various `StyleAndLayout` data structures used by layout. 2. Removing the `GetStyleAndLayoutData` and `GetStyleAndOpaqueLayoutData` traits. Accessing style and layout data are now just functions on the `LayoutNode` and `ThreadSafeLayoutNode` traits. 3. Styling now doesn't populate layout data. This is is postponed until layout itself. 4. Allows the DOM wrappers to no longer have to be generic over the layout data. This data was already stored using `std::any::Any` and the new code just makes layout responsible for downcasting. Cleaning up the generic type parameter in the DOM wrappers can happen in a followup change. The main benefit to all of this is that we should be able to remove unsafe creation of `ServoLayoutNode` in layout and `TrustedLayoutNodeAddress` entirely, because `ServoLayoutNode` will be able to be passed directly from script to layout. In addition, this removes one more abstraction layer from the layout DOM wrappers, making the code a lot more understandable. Note: This increases the measured size of DOM types, but the same data is stored. It's simply that before that data was stored behind a heap pointer.
This commit is contained in:
parent
1ed6b96684
commit
08ef158d4e
15 changed files with 230 additions and 293 deletions
|
@ -47,6 +47,8 @@ use style::stylesheets::Stylesheet;
|
|||
use style_traits::CSSPixel;
|
||||
use webrender_api::{ExternalScrollId, ImageKey};
|
||||
|
||||
pub type GenericLayoutData = dyn Any + Send + Sync;
|
||||
|
||||
#[derive(MallocSizeOf)]
|
||||
pub struct StyleData {
|
||||
/// Data that the style system associates with a node. When the
|
||||
|
@ -69,33 +71,6 @@ impl Default for StyleData {
|
|||
}
|
||||
}
|
||||
|
||||
pub type StyleAndOpaqueLayoutData = StyleAndGenericData<dyn Any + Send + Sync>;
|
||||
|
||||
#[derive(MallocSizeOf)]
|
||||
pub struct StyleAndGenericData<T>
|
||||
where
|
||||
T: ?Sized,
|
||||
{
|
||||
/// The style data.
|
||||
pub style_data: StyleData,
|
||||
/// The opaque layout data.
|
||||
#[ignore_malloc_size_of = "Trait objects are hard"]
|
||||
pub generic_data: T,
|
||||
}
|
||||
|
||||
impl StyleAndOpaqueLayoutData {
|
||||
#[inline]
|
||||
pub fn new<T>(style_data: StyleData, layout_data: T) -> Box<Self>
|
||||
where
|
||||
T: Any + Send + Sync,
|
||||
{
|
||||
Box::new(StyleAndGenericData {
|
||||
style_data,
|
||||
generic_data: layout_data,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
/// Information that we need stored in each DOM node.
|
||||
#[derive(Default, MallocSizeOf)]
|
||||
pub struct DomParallelInfo {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue