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: Use Size::FitContent when the alignment isn't normal or stretch for absolutely positioned elements (#34264)

Browse source 
* layout: Use Size::FitContent when the alignment isn't normal or stretch

Signed-off-by: taniishkaaa <tanishkasingh2004@gmail.com>

* Use unwrap_or_default()

Signed-off-by: taniishkaaa <tanishkasingh2004@gmail.com>

* Use self.alignment.value()

Signed-off-by: taniishkaaa <tanishkasingh2004@gmail.com>

* Refactor used_size to handle non-definite sizes

Signed-off-by: taniishkaaa <tanishkasingh2004@gmail.com>

* Include AlignFlags::Auto

Signed-off-by: taniishkaaa <tanishkasingh2004@gmail.com>

* Update test expectations

Signed-off-by: taniishkaaa <tanishkasingh2004@gmail.com>

---------

Signed-off-by: taniishkaaa <tanishkasingh2004@gmail.com>
This commit is contained in:
tanishka 2024-11-18 20:36:23 +05:30 • committed by GitHub
parent 997b6411c0
commit 11dfbd6f90
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
25 changed files with 23 additions and 593 deletions
Download patch file Download diff file Expand all files Collapse all files

16
components/layout_2020/positioned.rs
View file

@ -846,10 +846,16 @@ impl<'a> AbsoluteAxisSolver<'a> {
let stretch_size = free_space - let stretch_size = free_space -
self.computed_margin_start.auto_is(Au::zero) - self.computed_margin_start.auto_is(Au::zero) -
self.computed_margin_end.auto_is(Au::zero); self.computed_margin_end.auto_is(Au::zero);
let used_size = solve_size(Size::Stretch, stretch_size) let initial_behavior = match self.alignment.value() {
.to_definite() AlignFlags::STRETCH | AlignFlags::NORMAL | AlignFlags::AUTO => Size::Stretch,
.unwrap(); _ => Size::FitContent,
free_space -= used_size; };
let size = solve_size(initial_behavior, stretch_size);
if let Some(used_size) = size.to_definite() {
free_space -= used_size;
} else {
free_space = Au::zero();
}
let (margin_start, margin_end) = let (margin_start, margin_end) =
match (self.computed_margin_start, self.computed_margin_end) { match (self.computed_margin_start, self.computed_margin_end) {
(AuOrAuto::Auto, AuOrAuto::Auto) => { (AuOrAuto::Auto, AuOrAuto::Auto) => {
@ -872,7 +878,7 @@ impl<'a> AbsoluteAxisSolver<'a> {
}; };
AxisResult { AxisResult {
anchor: Anchor::Start(start), anchor: Anchor::Start(start),
size: SizeConstraint::Definite(used_size), size,
margin_start, margin_start,
margin_end, margin_end,
} }

22
tests/wpt/meta/css/css-align/abspos/align-self-default-overflow-htb-ltr-htb.html.ini vendored
View file

@ -1,36 +1,18 @@
[align-self-default-overflow-htb-ltr-htb.html] [align-self-default-overflow-htb-ltr-htb.html]
[.item 1]
expected: FAIL
[.item 2]
expected: FAIL
[.item 3] [.item 3]
expected: FAIL expected: FAIL
[.item 4] [.item 4]
expected: FAIL expected: FAIL
[.item 5]
expected: FAIL
[.item 6]
expected: FAIL
[.item 8]
expected: FAIL
[.item 9]
expected: FAIL
[.item 10] [.item 10]
expected: FAIL expected: FAIL
[.item 11] [.item 11]
expected: FAIL expected: FAIL
[.item 12] [.item 7]
expected: FAIL expected: FAIL
[.item 13] [.item 14]
expected: FAIL expected: FAIL

22
tests/wpt/meta/css/css-align/abspos/align-self-default-overflow-htb-ltr-vrl.html.ini vendored
View file

@ -1,36 +1,18 @@
[align-self-default-overflow-htb-ltr-vrl.html] [align-self-default-overflow-htb-ltr-vrl.html]
[.item 1]
expected: FAIL
[.item 2]
expected: FAIL
[.item 3] [.item 3]
expected: FAIL expected: FAIL
[.item 4] [.item 4]
expected: FAIL expected: FAIL
[.item 5]
expected: FAIL
[.item 6]
expected: FAIL
[.item 8]
expected: FAIL
[.item 9]
expected: FAIL
[.item 10] [.item 10]
expected: FAIL expected: FAIL
[.item 11] [.item 11]
expected: FAIL expected: FAIL
[.item 12] [.item 7]
expected: FAIL expected: FAIL
[.item 13] [.item 14]
expected: FAIL expected: FAIL

22
tests/wpt/meta/css/css-align/abspos/align-self-default-overflow-htb-rtl-htb.html.ini vendored
View file

@ -1,36 +1,18 @@
[align-self-default-overflow-htb-rtl-htb.html] [align-self-default-overflow-htb-rtl-htb.html]
[.item 1]
expected: FAIL
[.item 2]
expected: FAIL
[.item 3] [.item 3]
expected: FAIL expected: FAIL
[.item 4] [.item 4]
expected: FAIL expected: FAIL
[.item 5]
expected: FAIL
[.item 6]
expected: FAIL
[.item 8]
expected: FAIL
[.item 9]
expected: FAIL
[.item 10] [.item 10]
expected: FAIL expected: FAIL
[.item 11] [.item 11]
expected: FAIL expected: FAIL
[.item 12] [.item 7]
expected: FAIL expected: FAIL
[.item 13] [.item 14]
expected: FAIL expected: FAIL

22
tests/wpt/meta/css/css-align/abspos/align-self-default-overflow-htb-rtl-vrl.html.ini vendored
View file

@ -1,36 +1,18 @@
[align-self-default-overflow-htb-rtl-vrl.html] [align-self-default-overflow-htb-rtl-vrl.html]
[.item 1]
expected: FAIL
[.item 2]
expected: FAIL
[.item 3] [.item 3]
expected: FAIL expected: FAIL
[.item 4] [.item 4]
expected: FAIL expected: FAIL
[.item 5]
expected: FAIL
[.item 6]
expected: FAIL
[.item 8]
expected: FAIL
[.item 9]
expected: FAIL
[.item 10] [.item 10]
expected: FAIL expected: FAIL
[.item 11] [.item 11]
expected: FAIL expected: FAIL
[.item 12] [.item 7]
expected: FAIL expected: FAIL
[.item 13] [.item 14]
expected: FAIL expected: FAIL

30
tests/wpt/meta/css/css-align/abspos/align-self-htb-ltr-htb.html.ini vendored
View file

@ -1,42 +1,12 @@
[align-self-htb-ltr-htb.html] [align-self-htb-ltr-htb.html]
[.item 1]
expected: FAIL
[.item 2]
expected: FAIL
[.item 3]
expected: FAIL
[.item 4]
expected: FAIL
[.item 5] [.item 5]
expected: FAIL expected: FAIL
[.item 6]
expected: FAIL
[.item 7] [.item 7]
expected: FAIL expected: FAIL
[.item 9]
expected: FAIL
[.item 10]
expected: FAIL
[.item 11]
expected: FAIL
[.item 12]
expected: FAIL
[.item 13] [.item 13]
expected: FAIL expected: FAIL
[.item 14]
expected: FAIL
[.item 15] [.item 15]
expected: FAIL expected: FAIL

30
tests/wpt/meta/css/css-align/abspos/align-self-htb-ltr-vlr.html.ini vendored
View file

@ -1,42 +1,12 @@
[align-self-htb-ltr-vlr.html] [align-self-htb-ltr-vlr.html]
[.item 1]
expected: FAIL
[.item 2]
expected: FAIL
[.item 3]
expected: FAIL
[.item 4]
expected: FAIL
[.item 5] [.item 5]
expected: FAIL expected: FAIL
[.item 6]
expected: FAIL
[.item 7] [.item 7]
expected: FAIL expected: FAIL
[.item 9]
expected: FAIL
[.item 10]
expected: FAIL
[.item 11]
expected: FAIL
[.item 12]
expected: FAIL
[.item 13] [.item 13]
expected: FAIL expected: FAIL
[.item 14] [.item 14]
expected: FAIL expected: FAIL
[.item 15]
expected: FAIL

30
tests/wpt/meta/css/css-align/abspos/align-self-htb-ltr-vrl.html.ini vendored
View file

@ -1,42 +1,12 @@
[align-self-htb-ltr-vrl.html] [align-self-htb-ltr-vrl.html]
[.item 1]
expected: FAIL
[.item 2]
expected: FAIL
[.item 3]
expected: FAIL
[.item 4]
expected: FAIL
[.item 5] [.item 5]
expected: FAIL expected: FAIL
[.item 6]
expected: FAIL
[.item 7] [.item 7]
expected: FAIL expected: FAIL
[.item 9]
expected: FAIL
[.item 10]
expected: FAIL
[.item 11]
expected: FAIL
[.item 12]
expected: FAIL
[.item 13] [.item 13]
expected: FAIL expected: FAIL
[.item 14] [.item 14]
expected: FAIL expected: FAIL
[.item 15]
expected: FAIL

30
tests/wpt/meta/css/css-align/abspos/align-self-htb-rtl-htb.html.ini vendored
View file

@ -1,42 +1,12 @@
[align-self-htb-rtl-htb.html] [align-self-htb-rtl-htb.html]
[.item 1]
expected: FAIL
[.item 2]
expected: FAIL
[.item 3]
expected: FAIL
[.item 4]
expected: FAIL
[.item 5] [.item 5]
expected: FAIL expected: FAIL
[.item 6]
expected: FAIL
[.item 7] [.item 7]
expected: FAIL expected: FAIL
[.item 9]
expected: FAIL
[.item 10]
expected: FAIL
[.item 11]
expected: FAIL
[.item 12]
expected: FAIL
[.item 13] [.item 13]
expected: FAIL expected: FAIL
[.item 14]
expected: FAIL
[.item 15] [.item 15]
expected: FAIL expected: FAIL

30
tests/wpt/meta/css/css-align/abspos/align-self-htb-rtl-vlr.html.ini vendored
View file

@ -1,42 +1,12 @@
[align-self-htb-rtl-vlr.html] [align-self-htb-rtl-vlr.html]
[.item 1]
expected: FAIL
[.item 2]
expected: FAIL
[.item 3]
expected: FAIL
[.item 4]
expected: FAIL
[.item 5] [.item 5]
expected: FAIL expected: FAIL
[.item 6]
expected: FAIL
[.item 7] [.item 7]
expected: FAIL expected: FAIL
[.item 9]
expected: FAIL
[.item 10]
expected: FAIL
[.item 11]
expected: FAIL
[.item 12]
expected: FAIL
[.item 13] [.item 13]
expected: FAIL expected: FAIL
[.item 14] [.item 14]
expected: FAIL expected: FAIL
[.item 15]
expected: FAIL

30
tests/wpt/meta/css/css-align/abspos/align-self-htb-rtl-vrl.html.ini vendored
View file

@ -1,42 +1,12 @@
[align-self-htb-rtl-vrl.html] [align-self-htb-rtl-vrl.html]
[.item 1]
expected: FAIL
[.item 2]
expected: FAIL
[.item 3]
expected: FAIL
[.item 4]
expected: FAIL
[.item 5] [.item 5]
expected: FAIL expected: FAIL
[.item 6]
expected: FAIL
[.item 7] [.item 7]
expected: FAIL expected: FAIL
[.item 9]
expected: FAIL
[.item 10]
expected: FAIL
[.item 11]
expected: FAIL
[.item 12]
expected: FAIL
[.item 13] [.item 13]
expected: FAIL expected: FAIL
[.item 14] [.item 14]
expected: FAIL expected: FAIL
[.item 15]
expected: FAIL

22
tests/wpt/meta/css/css-align/abspos/justify-self-default-overflow-htb-ltr-htb.html.ini vendored
View file

@ -1,36 +1,18 @@
[justify-self-default-overflow-htb-ltr-htb.html] [justify-self-default-overflow-htb-ltr-htb.html]
[.item 1]
expected: FAIL
[.item 2]
expected: FAIL
[.item 3] [.item 3]
expected: FAIL expected: FAIL
[.item 4] [.item 4]
expected: FAIL expected: FAIL
[.item 5]
expected: FAIL
[.item 6]
expected: FAIL
[.item 8]
expected: FAIL
[.item 9]
expected: FAIL
[.item 10] [.item 10]
expected: FAIL expected: FAIL
[.item 11] [.item 11]
expected: FAIL expected: FAIL
[.item 12] [.item 7]
expected: FAIL expected: FAIL
[.item 13] [.item 14]
expected: FAIL expected: FAIL

22
tests/wpt/meta/css/css-align/abspos/justify-self-default-overflow-htb-ltr-vrl.html.ini vendored
View file

@ -1,36 +1,18 @@
[justify-self-default-overflow-htb-ltr-vrl.html] [justify-self-default-overflow-htb-ltr-vrl.html]
[.item 1]
expected: FAIL
[.item 2]
expected: FAIL
[.item 3] [.item 3]
expected: FAIL expected: FAIL
[.item 4] [.item 4]
expected: FAIL expected: FAIL
[.item 5]
expected: FAIL
[.item 6]
expected: FAIL
[.item 8]
expected: FAIL
[.item 9]
expected: FAIL
[.item 10] [.item 10]
expected: FAIL expected: FAIL
[.item 11] [.item 11]
expected: FAIL expected: FAIL
[.item 12] [.item 7]
expected: FAIL expected: FAIL
[.item 13] [.item 14]
expected: FAIL expected: FAIL

24
tests/wpt/meta/css/css-align/abspos/justify-self-default-overflow-htb-rtl-htb.html.ini vendored
View file

@ -1,42 +1,18 @@
[justify-self-default-overflow-htb-rtl-htb.html] [justify-self-default-overflow-htb-rtl-htb.html]
[.item 1]
expected: FAIL
[.item 2]
expected: FAIL
[.item 3] [.item 3]
expected: FAIL expected: FAIL
[.item 4] [.item 4]
expected: FAIL expected: FAIL
[.item 5]
expected: FAIL
[.item 6]
expected: FAIL
[.item 7] [.item 7]
expected: FAIL expected: FAIL
[.item 8]
expected: FAIL
[.item 9]
expected: FAIL
[.item 10] [.item 10]
expected: FAIL expected: FAIL
[.item 11] [.item 11]
expected: FAIL expected: FAIL
[.item 12]
expected: FAIL
[.item 13]
expected: FAIL
[.item 14] [.item 14]
expected: FAIL expected: FAIL

24
tests/wpt/meta/css/css-align/abspos/justify-self-default-overflow-htb-rtl-vrl.html.ini vendored
View file

@ -1,42 +1,18 @@
[justify-self-default-overflow-htb-rtl-vrl.html] [justify-self-default-overflow-htb-rtl-vrl.html]
[.item 1]
expected: FAIL
[.item 2]
expected: FAIL
[.item 3] [.item 3]
expected: FAIL expected: FAIL
[.item 4] [.item 4]
expected: FAIL expected: FAIL
[.item 5]
expected: FAIL
[.item 6]
expected: FAIL
[.item 7] [.item 7]
expected: FAIL expected: FAIL
[.item 8]
expected: FAIL
[.item 9]
expected: FAIL
[.item 10] [.item 10]
expected: FAIL expected: FAIL
[.item 11] [.item 11]
expected: FAIL expected: FAIL
[.item 12]
expected: FAIL
[.item 13]
expected: FAIL
[.item 14] [.item 14]
expected: FAIL expected: FAIL

36
tests/wpt/meta/css/css-align/abspos/justify-self-htb-ltr-htb.html.ini vendored
View file

@ -1,54 +1,18 @@
[justify-self-htb-ltr-htb.html] [justify-self-htb-ltr-htb.html]
[.item 1]
expected: FAIL
[.item 2]
expected: FAIL
[.item 3]
expected: FAIL
[.item 4]
expected: FAIL
[.item 5] [.item 5]
expected: FAIL expected: FAIL
[.item 6]
expected: FAIL
[.item 7] [.item 7]
expected: FAIL expected: FAIL
[.item 8]
expected: FAIL
[.item 9] [.item 9]
expected: FAIL expected: FAIL
[.item 11]
expected: FAIL
[.item 12]
expected: FAIL
[.item 13]
expected: FAIL
[.item 14]
expected: FAIL
[.item 15] [.item 15]
expected: FAIL expected: FAIL
[.item 16] [.item 16]
expected: FAIL expected: FAIL
[.item 17]
expected: FAIL
[.item 18]
expected: FAIL
[.item 19] [.item 19]
expected: FAIL expected: FAIL

36
tests/wpt/meta/css/css-align/abspos/justify-self-htb-ltr-vlr.html.ini vendored
View file

@ -1,54 +1,18 @@
[justify-self-htb-ltr-vlr.html] [justify-self-htb-ltr-vlr.html]
[.item 1]
expected: FAIL
[.item 2]
expected: FAIL
[.item 3]
expected: FAIL
[.item 4]
expected: FAIL
[.item 5] [.item 5]
expected: FAIL expected: FAIL
[.item 6]
expected: FAIL
[.item 7] [.item 7]
expected: FAIL expected: FAIL
[.item 8]
expected: FAIL
[.item 9] [.item 9]
expected: FAIL expected: FAIL
[.item 11]
expected: FAIL
[.item 12]
expected: FAIL
[.item 13]
expected: FAIL
[.item 14]
expected: FAIL
[.item 15] [.item 15]
expected: FAIL expected: FAIL
[.item 16]
expected: FAIL
[.item 17] [.item 17]
expected: FAIL expected: FAIL
[.item 18]
expected: FAIL
[.item 19] [.item 19]
expected: FAIL expected: FAIL

36
tests/wpt/meta/css/css-align/abspos/justify-self-htb-ltr-vrl.html.ini vendored
View file

@ -1,54 +1,18 @@
[justify-self-htb-ltr-vrl.html] [justify-self-htb-ltr-vrl.html]
[.item 1]
expected: FAIL
[.item 2]
expected: FAIL
[.item 3]
expected: FAIL
[.item 4]
expected: FAIL
[.item 5] [.item 5]
expected: FAIL expected: FAIL
[.item 6] [.item 6]
expected: FAIL expected: FAIL
[.item 7]
expected: FAIL
[.item 8]
expected: FAIL
[.item 9] [.item 9]
expected: FAIL expected: FAIL
[.item 11]
expected: FAIL
[.item 12]
expected: FAIL
[.item 13]
expected: FAIL
[.item 14]
expected: FAIL
[.item 15] [.item 15]
expected: FAIL expected: FAIL
[.item 16] [.item 16]
expected: FAIL expected: FAIL
[.item 17]
expected: FAIL
[.item 18]
expected: FAIL
[.item 19] [.item 19]
expected: FAIL expected: FAIL

36
tests/wpt/meta/css/css-align/abspos/justify-self-htb-rtl-htb.html.ini vendored
View file

@ -1,54 +1,18 @@
[justify-self-htb-rtl-htb.html] [justify-self-htb-rtl-htb.html]
[.item 1]
expected: FAIL
[.item 2]
expected: FAIL
[.item 3]
expected: FAIL
[.item 4]
expected: FAIL
[.item 5] [.item 5]
expected: FAIL expected: FAIL
[.item 6] [.item 6]
expected: FAIL expected: FAIL
[.item 7]
expected: FAIL
[.item 8] [.item 8]
expected: FAIL expected: FAIL
[.item 9]
expected: FAIL
[.item 11]
expected: FAIL
[.item 12]
expected: FAIL
[.item 13]
expected: FAIL
[.item 14]
expected: FAIL
[.item 15] [.item 15]
expected: FAIL expected: FAIL
[.item 16]
expected: FAIL
[.item 17] [.item 17]
expected: FAIL expected: FAIL
[.item 18] [.item 18]
expected: FAIL expected: FAIL
[.item 19]
expected: FAIL

36
tests/wpt/meta/css/css-align/abspos/justify-self-htb-rtl-vlr.html.ini vendored
View file

@ -1,54 +1,18 @@
[justify-self-htb-rtl-vlr.html] [justify-self-htb-rtl-vlr.html]
[.item 1]
expected: FAIL
[.item 2]
expected: FAIL
[.item 3]
expected: FAIL
[.item 4]
expected: FAIL
[.item 5] [.item 5]
expected: FAIL expected: FAIL
[.item 6] [.item 6]
expected: FAIL expected: FAIL
[.item 7]
expected: FAIL
[.item 8] [.item 8]
expected: FAIL expected: FAIL
[.item 9]
expected: FAIL
[.item 11]
expected: FAIL
[.item 12]
expected: FAIL
[.item 13]
expected: FAIL
[.item 14]
expected: FAIL
[.item 15] [.item 15]
expected: FAIL expected: FAIL
[.item 16] [.item 16]
expected: FAIL expected: FAIL
[.item 17]
expected: FAIL
[.item 18] [.item 18]
expected: FAIL expected: FAIL
[.item 19]
expected: FAIL

36
tests/wpt/meta/css/css-align/abspos/justify-self-htb-rtl-vrl.html.ini vendored
View file

@ -1,54 +1,18 @@
[justify-self-htb-rtl-vrl.html] [justify-self-htb-rtl-vrl.html]
[.item 1]
expected: FAIL
[.item 2]
expected: FAIL
[.item 3]
expected: FAIL
[.item 4]
expected: FAIL
[.item 5] [.item 5]
expected: FAIL expected: FAIL
[.item 6]
expected: FAIL
[.item 7] [.item 7]
expected: FAIL expected: FAIL
[.item 8] [.item 8]
expected: FAIL expected: FAIL
[.item 9]
expected: FAIL
[.item 11]
expected: FAIL
[.item 12]
expected: FAIL
[.item 13]
expected: FAIL
[.item 14]
expected: FAIL
[.item 15] [.item 15]
expected: FAIL expected: FAIL
[.item 16]
expected: FAIL
[.item 17] [.item 17]
expected: FAIL expected: FAIL
[.item 18] [.item 18]
expected: FAIL expected: FAIL
[.item 19]
expected: FAIL

6
tests/wpt/meta/css/css-align/abspos/stretch-intrinsic-size-htb-htb.html.ini vendored
View file

@ -1,16 +1,10 @@
[stretch-intrinsic-size-htb-htb.html] [stretch-intrinsic-size-htb-htb.html]
[.item 1]
expected: FAIL
[.item 2] [.item 2]
expected: FAIL expected: FAIL
[.item 3] [.item 3]
expected: FAIL expected: FAIL
[.item 5]
expected: FAIL
[.item 6] [.item 6]
expected: FAIL expected: FAIL

6
tests/wpt/meta/css/css-align/abspos/stretch-intrinsic-size-htb-vrl.html.ini vendored
View file

@ -1,16 +1,10 @@
[stretch-intrinsic-size-htb-vrl.html] [stretch-intrinsic-size-htb-vrl.html]
[.item 1]
expected: FAIL
[.item 2] [.item 2]
expected: FAIL expected: FAIL
[.item 3] [.item 3]
expected: FAIL expected: FAIL
[.item 5]
expected: FAIL
[.item 6] [.item 6]
expected: FAIL expected: FAIL

6
tests/wpt/meta/css/css-align/abspos/stretch-intrinsic-size-vrl-htb.html.ini vendored
View file

@ -1,16 +1,10 @@
[stretch-intrinsic-size-vrl-htb.html] [stretch-intrinsic-size-vrl-htb.html]
[.item 1]
expected: FAIL
[.item 2] [.item 2]
expected: FAIL expected: FAIL
[.item 3] [.item 3]
expected: FAIL expected: FAIL
[.item 5]
expected: FAIL
[.item 6] [.item 6]
expected: FAIL expected: FAIL

6
tests/wpt/meta/css/css-align/abspos/stretch-intrinsic-size-vrl-vrl.html.ini vendored
View file

@ -1,16 +1,10 @@
[stretch-intrinsic-size-vrl-vrl.html] [stretch-intrinsic-size-vrl-vrl.html]
[.item 1]
expected: FAIL
[.item 2] [.item 2]
expected: FAIL expected: FAIL
[.item 3] [.item 3]
expected: FAIL expected: FAIL
[.item 5]
expected: FAIL
[.item 6] [.item 6]
expected: FAIL expected: FAIL