Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

layout: Improve style conversion for Taffy (#36311)

Browse source 
This imports the following changes from Blitz:
- Map position:sticky to relative rather than absolute position
16a7c16544
- Map left and right alignment from Stylo
c71cc681d8
- Improve mapping of align-items/self
7bf2a25e75

Fixes: #35998

Testing:
-
`/css/css-grid/alignment/grid-align-justify-margin-border-padding.html`
- `/css/css-grid/alignment/grid-align.html`
-
`/css/css-grid/alignment/grid-column-axis-alignment-sticky-positioned-items-001.html`
- `/css/css-grid/alignment/grid-gutters-and-alignment.html`
-
`/css/css-grid/alignment/grid-item-alignment-with-orthogonal-flows.html`
-
`/css/css-grid/alignment/grid-row-axis-alignment-sticky-positioned-items-001.html`
- `/css/css-grid/alignment/grid-self-alignment.html`

Signed-off-by: Oriol Brufau <obrufau@igalia.com>
This commit is contained in:
Oriol Brufau 2025-04-03 08:47:56 -07:00 • committed by GitHub
parent 0e99539dab
commit 9d6e1f67fb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 26 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/layout_2020/taffy/stylo_taffy/convert.rs
View file

@ -138,7 +138,7 @@ pub fn position(input: stylo::Position) -> taffy::Position {
// TODO: support position:fixed and sticky
stylo::Position::Absolute => taffy::Position::Absolute,
stylo::Position::Fixed => taffy::Position::Absolute,
stylo::Position::Sticky => taffy::Position::Absolute,
stylo::Position::Sticky => taffy::Position::Relative,
}
}
@ -170,6 +170,8 @@ pub fn content_alignment(input: stylo::ContentDistribution) -> Option<taffy::Ali
stylo::AlignFlags::AUTO => None,
stylo::AlignFlags::START => Some(taffy::AlignContent::Start),
stylo::AlignFlags::END => Some(taffy::AlignContent::End),
stylo::AlignFlags::LEFT => Some(taffy::AlignContent::Start),
stylo::AlignFlags::RIGHT => Some(taffy::AlignContent::End),
stylo::AlignFlags::FLEX_START => Some(taffy::AlignContent::FlexStart),
stylo::AlignFlags::STRETCH => Some(taffy::AlignContent::Stretch),
stylo::AlignFlags::FLEX_END => Some(taffy::AlignContent::FlexEnd),
@ -185,13 +187,17 @@ pub fn content_alignment(input: stylo::ContentDistribution) -> Option<taffy::Ali
#[inline]
pub fn item_alignment(input: stylo::AlignFlags) -> Option<taffy::AlignItems> {
match input.value() {
stylo::AlignFlags::NORMAL => None,
stylo::AlignFlags::AUTO => None,
stylo::AlignFlags::NORMAL => Some(taffy::AlignItems::Stretch),
stylo::AlignFlags::STRETCH => Some(taffy::AlignItems::Stretch),
stylo::AlignFlags::FLEX_START => Some(taffy::AlignItems::FlexStart),
stylo::AlignFlags::FLEX_END => Some(taffy::AlignItems::FlexEnd),
stylo::AlignFlags::SELF_START => Some(taffy::AlignItems::Start),
stylo::AlignFlags::SELF_END => Some(taffy::AlignItems::End),
stylo::AlignFlags::START => Some(taffy::AlignItems::Start),
stylo::AlignFlags::END => Some(taffy::AlignItems::End),
stylo::AlignFlags::LEFT => Some(taffy::AlignItems::Start),
stylo::AlignFlags::RIGHT => Some(taffy::AlignItems::End),
stylo::AlignFlags::CENTER => Some(taffy::AlignItems::Center),
stylo::AlignFlags::BASELINE => Some(taffy::AlignItems::Baseline),
// Should never be hit. But no real reason to panic here.

6
tests/wpt/meta/css/css-grid/alignment/grid-align-justify-margin-border-padding.html.ini vendored
View file

@ -1,16 +1,10 @@
[grid-align-justify-margin-border-padding.html]
[.grid 5]
expected: FAIL
[.grid 6]
expected: FAIL
[.grid 7]
expected: FAIL
[.grid 9]
expected: FAIL
[.grid 10]
expected: FAIL

9
tests/wpt/meta/css/css-grid/alignment/grid-align.html.ini vendored
View file

@ -1,19 +1,10 @@
[grid-align.html]
[.grid 2]
expected: FAIL
[.grid 3]
expected: FAIL
[.grid 5]
expected: FAIL
[.grid 6]
expected: FAIL
[.grid 8]
expected: FAIL
[.grid 9]
expected: FAIL

6
tests/wpt/meta/css/css-grid/alignment/grid-column-axis-alignment-sticky-positioned-items-001.html.ini vendored
View file

@ -1,6 +0,0 @@
[grid-column-axis-alignment-sticky-positioned-items-001.html]
[.grid 1]
expected: FAIL
[.grid 2]
expected: FAIL

3
tests/wpt/meta/css/css-grid/alignment/grid-gutters-and-alignment.html.ini vendored
View file

@ -1,7 +1,4 @@
[grid-gutters-and-alignment.html]
[.grid 1]
expected: FAIL
[.grid 2]
expected: FAIL

3
tests/wpt/meta/css/css-grid/alignment/grid-item-alignment-with-orthogonal-flows.html.ini vendored
View file

@ -11,9 +11,6 @@
[.grid 4]
expected: FAIL
[.grid 5]
expected: FAIL
[.grid 6]
expected: FAIL

6
tests/wpt/meta/css/css-grid/alignment/grid-row-axis-alignment-sticky-positioned-items-001.html.ini vendored
View file

@ -1,6 +0,0 @@
[grid-row-axis-alignment-sticky-positioned-items-001.html]
[.grid 1]
expected: FAIL
[.grid 2]
expected: FAIL

54
tests/wpt/meta/css/css-grid/alignment/grid-self-alignment.html.ini vendored
View file

@ -1,16 +1,10 @@
[grid-self-alignment.html]
[.child 2]
expected: FAIL
[.child 3]
expected: FAIL
[.child 4]
expected: FAIL
[.child 6]
expected: FAIL
[.child 7]
expected: FAIL
@ -26,15 +20,9 @@
[.child 11]
expected: FAIL
[.child 14]
expected: FAIL
[.child 16]
expected: FAIL
[.child 18]
expected: FAIL
[.child 19]
expected: FAIL
@ -44,18 +32,12 @@
[.child 23]
expected: FAIL
[.child 26]
expected: FAIL
[.child 27]
expected: FAIL
[.child 28]
expected: FAIL
[.child 30]
expected: FAIL
[.child 31]
expected: FAIL
@ -71,15 +53,9 @@
[.child 35]
expected: FAIL
[.child 38]
expected: FAIL
[.child 40]
expected: FAIL
[.child 42]
expected: FAIL
[.child 43]
expected: FAIL
@ -89,18 +65,12 @@
[.child 47]
expected: FAIL
[.child 50]
expected: FAIL
[.child 51]
expected: FAIL
[.child 52]
expected: FAIL
[.child 54]
expected: FAIL
[.child 55]
expected: FAIL
@ -116,15 +86,9 @@
[.child 59]
expected: FAIL
[.child 62]
expected: FAIL
[.child 64]
expected: FAIL
[.child 66]
expected: FAIL
[.child 67]
expected: FAIL
@ -160,3 +124,21 @@
[.child 69]
expected: FAIL
[.child 12]
expected: FAIL
[.child 24]
expected: FAIL
[.child 36]
expected: FAIL
[.child 48]
expected: FAIL
[.child 60]
expected: FAIL
[.child 72]
expected: FAIL