mirror of
https://github.com/servo/servo.git
synced 2025-06-14 11:24:33 +00:00
a0dd2c1beb
`TextRun`s use their parent style to render. Previously, these styles were cloned and stored directly in the box tree `TextRun` and resulting `TextFragment`s. This presents a problem for incremental layout. Wrapping the style in another layer of shared ownership and mutability will allow updating all `TextFragment`s during repaint-only incremental layout by simply updating the box tree styles of the original text parents. This adds a new set of borrows when accessing text styles, but also makes it so that during box tree block construction `InlineFormattingContext`s are created lazily and now `InlineFormattingContextBuilder::finish` consumes the builder, making the API make a bit more sense. This should also improve performance of box tree block construction slightly. Testing: This should not change observable behavior and thus is covered by existing WPT tests. Signed-off-by: Martin Robinson <mrobinson@igalia.com> Co-authored-by: Oriol Brufau <obrufau@igalia.com>
94 lines
3.3 KiB
Rust
94 lines
3.3 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 app_units::Au;
|
|
use base::print_tree::PrintTree;
|
|
use malloc_size_of_derive::MallocSizeOf;
|
|
use servo_arc::Arc as ServoArc;
|
|
use style::properties::ComputedValues;
|
|
|
|
use super::{BaseFragment, BaseFragmentInfo, Fragment};
|
|
use crate::cell::ArcRefCell;
|
|
use crate::geom::PhysicalRect;
|
|
|
|
/// Can contain child fragments with relative coordinates, but does not contribute to painting
|
|
/// itself. [`PositioningFragment`]s may be completely anonymous, or just non-painting Fragments
|
|
/// generated by boxes.
|
|
#[derive(MallocSizeOf)]
|
|
pub(crate) struct PositioningFragment {
|
|
pub base: BaseFragment,
|
|
pub rect: PhysicalRect<Au>,
|
|
pub children: Vec<Fragment>,
|
|
|
|
/// The scrollable overflow of this anonymous fragment's children.
|
|
pub scrollable_overflow: PhysicalRect<Au>,
|
|
|
|
/// If this fragment was created with a style, the style of the fragment.
|
|
pub style: Option<ServoArc<ComputedValues>>,
|
|
|
|
/// This [`PositioningFragment`]'s containing block rectangle in coordinates relative to
|
|
/// the initial containing block, but not taking into account any transforms.
|
|
pub cumulative_containing_block_rect: PhysicalRect<Au>,
|
|
}
|
|
|
|
impl PositioningFragment {
|
|
pub fn new_anonymous(rect: PhysicalRect<Au>, children: Vec<Fragment>) -> ArcRefCell<Self> {
|
|
Self::new_with_base_fragment(BaseFragment::anonymous(), None, rect, children)
|
|
}
|
|
|
|
pub fn new_empty(
|
|
base_fragment_info: BaseFragmentInfo,
|
|
rect: PhysicalRect<Au>,
|
|
style: ServoArc<ComputedValues>,
|
|
) -> ArcRefCell<Self> {
|
|
Self::new_with_base_fragment(base_fragment_info.into(), Some(style), rect, Vec::new())
|
|
}
|
|
|
|
fn new_with_base_fragment(
|
|
base: BaseFragment,
|
|
style: Option<ServoArc<ComputedValues>>,
|
|
rect: PhysicalRect<Au>,
|
|
children: Vec<Fragment>,
|
|
) -> ArcRefCell<Self> {
|
|
let content_origin = rect.origin;
|
|
let scrollable_overflow = children.iter().fold(PhysicalRect::zero(), |acc, child| {
|
|
acc.union(
|
|
&child
|
|
.scrollable_overflow_for_parent()
|
|
.translate(content_origin.to_vector()),
|
|
)
|
|
});
|
|
ArcRefCell::new(PositioningFragment {
|
|
base,
|
|
style,
|
|
rect,
|
|
children,
|
|
scrollable_overflow,
|
|
cumulative_containing_block_rect: PhysicalRect::zero(),
|
|
})
|
|
}
|
|
|
|
pub(crate) fn set_containing_block(&mut self, containing_block: &PhysicalRect<Au>) {
|
|
self.cumulative_containing_block_rect = *containing_block;
|
|
}
|
|
|
|
pub fn offset_by_containing_block(&self, rect: &PhysicalRect<Au>) -> PhysicalRect<Au> {
|
|
rect.translate(self.cumulative_containing_block_rect.origin.to_vector())
|
|
}
|
|
|
|
pub fn print(&self, tree: &mut PrintTree) {
|
|
tree.new_level(format!(
|
|
"PositioningFragment\
|
|
\nbase={:?}\
|
|
\nrect={:?}\
|
|
\nscrollable_overflow={:?}",
|
|
self.base, self.rect, self.scrollable_overflow
|
|
));
|
|
|
|
for child in &self.children {
|
|
child.print(tree);
|
|
}
|
|
tree.end_level();
|
|
}
|
|
}
|