Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

layout: Convert the FragmentTree to physical geometry (#33030)

Browse source 
This converts all geometry in the FragmentTree into physical geometry,
doing conversions ahead of time instead of when traversing the fragment
tree. This is necessary to properly implement BiDi in Servo as we need
to know what side borders are on in mixed RTL and LTR contexts.

In addition, fragments are laid out in a particular context and only
that context knows its writing mode. There were issues where were using
one writing mode to lay out and another to convert to phyisical
coordinates. This isn't an issue now since we only use the default
writing mode, but starts to be an issue with BiDi text.

Closes #25564.

Signed-off-by: Martin Robinson <mrobinson@igalia.com>
This commit is contained in:
Martin Robinson 2024-08-14 14:22:06 +02:00 • committed by GitHub
parent 65f90ff1fd
commit d941d2fd67
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
17 changed files with 502 additions and 432 deletions
Download patch file Download diff file Expand all files Collapse all files

39
components/layout_2020/display_list/mod.rs
View file

@ -260,7 +260,6 @@ impl Fragment {
if let Some(style) = positioning_fragment.style.as_ref() {
let rect = positioning_fragment
.rect
.to_physical(style.writing_mode, containing_block)
.translate(containing_block.origin.to_vector());
self.maybe_push_hit_test_for_style_and_tag(
builder,
@ -274,10 +273,7 @@ impl Fragment {
Fragment::Image(i) => match i.style.get_inherited_box().visibility {
Visibility::Visible => {
builder.is_contentful = true;
let rect = i
.rect
.to_physical(i.style.writing_mode, containing_block)
.translate(containing_block.origin.to_vector());
let rect = i.rect.translate(containing_block.origin.to_vector());
let common = builder.common_properties(rect.to_webrender(), &i.style);
builder.wr().push_image(
@ -295,10 +291,7 @@ impl Fragment {
Fragment::IFrame(iframe) => match iframe.style.get_inherited_box().visibility {
Visibility::Visible => {
builder.is_contentful = true;
let rect = iframe
.rect
.to_physical(iframe.style.writing_mode, containing_block)
.translate(containing_block.origin.to_vector());
let rect = iframe.rect.translate(containing_block.origin.to_vector());
builder.iframe_sizes.insert(
iframe.browsing_context_id,
@ -366,10 +359,7 @@ impl Fragment {
builder.is_contentful = true;
let rect = fragment
.rect
.to_physical(fragment.parent_style.writing_mode, containing_block)
.translate(containing_block.origin.to_vector());
let rect = fragment.rect.translate(containing_block.origin.to_vector());
let mut baseline_origin = rect.origin;
baseline_origin.y += fragment.font_metrics.ascent;
let glyphs = glyphs(
@ -504,7 +494,6 @@ impl<'a> BuilderForBoxFragment<'a> {
fn new(fragment: &'a BoxFragment, containing_block: &'a PhysicalRect<Au>) -> Self {
let border_rect: units::LayoutRect = fragment
.border_rect()
.to_physical(fragment.style.writing_mode, containing_block)
.translate(containing_block.origin.to_vector())
.to_webrender();
@ -562,7 +551,6 @@ impl<'a> BuilderForBoxFragment<'a> {
self.content_rect.get_or_init(|| {
self.fragment
.content_rect
.to_physical(self.fragment.style.writing_mode, self.containing_block)
.translate(self.containing_block.origin.to_vector())
.to_webrender()
})
@ -572,7 +560,6 @@ impl<'a> BuilderForBoxFragment<'a> {
self.padding_rect.get_or_init(|| {
self.fragment
.padding_rect()
.to_physical(self.fragment.style.writing_mode, self.containing_block)
.translate(self.containing_block.origin.to_vector())
.to_webrender()
})
@ -606,13 +593,7 @@ impl<'a> BuilderForBoxFragment<'a> {
return Some(clip);
}
let radii = inner_radii(
self.border_radius,
self.fragment
.border
.to_physical(self.fragment.style.writing_mode)
.to_webrender(),
);
let radii = inner_radii(self.border_radius, self.fragment.border.to_webrender());
let maybe_clip =
create_clip_chain(radii, *self.padding_rect(), builder, force_clip_creation);
*self.padding_edge_clip_chain_id.borrow_mut() = maybe_clip;
@ -630,9 +611,7 @@ impl<'a> BuilderForBoxFragment<'a> {
let radii = inner_radii(
self.border_radius,
(self.fragment.border + self.fragment.padding)
.to_physical(self.fragment.style.writing_mode)
.to_webrender(),
(self.fragment.border + self.fragment.padding).to_webrender(),
);
let maybe_clip =
create_clip_chain(radii, *self.content_rect(), builder, force_clip_creation);
@ -731,7 +710,7 @@ impl<'a> BuilderForBoxFragment<'a> {
painting_area_override: None,
positioning_area_override: Some(
positioning_area
.to_physical(self.fragment.style.writing_mode, self.containing_block)
.to_physical(self.fragment.style.writing_mode)
.translate(self.containing_block.origin.to_vector())
.to_webrender(),
),
@ -887,11 +866,7 @@ impl<'a> BuilderForBoxFragment<'a> {
fn build_border(&mut self, builder: &mut DisplayListBuilder) {
let border = self.fragment.style.get_border();
let border_widths = self
.fragment
.border
.to_physical(self.fragment.style.writing_mode)
.to_webrender();
let border_widths = self.fragment.border.to_webrender();
if border_widths == SideOffsets2D::zero() {
return;

16
components/layout_2020/display_list/stacking_context.rs
View file

@ -1178,11 +1178,9 @@ impl BoxFragment {
let padding_rect = self
.padding_rect()
.to_physical(self.style.writing_mode, &containing_block.rect)
.translate(containing_block.rect.origin.to_vector());
let content_rect = self
.content_rect
.to_physical(self.style.writing_mode, &containing_block.rect)
.translate(containing_block.rect.origin.to_vector());
let for_absolute_descendants = ContainingBlock::new(
@ -1246,9 +1244,7 @@ impl BoxFragment {
_ => return None,
};
let border_rect = self
.border_rect()
.to_physical(self.style.writing_mode, containing_block_rect);
let border_rect = self.border_rect();
let clip_rect = clip_rect
.for_border_rect(border_rect)
.translate(containing_block_rect.origin.to_vector())
@ -1306,7 +1302,6 @@ impl BoxFragment {
let padding_rect = self
.padding_rect()
.to_physical(self.style.writing_mode, containing_block_rect)
.translate(containing_block_rect.origin.to_vector())
.to_webrender();
@ -1314,8 +1309,7 @@ impl BoxFragment {
parent_scroll_node_id,
parent_clip_id,
external_id,
self.scrollable_overflow(containing_block_rect)
.to_webrender(),
self.scrollable_overflow().to_webrender(),
padding_rect,
sensitivity,
);
@ -1380,7 +1374,6 @@ impl BoxFragment {
let frame_rect = self
.border_rect()
.to_physical(self.style.writing_mode, containing_block_rect)
.translate(containing_block_rect.origin.to_vector())
.to_webrender();
@ -1426,9 +1419,7 @@ impl BoxFragment {
return None;
}
let relative_border_rect = self
.border_rect()
.to_physical(self.style.writing_mode, containing_block_rect);
let relative_border_rect = self.border_rect();
let border_rect = relative_border_rect.translate(containing_block_rect.origin.to_vector());
let untyped_border_rect = border_rect.to_untyped();
@ -1560,7 +1551,6 @@ impl PositioningFragment {
) {
let rect = self
.rect
.to_physical(self.writing_mode, &containing_block.rect)
.translate(containing_block.rect.origin.to_vector());
let new_containing_block = containing_block.new_replacing_rect(&rect);
let new_containing_block_info =