Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-09-30 00:29:14 +01:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Include the scrollable overflow of a child box if either its parent or child has overflow: visible (#38443)" (#38546)

Browse source 
This reverts commit dcb90bb85e.

This broke scrollable overflow calculation in the following case:

```
<div id="foo" style="width: 200px; height: 200px; outline: solid; overflow: auto;">
    <div style="height: 5000px; background: pink;">hello</div>
</div>
```

In this case the overflow is propagating through the `overflow: auto`
`<div>` and into the parents. When dumping the flow tree I see the root
node being 5000 pixels tall. It's unclear why this change didn't break
any tests, so it's likely that we need to add a test for this case.

Signed-off-by: Martin Robinson <mrobinson@igalia.com>
This commit is contained in:
Martin Robinson 2025-08-08 15:37:14 +02:00 • committed by GitHub
parent 5c307a38df
commit 4257db643b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 55 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

47
components/layout/fragment_tree/box_fragment.rs
View file

@ -24,7 +24,7 @@ use crate::formatting_contexts::Baselines;
use crate::geom::{
AuOrAuto, LengthPercentageOrAuto, PhysicalPoint, PhysicalRect, PhysicalSides, ToLogical,
};
use crate::style_ext::{AxesOverflow, ComputedValuesExt};
use crate::style_ext::ComputedValuesExt;
use crate::table::SpecificTableGridInfo;
use crate::taffy::SpecificTaffyGridInfo;
@ -271,13 +271,12 @@ impl BoxFragment {
// overflow together, but from the specification it seems that if the border
// box of an item is in the "wholly unreachable scrollable overflow region", but
// its scrollable overflow is not, it should also be excluded.
let overflow_style = self.style.effective_overflow(self.base.flags);
let scrollable_overflow = self
.children
.iter()
.fold(physical_padding_rect, |acc, child| {
let scrollable_overflow_from_child = child
.calculate_scrollable_overflow_for_parent(Some(overflow_style))
.calculate_scrollable_overflow_for_parent()
.translate(content_origin);
// Note that this doesn't just exclude scrollable overflow outside the
@ -360,33 +359,27 @@ impl BoxFragment {
tree.end_level();
}
pub(crate) fn scrollable_overflow_for_parent(
&self,
parent_overflow_style: Option<AxesOverflow>,
) -> PhysicalRect<Au> {
pub(crate) fn scrollable_overflow_for_parent(&self) -> PhysicalRect<Au> {
let mut overflow = self.border_rect();
let overflow_style = self.style.effective_overflow(self.base.flags);
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.establishes_scroll_container(self.base.flags) {
// 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()),
);
// https://www.w3.org/TR/css-overflow-3/#scrollable
// For each axis, we only include the scrollable overflow of a child box
// if either its parent or child has overflow: visible.
if parent_overflow_style.is_some_and(|style| style.y == ComputedOverflow::Visible) ||
overflow_style.y == ComputedOverflow::Visible
{
overflow.origin.y = overflow.origin.y.min(scrollable_overflow.origin.y);
overflow.size.height = bottom_right.y - overflow.origin.y;
}
let overflow_style = self.style.effective_overflow(self.base.flags);
if overflow_style.y == ComputedOverflow::Visible {
overflow.origin.y = overflow.origin.y.min(scrollable_overflow.origin.y);
overflow.size.height = bottom_right.y - overflow.origin.y;
}
if parent_overflow_style.is_some_and(|style| style.x == ComputedOverflow::Visible) ||
overflow_style.x == ComputedOverflow::Visible
{
overflow.origin.x = overflow.origin.x.min(scrollable_overflow.origin.x);
overflow.size.width = bottom_right.x - overflow.origin.x;
if overflow_style.x == ComputedOverflow::Visible {
overflow.origin.x = overflow.origin.x.min(scrollable_overflow.origin.x);
overflow.size.width = bottom_right.x - overflow.origin.x;
}
}
if !self