mirror of
https://github.com/servo/servo.git
synced 2025-07-22 14:53:49 +01:00
layout: Share styles to inline box children via SharedInlineStyles
(#36896)
`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>
This commit is contained in:
parent
db83601b62
commit
a0dd2c1beb
24 changed files with 369 additions and 187 deletions
|
@ -17,7 +17,7 @@ use style::properties::ComputedValues;
|
|||
use style::values::specified::box_::DisplayOutside;
|
||||
|
||||
use super::{BaseFragment, BaseFragmentInfo, CollapsedBlockMargins, Fragment, FragmentFlags};
|
||||
use crate::ArcRefCell;
|
||||
use crate::SharedStyle;
|
||||
use crate::display_list::ToWebRender;
|
||||
use crate::formatting_contexts::Baselines;
|
||||
use crate::geom::{
|
||||
|
@ -40,15 +40,9 @@ pub(crate) enum BackgroundMode {
|
|||
/// Draw the background normally, getting information from the Fragment style.
|
||||
Normal,
|
||||
}
|
||||
|
||||
#[derive(Debug, MallocSizeOf)]
|
||||
pub(crate) struct BackgroundStyle(#[conditional_malloc_size_of] pub ServoArc<ComputedValues>);
|
||||
|
||||
pub(crate) type SharedBackgroundStyle = ArcRefCell<BackgroundStyle>;
|
||||
|
||||
#[derive(MallocSizeOf)]
|
||||
pub(crate) struct ExtraBackground {
|
||||
pub style: SharedBackgroundStyle,
|
||||
pub style: SharedStyle,
|
||||
pub rect: PhysicalRect<Au>,
|
||||
}
|
||||
|
||||
|
@ -64,7 +58,6 @@ pub(crate) enum SpecificLayoutInfo {
|
|||
pub(crate) struct BoxFragment {
|
||||
pub base: BaseFragment,
|
||||
|
||||
#[conditional_malloc_size_of]
|
||||
pub style: ServoArc<ComputedValues>,
|
||||
pub children: Vec<Fragment>,
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue