mirror of
https://github.com/servo/servo.git
synced 2025-06-06 16:45:39 +00:00
Text decorations have a special kind of propagation. Instead of propating these during box tree construction, move propagation to stacking context tree construction. This will allow for using a very easy type of incremental layout when text decorations change. For instance, when a link changes color during hovering over it, we can skip all of box and fragment tree construction. In addition, propagation works a bit better now and color and style properly move down from their originating `Fragment`s. This introduces three new failures, because now we are drawing the text-decoration with the correct color in more places, which exposes an issue we have with text-decorations not being drawn in relation to the baseline (taking into account `vertical-align`). Testing: There are tests for these changes. Fixes #31736. Signed-off-by: Martin Robinson <mrobinson@igalia.com> Co-authored-by: Oriol Brufau <obrufau@igalia.com>
276 lines
9.7 KiB
Rust
276 lines
9.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 std::vec::IntoIter;
|
|
|
|
use app_units::Au;
|
|
use fonts::FontMetrics;
|
|
use malloc_size_of_derive::MallocSizeOf;
|
|
use script::layout_dom::ServoLayoutNode;
|
|
use script_layout_interface::wrapper_traits::{LayoutNode, ThreadSafeLayoutNode};
|
|
use servo_arc::Arc as ServoArc;
|
|
use style::properties::ComputedValues;
|
|
|
|
use super::{
|
|
InlineContainerState, InlineContainerStateFlags, SharedInlineStyles,
|
|
inline_container_needs_strut,
|
|
};
|
|
use crate::ContainingBlock;
|
|
use crate::cell::ArcRefCell;
|
|
use crate::context::LayoutContext;
|
|
use crate::dom_traversal::NodeAndStyleInfo;
|
|
use crate::fragment_tree::BaseFragmentInfo;
|
|
use crate::layout_box_base::LayoutBoxBase;
|
|
use crate::style_ext::{LayoutStyle, PaddingBorderMargin};
|
|
|
|
#[derive(Debug, MallocSizeOf)]
|
|
pub(crate) struct InlineBox {
|
|
pub base: LayoutBoxBase,
|
|
/// The [`SharedInlineStyles`] for this [`InlineBox`] that are used to share styles
|
|
/// with all [`super::TextRun`] children.
|
|
pub(super) shared_inline_styles: SharedInlineStyles,
|
|
/// The identifier of this inline box in the containing [`super::InlineFormattingContext`].
|
|
pub(super) identifier: InlineBoxIdentifier,
|
|
/// Whether or not this is the first instance of an [`InlineBox`] before a possible
|
|
/// block-in-inline split. When no split occurs, this is always true.
|
|
pub is_first_split: bool,
|
|
/// Whether or not this is the last instance of an [`InlineBox`] before a possible
|
|
/// block-in-inline split. When no split occurs, this is always true.
|
|
pub is_last_split: bool,
|
|
/// The index of the default font in the [`super::InlineFormattingContext`]'s font metrics store.
|
|
/// This is initialized during IFC shaping.
|
|
pub default_font_index: Option<usize>,
|
|
}
|
|
|
|
impl InlineBox {
|
|
pub(crate) fn new(info: &NodeAndStyleInfo) -> Self {
|
|
Self {
|
|
base: LayoutBoxBase::new(info.into(), info.style.clone()),
|
|
shared_inline_styles: info.into(),
|
|
// This will be assigned later, when the box is actually added to the IFC.
|
|
identifier: InlineBoxIdentifier::default(),
|
|
is_first_split: true,
|
|
is_last_split: false,
|
|
default_font_index: None,
|
|
}
|
|
}
|
|
|
|
pub(crate) fn split_around_block(&self) -> Self {
|
|
Self {
|
|
base: LayoutBoxBase::new(self.base.base_fragment_info, self.base.style.clone()),
|
|
shared_inline_styles: self.shared_inline_styles.clone(),
|
|
is_first_split: false,
|
|
is_last_split: false,
|
|
..*self
|
|
}
|
|
}
|
|
|
|
#[inline]
|
|
pub(crate) fn layout_style(&self) -> LayoutStyle {
|
|
LayoutStyle::Default(&self.base.style)
|
|
}
|
|
|
|
pub(crate) fn repair_style(
|
|
&mut self,
|
|
node: &ServoLayoutNode,
|
|
new_style: &ServoArc<ComputedValues>,
|
|
) {
|
|
self.base.repair_style(new_style);
|
|
*self.shared_inline_styles.style.borrow_mut() = new_style.clone();
|
|
*self.shared_inline_styles.selected.borrow_mut() = node.to_threadsafe().selected_style();
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Default, MallocSizeOf)]
|
|
pub(crate) struct InlineBoxes {
|
|
/// A collection of all inline boxes in a particular [`super::InlineFormattingContext`].
|
|
inline_boxes: Vec<ArcRefCell<InlineBox>>,
|
|
|
|
/// A list of tokens that represent the actual tree of inline boxes, while allowing
|
|
/// easy traversal forward and backwards through the tree. This structure is also
|
|
/// stored in the [`super::InlineFormattingContext::inline_items`], but this version is
|
|
/// faster to iterate.
|
|
inline_box_tree: Vec<InlineBoxTreePathToken>,
|
|
}
|
|
|
|
impl InlineBoxes {
|
|
pub(super) fn len(&self) -> usize {
|
|
self.inline_boxes.len()
|
|
}
|
|
|
|
pub(super) fn iter(&self) -> impl Iterator<Item = &ArcRefCell<InlineBox>> {
|
|
self.inline_boxes.iter()
|
|
}
|
|
|
|
pub(super) fn get(&self, identifier: &InlineBoxIdentifier) -> ArcRefCell<InlineBox> {
|
|
self.inline_boxes[identifier.index_in_inline_boxes as usize].clone()
|
|
}
|
|
|
|
pub(super) fn end_inline_box(&mut self, identifier: InlineBoxIdentifier) {
|
|
self.inline_box_tree
|
|
.push(InlineBoxTreePathToken::End(identifier));
|
|
}
|
|
|
|
pub(super) fn start_inline_box(
|
|
&mut self,
|
|
mut inline_box: InlineBox,
|
|
) -> (InlineBoxIdentifier, ArcRefCell<InlineBox>) {
|
|
assert!(self.inline_boxes.len() <= u32::MAX as usize);
|
|
assert!(self.inline_box_tree.len() <= u32::MAX as usize);
|
|
|
|
let index_in_inline_boxes = self.inline_boxes.len() as u32;
|
|
let index_of_start_in_tree = self.inline_box_tree.len() as u32;
|
|
|
|
let identifier = InlineBoxIdentifier {
|
|
index_of_start_in_tree,
|
|
index_in_inline_boxes,
|
|
};
|
|
inline_box.identifier = identifier;
|
|
let inline_box = ArcRefCell::new(inline_box);
|
|
|
|
self.inline_boxes.push(inline_box.clone());
|
|
self.inline_box_tree
|
|
.push(InlineBoxTreePathToken::Start(identifier));
|
|
|
|
(identifier, inline_box)
|
|
}
|
|
|
|
pub(super) fn get_path(
|
|
&self,
|
|
from: Option<InlineBoxIdentifier>,
|
|
to: InlineBoxIdentifier,
|
|
) -> IntoIter<InlineBoxTreePathToken> {
|
|
if from == Some(to) {
|
|
return Vec::new().into_iter();
|
|
}
|
|
|
|
let mut from_index = match from {
|
|
Some(InlineBoxIdentifier {
|
|
index_of_start_in_tree,
|
|
..
|
|
}) => index_of_start_in_tree as usize,
|
|
None => 0,
|
|
};
|
|
let mut to_index = to.index_of_start_in_tree as usize;
|
|
let is_reversed = to_index < from_index;
|
|
|
|
// Do not include the first or final token, depending on direction. These can be equal
|
|
// if we are starting or going to the the root of the inline formatting context, in which
|
|
// case we don't want to adjust.
|
|
if to_index > from_index && from.is_some() {
|
|
from_index += 1;
|
|
} else if to_index < from_index {
|
|
to_index += 1;
|
|
}
|
|
|
|
let mut path = Vec::with_capacity(from_index.abs_diff(to_index));
|
|
let min = from_index.min(to_index);
|
|
let max = from_index.max(to_index);
|
|
|
|
for token in &self.inline_box_tree[min..=max] {
|
|
// Skip useless recursion into inline boxes; we are looking for a direct path.
|
|
if Some(&token.reverse()) == path.last() {
|
|
path.pop();
|
|
} else {
|
|
path.push(*token);
|
|
}
|
|
}
|
|
|
|
if is_reversed {
|
|
path.reverse();
|
|
for token in path.iter_mut() {
|
|
*token = token.reverse();
|
|
}
|
|
}
|
|
|
|
path.into_iter()
|
|
}
|
|
}
|
|
|
|
#[derive(Clone, Copy, Debug, MallocSizeOf, PartialEq)]
|
|
pub(super) enum InlineBoxTreePathToken {
|
|
Start(InlineBoxIdentifier),
|
|
End(InlineBoxIdentifier),
|
|
}
|
|
|
|
impl InlineBoxTreePathToken {
|
|
fn reverse(&self) -> Self {
|
|
match self {
|
|
Self::Start(index) => Self::End(*index),
|
|
Self::End(index) => Self::Start(*index),
|
|
}
|
|
}
|
|
}
|
|
|
|
/// An identifier for a particular [`InlineBox`] to be used to fetch it from an [`InlineBoxes`]
|
|
/// store of inline boxes.
|
|
///
|
|
/// [`u32`] is used for the index, in order to save space. The value refers to the token
|
|
/// in the start tree data structure which can be fetched to find the actual index of
|
|
/// of the [`InlineBox`] in [`InlineBoxes::inline_boxes`].
|
|
#[derive(Clone, Copy, Debug, Default, Eq, Hash, MallocSizeOf, PartialEq)]
|
|
pub(crate) struct InlineBoxIdentifier {
|
|
pub index_of_start_in_tree: u32,
|
|
pub index_in_inline_boxes: u32,
|
|
}
|
|
|
|
pub(super) struct InlineBoxContainerState {
|
|
/// The container state common to both [`InlineBox`] and the root of the
|
|
/// [`super::InlineFormattingContext`].
|
|
pub base: InlineContainerState,
|
|
|
|
/// The [`InlineBoxIdentifier`] of this inline container state. If this is the root
|
|
/// the identifier is [`None`].
|
|
pub identifier: InlineBoxIdentifier,
|
|
|
|
/// The [`BaseFragmentInfo`] of the [`InlineBox`] that this state tracks.
|
|
pub base_fragment_info: BaseFragmentInfo,
|
|
|
|
/// The [`PaddingBorderMargin`] of the [`InlineBox`] that this state tracks.
|
|
pub pbm: PaddingBorderMargin,
|
|
|
|
/// Whether this is the last fragment of this InlineBox. This may not be the case if
|
|
/// the InlineBox is split due to an block-in-inline-split and this is not the last of
|
|
/// that split.
|
|
pub is_last_fragment: bool,
|
|
}
|
|
|
|
impl InlineBoxContainerState {
|
|
pub(super) fn new(
|
|
inline_box: &InlineBox,
|
|
containing_block: &ContainingBlock,
|
|
layout_context: &LayoutContext,
|
|
parent_container: &InlineContainerState,
|
|
is_last_fragment: bool,
|
|
font_metrics: Option<&FontMetrics>,
|
|
) -> Self {
|
|
let style = inline_box.base.style.clone();
|
|
let pbm = inline_box
|
|
.layout_style()
|
|
.padding_border_margin(containing_block);
|
|
|
|
let mut flags = InlineContainerStateFlags::empty();
|
|
if inline_container_needs_strut(&style, layout_context, Some(&pbm)) {
|
|
flags.insert(InlineContainerStateFlags::CREATE_STRUT);
|
|
}
|
|
|
|
Self {
|
|
base: InlineContainerState::new(style, flags, Some(parent_container), font_metrics),
|
|
identifier: inline_box.identifier,
|
|
base_fragment_info: inline_box.base.base_fragment_info,
|
|
pbm,
|
|
is_last_fragment,
|
|
}
|
|
}
|
|
|
|
pub(super) fn calculate_space_above_baseline(&self) -> Au {
|
|
let (ascent, descent, line_gap) = (
|
|
self.base.font_metrics.ascent,
|
|
self.base.font_metrics.descent,
|
|
self.base.font_metrics.line_gap,
|
|
);
|
|
let leading = line_gap - (ascent + descent);
|
|
leading.scale_by(0.5) + ascent
|
|
}
|
|
}
|