mirror of
https://github.com/servo/servo.git
synced 2025-06-06 16:45:39 +00:00
This change removes the `effective_writing_mode` concept and tries to properly implement right-to-left layout support for all non-inline writing modes. In general, what needs to happen is that rectangles need to be converted to physical rectangles using the containing block. A right-to-left rectangle's inline start is on the right physical side of the containing block. Likewise a positive inline offset in right-to-left text is a negative physical one. The implementation here is pretty good for most layout modes, but floats are still a bit in process. Currently, floats are processed in the logical layout of the block container, but there still might be issues with float interaction with mixed RTL and LTR. While this does move us closer to supporting vertical writing modes, this is still unsupported. New failures: - Vertical writing mode not supported: - `/css/CSS2/floats/floats-placement-vertical-001b.xht` - `/css/CSS2/floats/floats-placement-vertical-001c.xht` - Absolutes inlines should avoid floats (#33323) - `/css/css-position/position-absolute-dynamic-static-position-floats-004.html` - No support for grid - `/css/css-align/self-alignment/self-align-safe-unsafe-grid-003.html` - `/css/css-position/static-position/inline-level-absolute-in-block-level-context-009.html` - `/css/css-position/static-position/inline-level-absolute-in-block-level-context-010.html` - Cannot reproduce these locally on any platform. Very mysterious: - `/css/css-tables/row-group-margin-border-padding.html` - `/css/css-tables/row-margin-border-padding.html` - Exposes bugs we have related to hanging whitespace in preserved whitespace inlines: - `/css/css-text/white-space/trailing-space-and-text-alignment-rtl-003.html` - `/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-023.html` Signed-off-by: Martin Robinson <mrobinson@igalia.com> Co-authored-by: Rakhi Sharma <atbrakhi@igalia.com>
373 lines
14 KiB
Rust
373 lines
14 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 serde::Serialize;
|
|
use servo_arc::Arc as ServoArc;
|
|
use style::computed_values::overflow_x::T as ComputedOverflow;
|
|
use style::computed_values::position::T as ComputedPosition;
|
|
use style::logical_geometry::WritingMode;
|
|
use style::properties::ComputedValues;
|
|
use style::values::computed::{LengthPercentage, LengthPercentageOrAuto};
|
|
use style::Zero;
|
|
|
|
use super::{BaseFragment, BaseFragmentInfo, CollapsedBlockMargins, Fragment};
|
|
use crate::cell::ArcRefCell;
|
|
use crate::formatting_contexts::Baselines;
|
|
use crate::geom::{AuOrAuto, PhysicalPoint, PhysicalRect, PhysicalSides, PhysicalSize, ToLogical};
|
|
use crate::style_ext::ComputedValuesExt;
|
|
|
|
/// Describes how a [`BoxFragment`] paints its background.
|
|
pub(crate) enum BackgroundMode {
|
|
/// Draw the normal [`BoxFragment`] background as well as the extra backgrounds
|
|
/// based on the style and positioning rectangles in this data structure.
|
|
Extra(Vec<ExtraBackground>),
|
|
/// Do not draw a background for this Fragment. This is used for elements like
|
|
/// table tracks and table track groups, which rely on cells to paint their
|
|
/// backgrounds.
|
|
None,
|
|
/// Draw the background normally, getting information from the Fragment style.
|
|
Normal,
|
|
}
|
|
|
|
pub(crate) struct ExtraBackground {
|
|
pub style: ServoArc<ComputedValues>,
|
|
pub rect: PhysicalRect<Au>,
|
|
}
|
|
|
|
#[derive(Serialize)]
|
|
pub(crate) struct BoxFragment {
|
|
pub base: BaseFragment,
|
|
|
|
#[serde(skip_serializing)]
|
|
pub style: ServoArc<ComputedValues>,
|
|
pub children: Vec<ArcRefCell<Fragment>>,
|
|
|
|
/// The content rect of this fragment in the parent fragment's content rectangle. This
|
|
/// does not include padding, border, or margin -- it only includes content.
|
|
pub content_rect: PhysicalRect<Au>,
|
|
|
|
pub padding: PhysicalSides<Au>,
|
|
pub border: PhysicalSides<Au>,
|
|
pub margin: PhysicalSides<Au>,
|
|
|
|
/// When the `clear` property is not set to `none`, it may introduce clearance.
|
|
/// Clearance is some extra spacing that is added above the top margin,
|
|
/// so that the element doesn't overlap earlier floats in the same BFC.
|
|
/// The presence of clearance prevents the top margin from collapsing with
|
|
/// earlier margins or with the bottom margin of the parent block.
|
|
/// <https://drafts.csswg.org/css2/#clearance>
|
|
pub clearance: Option<Au>,
|
|
|
|
/// When this [`BoxFragment`] is for content that has a baseline, this tracks
|
|
/// the first and last baselines of that content. This is used to propagate baselines
|
|
/// to things such as tables and inline formatting contexts.
|
|
baselines: Baselines,
|
|
|
|
pub block_margins_collapsed_with_children: CollapsedBlockMargins,
|
|
|
|
/// The scrollable overflow of this box fragment.
|
|
pub scrollable_overflow_from_children: PhysicalRect<Au>,
|
|
|
|
/// Whether or not this box was overconstrained in the given dimension.
|
|
overconstrained: PhysicalSize<bool>,
|
|
|
|
/// The resolved box insets if this box is `position: sticky`. These are calculated
|
|
/// during stacking context tree construction because they rely on the size of the
|
|
/// scroll container.
|
|
pub(crate) resolved_sticky_insets: Option<PhysicalSides<AuOrAuto>>,
|
|
|
|
#[serde(skip_serializing)]
|
|
pub background_mode: BackgroundMode,
|
|
}
|
|
|
|
impl BoxFragment {
|
|
#[allow(clippy::too_many_arguments)]
|
|
pub fn new(
|
|
base_fragment_info: BaseFragmentInfo,
|
|
style: ServoArc<ComputedValues>,
|
|
children: Vec<Fragment>,
|
|
content_rect: PhysicalRect<Au>,
|
|
padding: PhysicalSides<Au>,
|
|
border: PhysicalSides<Au>,
|
|
margin: PhysicalSides<Au>,
|
|
clearance: Option<Au>,
|
|
block_margins_collapsed_with_children: CollapsedBlockMargins,
|
|
) -> BoxFragment {
|
|
let position = style.get_box().position;
|
|
let insets = style.get_position();
|
|
let width_overconstrained = position == ComputedPosition::Relative &&
|
|
!insets.left.is_auto() &&
|
|
!insets.right.is_auto();
|
|
let height_overconstrained = position == ComputedPosition::Relative &&
|
|
!insets.left.is_auto() &&
|
|
!insets.bottom.is_auto();
|
|
|
|
Self::new_with_overconstrained(
|
|
base_fragment_info,
|
|
style,
|
|
children,
|
|
content_rect,
|
|
padding,
|
|
border,
|
|
margin,
|
|
clearance,
|
|
block_margins_collapsed_with_children,
|
|
PhysicalSize::new(width_overconstrained, height_overconstrained),
|
|
)
|
|
}
|
|
|
|
#[allow(clippy::too_many_arguments)]
|
|
pub fn new_with_overconstrained(
|
|
base_fragment_info: BaseFragmentInfo,
|
|
style: ServoArc<ComputedValues>,
|
|
children: Vec<Fragment>,
|
|
content_rect: PhysicalRect<Au>,
|
|
padding: PhysicalSides<Au>,
|
|
border: PhysicalSides<Au>,
|
|
margin: PhysicalSides<Au>,
|
|
clearance: Option<Au>,
|
|
block_margins_collapsed_with_children: CollapsedBlockMargins,
|
|
overconstrained: PhysicalSize<bool>,
|
|
) -> BoxFragment {
|
|
let scrollable_overflow_from_children =
|
|
children.iter().fold(PhysicalRect::zero(), |acc, child| {
|
|
acc.union(&child.scrollable_overflow())
|
|
});
|
|
|
|
BoxFragment {
|
|
base: base_fragment_info.into(),
|
|
style,
|
|
children: children.into_iter().map(ArcRefCell::new).collect(),
|
|
content_rect,
|
|
padding,
|
|
border,
|
|
margin,
|
|
clearance,
|
|
baselines: Baselines::default(),
|
|
block_margins_collapsed_with_children,
|
|
scrollable_overflow_from_children,
|
|
overconstrained,
|
|
resolved_sticky_insets: None,
|
|
background_mode: BackgroundMode::Normal,
|
|
}
|
|
}
|
|
|
|
pub fn with_baselines(mut self, baselines: Baselines) -> Self {
|
|
self.baselines = baselines;
|
|
self
|
|
}
|
|
|
|
/// Get the baselines for this [`BoxFragment`] if they are compatible with the given [`WritingMode`].
|
|
/// If they are not compatible, [`Baselines::default()`] is returned.
|
|
pub fn baselines(&self, writing_mode: WritingMode) -> Baselines {
|
|
let mut baselines =
|
|
if writing_mode.is_horizontal() == self.style.writing_mode.is_horizontal() {
|
|
self.baselines
|
|
} else {
|
|
// If the writing mode of the container requesting baselines is not
|
|
// compatible, ensure that the baselines established by this fragment are
|
|
// not used.
|
|
Baselines::default()
|
|
};
|
|
|
|
// From the https://drafts.csswg.org/css-align-3/#baseline-export section on "block containers":
|
|
// > However, for legacy reasons if its baseline-source is auto (the initial
|
|
// > value) a block-level or inline-level block container that is a scroll container
|
|
// > always has a last baseline set, whose baselines all correspond to its block-end
|
|
// > margin edge.
|
|
//
|
|
// This applies even if there is no baseline set, so we unconditionally set the value here
|
|
// and ignore anything that is set via [`Self::with_baselines`].
|
|
if self.style.establishes_scroll_container() {
|
|
let content_rect_size = self.content_rect.size.to_logical(writing_mode);
|
|
let padding = self.padding.to_logical(writing_mode);
|
|
let border = self.border.to_logical(writing_mode);
|
|
let margin = self.margin.to_logical(writing_mode);
|
|
baselines.last = Some(
|
|
content_rect_size.block + padding.block_end + border.block_end + margin.block_end,
|
|
)
|
|
}
|
|
baselines
|
|
}
|
|
|
|
pub fn add_extra_background(&mut self, extra_background: ExtraBackground) {
|
|
match self.background_mode {
|
|
BackgroundMode::Extra(ref mut backgrounds) => backgrounds.push(extra_background),
|
|
_ => self.background_mode = BackgroundMode::Extra(vec![extra_background]),
|
|
}
|
|
}
|
|
|
|
pub fn set_does_not_paint_background(&mut self) {
|
|
self.background_mode = BackgroundMode::None;
|
|
}
|
|
|
|
pub fn scrollable_overflow(&self) -> PhysicalRect<Au> {
|
|
let physical_padding_rect = self.padding_rect();
|
|
let content_origin = self.content_rect.origin.to_vector();
|
|
physical_padding_rect.union(
|
|
&self
|
|
.scrollable_overflow_from_children
|
|
.translate(content_origin),
|
|
)
|
|
}
|
|
|
|
pub(crate) fn padding_rect(&self) -> PhysicalRect<Au> {
|
|
self.content_rect.outer_rect(self.padding)
|
|
}
|
|
|
|
pub(crate) fn border_rect(&self) -> PhysicalRect<Au> {
|
|
self.padding_rect().outer_rect(self.border)
|
|
}
|
|
|
|
pub(crate) fn margin_rect(&self) -> PhysicalRect<Au> {
|
|
self.border_rect().outer_rect(self.margin)
|
|
}
|
|
|
|
pub(crate) fn padding_border_margin(&self) -> PhysicalSides<Au> {
|
|
self.margin + self.border + self.padding
|
|
}
|
|
|
|
pub fn print(&self, tree: &mut PrintTree) {
|
|
tree.new_level(format!(
|
|
"Box\
|
|
\nbase={:?}\
|
|
\ncontent={:?}\
|
|
\npadding rect={:?}\
|
|
\nborder rect={:?}\
|
|
\nmargin={:?}\
|
|
\nclearance={:?}\
|
|
\nscrollable_overflow={:?}\
|
|
\nbaselines={:?}\
|
|
\noverflow={:?} / {:?}",
|
|
self.base,
|
|
self.content_rect,
|
|
self.padding_rect(),
|
|
self.border_rect(),
|
|
self.margin,
|
|
self.clearance,
|
|
self.scrollable_overflow(),
|
|
self.baselines,
|
|
self.style.get_box().overflow_x,
|
|
self.style.get_box().overflow_y,
|
|
));
|
|
|
|
for child in &self.children {
|
|
child.borrow().print(tree);
|
|
}
|
|
tree.end_level();
|
|
}
|
|
|
|
pub fn scrollable_overflow_for_parent(&self) -> PhysicalRect<Au> {
|
|
let mut overflow = self.border_rect();
|
|
if self.style.establishes_scroll_container() {
|
|
return overflow;
|
|
}
|
|
|
|
// https://www.w3.org/TR/css-overflow-3/#scrollable
|
|
// Only include the scrollable overflow of a child box if it has overflow: visible.
|
|
let scrollable_overflow = self.scrollable_overflow();
|
|
let bottom_right = PhysicalPoint::new(
|
|
overflow.max_x().max(scrollable_overflow.max_x()),
|
|
overflow.max_y().max(scrollable_overflow.max_y()),
|
|
);
|
|
|
|
if self.style.get_box().overflow_y == ComputedOverflow::Visible {
|
|
overflow.origin.y = overflow.origin.y.min(scrollable_overflow.origin.y);
|
|
overflow.size.height = bottom_right.y - overflow.origin.y;
|
|
}
|
|
|
|
if self.style.get_box().overflow_x == ComputedOverflow::Visible {
|
|
overflow.origin.x = overflow.origin.x.min(scrollable_overflow.origin.x);
|
|
overflow.size.width = bottom_right.x - overflow.origin.x;
|
|
}
|
|
|
|
overflow
|
|
}
|
|
|
|
pub(crate) fn calculate_resolved_insets_if_positioned(
|
|
&self,
|
|
containing_block: &PhysicalRect<Au>,
|
|
) -> PhysicalSides<AuOrAuto> {
|
|
let position = self.style.get_box().position;
|
|
debug_assert_ne!(
|
|
position,
|
|
ComputedPosition::Static,
|
|
"Should not call this method on statically positioned box."
|
|
);
|
|
|
|
let (cb_width, cb_height) = (containing_block.width(), containing_block.height());
|
|
let content_rect = self.content_rect;
|
|
|
|
if let Some(resolved_sticky_insets) = self.resolved_sticky_insets {
|
|
return resolved_sticky_insets;
|
|
}
|
|
|
|
let convert_to_au_or_auto = |sides: PhysicalSides<Au>| {
|
|
PhysicalSides::new(
|
|
AuOrAuto::LengthPercentage(sides.top),
|
|
AuOrAuto::LengthPercentage(sides.right),
|
|
AuOrAuto::LengthPercentage(sides.bottom),
|
|
AuOrAuto::LengthPercentage(sides.left),
|
|
)
|
|
};
|
|
|
|
// "A resolved value special case property like top defined in another
|
|
// specification If the property applies to a positioned element and the
|
|
// resolved value of the display property is not none or contents, and
|
|
// the property is not over-constrained, then the resolved value is the
|
|
// used value. Otherwise the resolved value is the computed value."
|
|
// https://drafts.csswg.org/cssom/#resolved-values
|
|
let insets = self.style.get_position();
|
|
if position == ComputedPosition::Relative {
|
|
let get_resolved_axis = |start: &LengthPercentageOrAuto,
|
|
end: &LengthPercentageOrAuto,
|
|
container_length: Au| {
|
|
let start = start.map(|value| value.to_used_value(container_length));
|
|
let end = end.map(|value| value.to_used_value(container_length));
|
|
match (start.non_auto(), end.non_auto()) {
|
|
(None, None) => (Au::zero(), Au::zero()),
|
|
(None, Some(end)) => (-end, end),
|
|
(Some(start), None) => (start, -start),
|
|
// This is the overconstrained case, for which the resolved insets will
|
|
// simply be the computed insets.
|
|
(Some(start), Some(end)) => (start, end),
|
|
}
|
|
};
|
|
let (left, right) = get_resolved_axis(&insets.left, &insets.right, cb_width);
|
|
let (top, bottom) = get_resolved_axis(&insets.top, &insets.bottom, cb_height);
|
|
return convert_to_au_or_auto(PhysicalSides::new(top, right, bottom, left));
|
|
}
|
|
|
|
debug_assert!(
|
|
position == ComputedPosition::Fixed || position == ComputedPosition::Absolute
|
|
);
|
|
|
|
let resolve = |value: &LengthPercentageOrAuto, container_length: Au| -> Au {
|
|
value
|
|
.auto_is(LengthPercentage::zero)
|
|
.to_used_value(container_length)
|
|
};
|
|
|
|
let (top, bottom) = if self.overconstrained.height {
|
|
(
|
|
resolve(&insets.top, cb_height),
|
|
resolve(&insets.bottom, cb_height),
|
|
)
|
|
} else {
|
|
(content_rect.origin.y, cb_height - content_rect.max_y())
|
|
};
|
|
let (left, right) = if self.overconstrained.width {
|
|
(
|
|
resolve(&insets.left, cb_width),
|
|
resolve(&insets.right, cb_width),
|
|
)
|
|
} else {
|
|
(content_rect.origin.x, cb_width - content_rect.max_x())
|
|
};
|
|
|
|
convert_to_au_or_auto(PhysicalSides::new(top, right, bottom, left))
|
|
}
|
|
}
|