mirror of
https://github.com/servo/servo.git
synced 2025-06-06 16:45:39 +00:00
08ef158d4e
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.
47 lines
1.7 KiB
Rust
47 lines
1.7 KiB
Rust
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
|
|
|
use atomic_refcell::AtomicRefCell;
|
|
use bitflags::bitflags;
|
|
use script_layout_interface::wrapper_traits::LayoutDataTrait;
|
|
|
|
use crate::construct::ConstructionResult;
|
|
|
|
/// Data that layout associates with a node.
|
|
#[derive(Clone, Default)]
|
|
pub struct InnerLayoutData {
|
|
/// The current results of flow construction for this node. This is either a
|
|
/// flow or a `ConstructionItem`. See comments in `construct.rs` for more
|
|
/// details.
|
|
pub flow_construction_result: ConstructionResult,
|
|
|
|
pub before_flow_construction_result: ConstructionResult,
|
|
|
|
pub after_flow_construction_result: ConstructionResult,
|
|
|
|
pub details_summary_flow_construction_result: ConstructionResult,
|
|
pub details_content_flow_construction_result: ConstructionResult,
|
|
|
|
/// Various flags.
|
|
pub flags: LayoutDataFlags,
|
|
}
|
|
|
|
bitflags! {
|
|
#[derive(Clone, Copy, Default)]
|
|
pub struct LayoutDataFlags: u8 {
|
|
/// Whether a flow has been newly constructed.
|
|
const HAS_NEWLY_CONSTRUCTED_FLOW = 0x01;
|
|
/// Whether this node has been traversed by layout.
|
|
const HAS_BEEN_TRAVERSED = 0x02;
|
|
}
|
|
}
|
|
|
|
/// A wrapper for [`InnerLayoutData`]. This is necessary to give the entire data
|
|
/// structure interior mutability, as we will need to mutate the layout data of
|
|
/// non-mutable DOM nodes.
|
|
#[derive(Clone, Default)]
|
|
pub struct LayoutData(pub AtomicRefCell<InnerLayoutData>);
|
|
|
|
// The implementation of this trait allows the data to be stored in the DOM.
|
|
impl LayoutDataTrait for LayoutData {}
|