mirror of
https://github.com/servo/servo
synced 2026-04-26 01:25:32 +02:00
Instead of readily adding a strut for text carets when processing a line break, wait until a line is finished. This allows placing a strut on the final line. In addition to fixing #41338 this will also make it possible to handle line breaks as a separate kind of text run item so that we can preserve shaping results between layouts. In addition, some changes are made in script to ensure that these placeholders are never placed for non-textual input elements. Testing: This change adds a Servo-specific WPT test. Caret rendering isn't specified. Fixes: #41338 Signed-off-by: Martin Robinson <mrobinson@igalia.com>
254 lines
8.6 KiB
Rust
254 lines
8.6 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::FontRef;
|
|
use layout_api::LayoutNode;
|
|
use malloc_size_of_derive::MallocSizeOf;
|
|
use script::layout_dom::ServoLayoutNode;
|
|
use servo_arc::Arc as ServoArc;
|
|
use style::context::SharedStyleContext;
|
|
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,
|
|
/// The index of the default font in the [`super::InlineFormattingContext`]'s font metrics store.
|
|
/// This is initialized during IFC shaping.
|
|
pub default_font: Option<FontRef>,
|
|
}
|
|
|
|
impl InlineBox {
|
|
pub(crate) fn new(info: &NodeAndStyleInfo, context: &LayoutContext) -> Self {
|
|
Self {
|
|
base: LayoutBoxBase::new(info.into(), info.style.clone()),
|
|
shared_inline_styles: SharedInlineStyles::from_info_and_context(info, context),
|
|
// This will be assigned later, when the box is actually added to the IFC.
|
|
identifier: InlineBoxIdentifier::default(),
|
|
default_font: None,
|
|
}
|
|
}
|
|
|
|
#[inline]
|
|
pub(crate) fn layout_style(&self) -> LayoutStyle<'_> {
|
|
LayoutStyle::Default(&self.base.style)
|
|
}
|
|
|
|
pub(crate) fn repair_style(
|
|
&mut self,
|
|
context: &SharedStyleContext,
|
|
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.selected_style(context);
|
|
}
|
|
}
|
|
|
|
#[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,
|
|
inline_box: ArcRefCell<InlineBox>,
|
|
) -> InlineBoxIdentifier {
|
|
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.borrow_mut().identifier = identifier;
|
|
|
|
self.inline_boxes.push(inline_box);
|
|
self.inline_box_tree
|
|
.push(InlineBoxTreePathToken::Start(identifier));
|
|
|
|
identifier
|
|
}
|
|
|
|
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 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,
|
|
}
|
|
|
|
impl InlineBoxContainerState {
|
|
pub(super) fn new(
|
|
inline_box: &InlineBox,
|
|
containing_block: &ContainingBlock,
|
|
layout_context: &LayoutContext,
|
|
parent_container: &InlineContainerState,
|
|
default_font: Option<FontRef>,
|
|
) -> 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), default_font),
|
|
identifier: inline_box.identifier,
|
|
base_fragment_info: inline_box.base.base_fragment_info,
|
|
pbm,
|
|
}
|
|
}
|
|
|
|
pub(super) fn calculate_space_above_baseline(&self) -> Au {
|
|
let font_metrics = &self.base.font_metrics;
|
|
let (ascent, descent, line_gap) = (
|
|
font_metrics.ascent,
|
|
font_metrics.descent,
|
|
font_metrics.line_gap,
|
|
);
|
|
let leading = line_gap - (ascent + descent);
|
|
leading.scale_by(0.5) + ascent
|
|
}
|
|
}
|