From 6914c51195d072bc947fcddf0b7e6d0419730691 Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Mon, 20 Jul 2020 11:57:51 -0700 Subject: [PATCH 1/7] Handle flex item box sizing and minmax for flexbox in 2020 --- components/layout_2020/flexbox/layout.rs | 13 ++++++++++++- .../css/css-flexbox/align-content-002.htm.ini | 2 -- .../css-flexbox/align-content_flex-start.html.ini | 2 -- .../css/css-flexbox/align-items-002.htm.ini | 2 -- .../css/css-flexbox/align-self-001.html.ini | 2 -- .../css/css-flexbox/align-self-007.html.ini | 2 -- .../css/css-flexbox/align-self-013.html.ini | 2 -- .../dynamic-change-simplified-layout-002.html.ini | 2 -- .../css/css-flexbox/fit-content-item-002.html.ini | 2 -- .../css/css-flexbox/fit-content-item-003.html.ini | 2 -- .../css/css-flexbox/fit-content-item-004.html.ini | 2 -- .../css/css-flexbox/flex-001.htm.ini | 2 -- .../css/css-flexbox/flex-002.htm.ini | 2 -- .../css/css-flexbox/flex-003.htm.ini | 2 -- .../css/css-flexbox/flex-004.htm.ini | 2 -- .../css/css-flexbox/flex-basis-001.html.ini | 2 -- .../css/css-flexbox/flex-basis-002.html.ini | 2 -- .../css/css-flexbox/flex-basis-003.html.ini | 2 -- .../css/css-flexbox/flex-basis-004.html.ini | 2 -- .../css/css-flexbox/flex-basis-007.html.ini | 2 -- .../css/css-flexbox/flex-basis-008.html.ini | 2 -- .../css/css-flexbox/flex-box-wrap.html.ini | 2 -- .../css/css-flexbox/flex-container-margin.html.ini | 2 -- .../css/css-flexbox/flex-flow-002.html.ini | 2 -- .../css/css-flexbox/flex-flow-003.html.ini | 2 -- .../css/css-flexbox/flex-flow-005.html.ini | 2 -- .../css/css-flexbox/flex-flow-006.html.ini | 2 -- .../css/css-flexbox/flex-grow-002.html.ini | 2 -- .../css/css-flexbox/flex-grow-004.html.ini | 2 -- .../css/css-flexbox/flex-grow-006.html.ini | 2 -- .../css/css-flexbox/flex-grow-007.html.ini | 2 -- .../css/css-flexbox/flex-shrink-001.html.ini | 2 -- .../css/css-flexbox/flex-shrink-002.html.ini | 2 -- .../css/css-flexbox/flex-shrink-003.html.ini | 2 -- .../css/css-flexbox/flex-shrink-004.html.ini | 2 -- .../css/css-flexbox/flex-shrink-005.html.ini | 2 -- .../css/css-flexbox/flex-shrink-006.html.ini | 2 -- .../css/css-flexbox/flex-shrink-007.html.ini | 2 -- .../css/css-flexbox/flex-shrink-008.html.ini | 2 -- .../css/css-flexbox/flex-wrap-006.html.ini | 2 -- .../css-flexbox/flexbox-flex-wrap-flexing.html.ini | 2 -- .../flexbox_align-content-flexstart.html.ini | 2 -- .../css/css-flexbox/flexbox_box-clear.html.ini | 2 -- .../css/css-flexbox/flexbox_fbfc.html.ini | 2 -- .../css/css-flexbox/flexible-box-float.html.ini | 2 -- .../layout-algorithm_algo-cross-line-001.html.ini | 2 -- .../css/css-flexbox/order-painting.html.ini | 2 -- .../css/css-flexbox/overflow-area-001.html.ini | 2 -- .../css/css-flexbox/overflow-area-002.html.ini | 2 -- .../css-flexbox/table-as-item-change-cell.html.ini | 2 -- 50 files changed, 12 insertions(+), 99 deletions(-) delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/align-content-002.htm.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/align-content_flex-start.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/align-items-002.htm.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/align-self-001.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/align-self-007.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/align-self-013.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/dynamic-change-simplified-layout-002.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/fit-content-item-002.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/fit-content-item-003.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/fit-content-item-004.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flex-001.htm.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flex-002.htm.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flex-003.htm.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flex-004.htm.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flex-basis-001.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flex-basis-002.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flex-basis-003.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flex-basis-004.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flex-basis-007.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flex-basis-008.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flex-box-wrap.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flex-container-margin.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flex-flow-002.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flex-flow-003.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flex-flow-005.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flex-flow-006.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flex-grow-002.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flex-grow-004.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flex-grow-006.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flex-grow-007.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flex-shrink-001.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flex-shrink-002.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flex-shrink-003.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flex-shrink-004.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flex-shrink-005.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flex-shrink-006.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flex-shrink-007.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flex-shrink-008.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flex-wrap-006.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-flex-wrap-flexing.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-content-flexstart.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_box-clear.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_fbfc.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexible-box-float.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/layout-algorithm_algo-cross-line-001.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/order-painting.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-area-001.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-area-002.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/table-as-item-change-cell.html.ini diff --git a/components/layout_2020/flexbox/layout.rs b/components/layout_2020/flexbox/layout.rs index 666eca3055f..f9c4a3c2b61 100644 --- a/components/layout_2020/flexbox/layout.rs +++ b/components/layout_2020/flexbox/layout.rs @@ -939,6 +939,7 @@ impl<'a> FlexItem<'a> { Some(s) => LengthOrAuto::LengthPercentage(s), None => self.content_box_size.cross, }; + let item_as_containing_block = ContainingBlock { inline_size: used_main_size, block_size, @@ -953,8 +954,18 @@ impl<'a> FlexItem<'a> { &item_as_containing_block, self.tree_rank, ); + + let hypothetical_cross_size = self + .content_box_size + .cross + .auto_is(|| content_block_size) + .clamp_between_extremums( + self.content_min_size.cross, + self.content_max_size.cross, + ); + FlexItemLayoutResult { - hypothetical_cross_size: content_block_size, + hypothetical_cross_size, fragments, positioning_context, } diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-content-002.htm.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/align-content-002.htm.ini deleted file mode 100644 index 91605cf71b6..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-content-002.htm.ini +++ /dev/null @@ -1,2 +0,0 @@ -[align-content-002.htm] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-content_flex-start.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/align-content_flex-start.html.ini deleted file mode 100644 index b48569f8a3a..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-content_flex-start.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[align-content_flex-start.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-items-002.htm.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/align-items-002.htm.ini deleted file mode 100644 index a1970b61d72..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-items-002.htm.ini +++ /dev/null @@ -1,2 +0,0 @@ -[align-items-002.htm] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-self-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/align-self-001.html.ini deleted file mode 100644 index 44437f10ab4..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-self-001.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[align-self-001.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-self-007.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/align-self-007.html.ini deleted file mode 100644 index 6de78262fbd..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-self-007.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[align-self-007.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-self-013.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/align-self-013.html.ini deleted file mode 100644 index f7ea996df01..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-self-013.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[align-self-013.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/dynamic-change-simplified-layout-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/dynamic-change-simplified-layout-002.html.ini deleted file mode 100644 index e530450491a..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/dynamic-change-simplified-layout-002.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[dynamic-change-simplified-layout-002.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/fit-content-item-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/fit-content-item-002.html.ini deleted file mode 100644 index a34022bc813..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/fit-content-item-002.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[fit-content-item-002.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/fit-content-item-003.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/fit-content-item-003.html.ini deleted file mode 100644 index 80868110458..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/fit-content-item-003.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[fit-content-item-003.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/fit-content-item-004.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/fit-content-item-004.html.ini deleted file mode 100644 index 01a9779cad2..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/fit-content-item-004.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[fit-content-item-004.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-001.htm.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-001.htm.ini deleted file mode 100644 index de9ba3fea20..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-001.htm.ini +++ /dev/null @@ -1,2 +0,0 @@ -[flex-001.htm] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-002.htm.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-002.htm.ini deleted file mode 100644 index 84933e64be4..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-002.htm.ini +++ /dev/null @@ -1,2 +0,0 @@ -[flex-002.htm] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-003.htm.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-003.htm.ini deleted file mode 100644 index 6fd0cb23d1b..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-003.htm.ini +++ /dev/null @@ -1,2 +0,0 @@ -[flex-003.htm] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-004.htm.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-004.htm.ini deleted file mode 100644 index e52a31666ee..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-004.htm.ini +++ /dev/null @@ -1,2 +0,0 @@ -[flex-004.htm] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-basis-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-basis-001.html.ini deleted file mode 100644 index 9f40cafdfbf..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-basis-001.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[flex-basis-001.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-basis-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-basis-002.html.ini deleted file mode 100644 index 54f4e279546..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-basis-002.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[flex-basis-002.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-basis-003.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-basis-003.html.ini deleted file mode 100644 index f97a37252cc..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-basis-003.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[flex-basis-003.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-basis-004.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-basis-004.html.ini deleted file mode 100644 index 69a0be5632d..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-basis-004.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[flex-basis-004.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-basis-007.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-basis-007.html.ini deleted file mode 100644 index 0c28623c45d..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-basis-007.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[flex-basis-007.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-basis-008.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-basis-008.html.ini deleted file mode 100644 index 2e4f223ba79..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-basis-008.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[flex-basis-008.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-box-wrap.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-box-wrap.html.ini deleted file mode 100644 index 53be7c3c03c..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-box-wrap.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[flex-box-wrap.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-container-margin.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-container-margin.html.ini deleted file mode 100644 index 3a44141aaaf..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-container-margin.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[flex-container-margin.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-flow-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-flow-002.html.ini deleted file mode 100644 index 6d41f47f6ae..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-flow-002.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[flex-flow-002.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-flow-003.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-flow-003.html.ini deleted file mode 100644 index 1e2afcdc931..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-flow-003.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[flex-flow-003.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-flow-005.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-flow-005.html.ini deleted file mode 100644 index 1783ec8abfe..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-flow-005.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[flex-flow-005.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-flow-006.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-flow-006.html.ini deleted file mode 100644 index 21c40daf0de..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-flow-006.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[flex-flow-006.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-grow-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-grow-002.html.ini deleted file mode 100644 index 613106d4558..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-grow-002.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[flex-grow-002.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-grow-004.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-grow-004.html.ini deleted file mode 100644 index 019801910d1..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-grow-004.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[flex-grow-004.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-grow-006.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-grow-006.html.ini deleted file mode 100644 index 9ab0edf965e..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-grow-006.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[flex-grow-006.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-grow-007.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-grow-007.html.ini deleted file mode 100644 index c28e6c196a3..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-grow-007.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[flex-grow-007.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-shrink-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-shrink-001.html.ini deleted file mode 100644 index 87531091d0e..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-shrink-001.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[flex-shrink-001.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-shrink-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-shrink-002.html.ini deleted file mode 100644 index 0e22e27542d..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-shrink-002.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[flex-shrink-002.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-shrink-003.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-shrink-003.html.ini deleted file mode 100644 index 8679f5821a9..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-shrink-003.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[flex-shrink-003.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-shrink-004.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-shrink-004.html.ini deleted file mode 100644 index 9a994d4d451..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-shrink-004.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[flex-shrink-004.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-shrink-005.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-shrink-005.html.ini deleted file mode 100644 index 5bcc3964f48..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-shrink-005.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[flex-shrink-005.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-shrink-006.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-shrink-006.html.ini deleted file mode 100644 index e5f604bb56c..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-shrink-006.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[flex-shrink-006.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-shrink-007.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-shrink-007.html.ini deleted file mode 100644 index f858ab95451..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-shrink-007.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[flex-shrink-007.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-shrink-008.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-shrink-008.html.ini deleted file mode 100644 index 598b3602d7c..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-shrink-008.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[flex-shrink-008.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-wrap-006.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-wrap-006.html.ini deleted file mode 100644 index 2b2ae5489c3..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-wrap-006.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[flex-wrap-006.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-flex-wrap-flexing.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-flex-wrap-flexing.html.ini deleted file mode 100644 index bdb780ec05e..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-flex-wrap-flexing.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[flexbox-flex-wrap-flexing.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-content-flexstart.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-content-flexstart.html.ini deleted file mode 100644 index cbd04012f82..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-content-flexstart.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[flexbox_align-content-flexstart.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_box-clear.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_box-clear.html.ini deleted file mode 100644 index cf679683a95..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_box-clear.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[flexbox_box-clear.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_fbfc.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_fbfc.html.ini deleted file mode 100644 index 3672dbc441e..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_fbfc.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[flexbox_fbfc.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexible-box-float.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexible-box-float.html.ini deleted file mode 100644 index 3638bd7f085..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexible-box-float.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[flexible-box-float.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/layout-algorithm_algo-cross-line-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/layout-algorithm_algo-cross-line-001.html.ini deleted file mode 100644 index 9d607177a8b..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/layout-algorithm_algo-cross-line-001.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[layout-algorithm_algo-cross-line-001.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/order-painting.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/order-painting.html.ini deleted file mode 100644 index 502ba2d782b..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/order-painting.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[order-painting.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-area-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-area-001.html.ini deleted file mode 100644 index 78e4433fc14..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-area-001.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[overflow-area-001.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-area-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-area-002.html.ini deleted file mode 100644 index 5b1a9bb41ad..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-area-002.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[overflow-area-002.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/table-as-item-change-cell.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/table-as-item-change-cell.html.ini deleted file mode 100644 index e8672a3bd87..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/table-as-item-change-cell.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[table-as-item-change-cell.html] - expected: FAIL From 63ac4d165c01276b1ef3c33eccde3d1e252957c9 Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Mon, 20 Jul 2020 13:17:04 -0700 Subject: [PATCH 2/7] flexbox 2020: Store align_items on FlexContext --- components/layout_2020/flexbox/layout.rs | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/components/layout_2020/flexbox/layout.rs b/components/layout_2020/flexbox/layout.rs index f9c4a3c2b61..e920ff92306 100644 --- a/components/layout_2020/flexbox/layout.rs +++ b/components/layout_2020/flexbox/layout.rs @@ -19,6 +19,8 @@ use crate::style_ext::ComputedValuesExt; use crate::ContainingBlock; use atomic_refcell::AtomicRefMut; use std::cell::Cell; +use style::properties::longhands::align_items::computed_value::T as AlignItems; +use style::properties::longhands::align_self::computed_value::T as AlignSelf; use style::properties::longhands::box_sizing::computed_value::T as BoxSizing; use style::properties::longhands::flex_direction::computed_value::T as FlexDirection; use style::properties::longhands::flex_wrap::computed_value::T as FlexWrap; @@ -44,6 +46,7 @@ struct FlexContext<'a> { flex_axis: FlexAxis, main_start_cross_start_sides_are: MainStartCrossStart, container_definite_inner_size: FlexRelativeVec2>, + align_items: AlignItems, } /// A flex item with some intermediate results @@ -114,6 +117,17 @@ impl FlexContext<'_> { rect, ) } + + fn align_for(&self, align_self: &AlignSelf) -> AlignItems { + match align_self { + AlignSelf::Auto => self.align_items, + AlignSelf::Stretch => AlignItems::Stretch, + AlignSelf::FlexStart => AlignItems::FlexStart, + AlignSelf::FlexEnd => AlignItems::FlexEnd, + AlignSelf::Center => AlignItems::Center, + AlignSelf::Baseline => AlignItems::Baseline, + } + } } impl FlexContainer { @@ -252,6 +266,8 @@ fn layout<'context, 'boxes>( FlexWrap::Nowrap | FlexWrap::Wrap => false, FlexWrap::WrapReverse => true, }; + let align_items = containing_block.style.clone_align_items(); + let mut flex_context = FlexContext { layout_context, positioning_context, @@ -260,6 +276,7 @@ fn layout<'context, 'boxes>( container_max_cross_size, container_is_single_line, flex_axis, + align_items, main_start_cross_start_sides_are: MainStartCrossStart::from( flex_direction, flex_wrap_reverse, From 1af5efc5423142c4ba1273f141cbc0b55d43a82c Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Mon, 20 Jul 2020 13:37:48 -0700 Subject: [PATCH 3/7] flexbox 2020: Enable align-self and align-items in CSS --- components/style/properties/longhands/position.mako.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/style/properties/longhands/position.mako.rs b/components/style/properties/longhands/position.mako.rs index 25354ab19af..48976a8f123 100644 --- a/components/style/properties/longhands/position.mako.rs +++ b/components/style/properties/longhands/position.mako.rs @@ -145,7 +145,7 @@ ${helpers.single_keyword( "align-items", "stretch flex-start flex-end center baseline", engines="servo-2013 servo-2020", - servo_2020_pref="layout.2020.unimplemented", + servo_2020_pref="layout.flexbox.enabled", extra_prefixes="webkit", spec="https://drafts.csswg.org/css-flexbox/#align-items-property", animation_value_type="discrete", @@ -234,7 +234,7 @@ ${helpers.predefined_type( "align-self", "auto stretch flex-start flex-end center baseline", engines="servo-2013 servo-2020", - servo_2020_pref="layout.2020.unimplemented", + servo_2020_pref="layout.flexbox.enabled", extra_prefixes="webkit", spec="https://drafts.csswg.org/css-flexbox/#propdef-align-self", animation_value_type="discrete", From d1b92b68c776297ec6d6dd0f28b3acb0904de69e Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Mon, 20 Jul 2020 13:38:11 -0700 Subject: [PATCH 4/7] flexbox 2020: Respect the stretchiness of align-self --- components/layout_2020/flexbox/layout.rs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/components/layout_2020/flexbox/layout.rs b/components/layout_2020/flexbox/layout.rs index e920ff92306..bb39a5af5b3 100644 --- a/components/layout_2020/flexbox/layout.rs +++ b/components/layout_2020/flexbox/layout.rs @@ -69,6 +69,8 @@ struct FlexItem<'a> { /// https://drafts.csswg.org/css-flexbox/#algo-main-item hypothetical_main_size: Length, + /// This is `align-self`, defaulting to `align-items` if `auto` + align_self: AlignItems, } /// A flex line with some intermediate results @@ -436,6 +438,8 @@ impl<'a> FlexItem<'a> { let padding_border = padding.sum_by_axis() + border.sum_by_axis(); let pbm_auto_is_zero = padding_border + margin_auto_is_zero.sum_by_axis(); + let align_self = flex_context.align_for(&box_style.clone_align_self()); + let flex_base_size = flex_base_size( flex_context, box_, @@ -459,6 +463,7 @@ impl<'a> FlexItem<'a> { pbm_auto_is_zero, flex_base_size, hypothetical_main_size, + align_self, } } } @@ -641,15 +646,14 @@ impl FlexLine<'_> { // Determine the used cross size of each flex item // https://drafts.csswg.org/css-flexbox/#algo-stretch - // FIXME: For now we hard-code the behavior for `align-self: stretch` let (item_used_cross_sizes, item_fragments): (Vec<_>, Vec<_>) = self .items .iter_mut() .zip(item_layout_results) .zip(&item_used_main_sizes) .map(|((item, mut item_result), &used_main_size)| { - let has_stretch_auto = true; // FIXME: use the property - let cross_size = if has_stretch_auto && + let has_stretch = item.align_self == AlignItems::Stretch; + let cross_size = if has_stretch && item.content_box_size.cross.is_auto() && !(item.margin.cross_start.is_auto() || item.margin.cross_end.is_auto()) { @@ -660,7 +664,7 @@ impl FlexLine<'_> { } else { item_result.hypothetical_cross_size }; - if has_stretch_auto { + if has_stretch { // “If the flex item has `align-self: stretch`, redo layout for its contents, // treating this used size as its definite cross size // so that percentage-sized children can be resolved.” From ba9448e68210feb7f64f3f6aa43ec62fe503a205 Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Mon, 20 Jul 2020 14:18:23 -0700 Subject: [PATCH 5/7] flex 2020: Handle positioning flex item based on align-self --- components/layout_2020/flexbox/layout.rs | 28 +++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/components/layout_2020/flexbox/layout.rs b/components/layout_2020/flexbox/layout.rs index bb39a5af5b3..9567bb0efbe 100644 --- a/components/layout_2020/flexbox/layout.rs +++ b/components/layout_2020/flexbox/layout.rs @@ -715,7 +715,10 @@ impl FlexLine<'_> { .items .iter() .zip(&item_margins) - .map(|(item, margin)| item.align_along_cross_axis(margin)); + .zip(&item_used_cross_sizes) + .map(|((item, margin), size)| { + item.align_along_cross_axis(margin, size, line_cross_size) + }); let item_fragments = self .items @@ -1149,14 +1152,29 @@ impl FlexItem<'_> { } /// Return the coordinate of the cross-start side of the content area - fn align_along_cross_axis(&self, margin: &FlexRelativeSides) -> Length { + fn align_along_cross_axis( + &self, + margin: &FlexRelativeSides, + content_size: &Length, + line_cross_size: Length, + ) -> Length { let outer_cross_start = if self.margin.cross_start.is_auto() || self.margin.cross_end.is_auto() { Length::zero() } else { - // FIXME: “Align all flex items along the cross-axis per `align-self`” - // For now we hard-code the behavior of `stretch`: - Length::zero() + match self.align_self { + AlignItems::Stretch | AlignItems::FlexStart => Length::zero(), + AlignItems::FlexEnd => { + let margin_box_cross = *content_size + self.pbm_auto_is_zero.cross; + line_cross_size - margin_box_cross + }, + AlignItems::Center => { + let margin_box_cross = *content_size + self.pbm_auto_is_zero.cross; + (line_cross_size - margin_box_cross) / 2. + }, + // FIXME: handle baseline alignment + AlignItems::Baseline => Length::zero(), + } }; outer_cross_start + margin.cross_start + self.border.cross_start + self.padding.cross_start } From 1cedf40376e5743503103abaac012439ce0522f3 Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Mon, 20 Jul 2020 14:25:09 -0700 Subject: [PATCH 6/7] Update wpt expectations --- .../css/css-flexbox/align-items-001.htm.ini | 2 -- .../css/css-flexbox/align-items-003.htm.ini | 2 -- .../css/css-flexbox/align-self-002.html.ini | 2 -- .../css/css-flexbox/align-self-003.html.ini | 2 -- .../css/css-flexbox/align-self-008.html.ini | 2 -- .../css/css-flexbox/align-self-009.html.ini | 2 -- .../css/css-flexbox/flexbox_align-items-center-2.html.ini | 2 -- .../css/css-flexbox/flexbox_align-items-center.html.ini | 2 -- .../css/css-flexbox/flexbox_align-items-flexend-2.html.ini | 2 -- .../css/css-flexbox/flexbox_align-items-flexend.html.ini | 2 -- .../css/css-flexbox/flexbox_align-items-flexstart-2.html.ini | 2 -- .../css/css-flexbox/flexbox_align-items-flexstart.html.ini | 2 -- .../css/css-flexbox/flexbox_align-self-auto.html.ini | 2 -- .../css/css-flexbox/flexbox_align-self-baseline.html.ini | 2 -- .../css/css-flexbox/flexbox_align-self-center.html.ini | 2 -- .../css/css-flexbox/flexbox_align-self-flexend.html.ini | 2 -- .../css/css-flexbox/flexbox_align-self-flexstart.html.ini | 2 -- .../css/css-flexbox/flexbox_align-self-stretch.html.ini | 2 -- .../flexbox_computedstyle_align-items-baseline.html.ini | 4 ---- .../flexbox_computedstyle_align-items-center.html.ini | 4 ---- .../flexbox_computedstyle_align-items-flex-end.html.ini | 4 ---- .../flexbox_computedstyle_align-items-flex-start.html.ini | 4 ---- .../flexbox_computedstyle_align-items-stretch.html.ini | 4 ---- .../flexbox_computedstyle_align-self-baseline.html.ini | 4 ---- .../flexbox_computedstyle_align-self-center.html.ini | 4 ---- .../flexbox_computedstyle_align-self-flex-end.html.ini | 4 ---- .../flexbox_computedstyle_align-self-flex-start.html.ini | 4 ---- .../flexbox_computedstyle_align-self-stretch.html.ini | 4 ---- .../metadata-layout-2020/css/css-flexbox/inheritance.html.ini | 3 --- 29 files changed, 79 deletions(-) delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/align-items-001.htm.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/align-items-003.htm.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/align-self-002.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/align-self-003.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/align-self-008.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/align-self-009.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-items-center-2.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-items-center.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-items-flexend-2.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-items-flexend.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-items-flexstart-2.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-items-flexstart.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-self-auto.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-self-baseline.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-self-center.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-self-flexend.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-self-flexstart.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-self-stretch.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-items-baseline.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-items-center.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-items-flex-end.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-items-flex-start.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-items-stretch.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-self-baseline.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-self-center.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-self-flex-end.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-self-flex-start.html.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-self-stretch.html.ini diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-items-001.htm.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/align-items-001.htm.ini deleted file mode 100644 index c0881d6424e..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-items-001.htm.ini +++ /dev/null @@ -1,2 +0,0 @@ -[align-items-001.htm] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-items-003.htm.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/align-items-003.htm.ini deleted file mode 100644 index fbedb90a574..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-items-003.htm.ini +++ /dev/null @@ -1,2 +0,0 @@ -[align-items-003.htm] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-self-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/align-self-002.html.ini deleted file mode 100644 index 75f124a60b9..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-self-002.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[align-self-002.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-self-003.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/align-self-003.html.ini deleted file mode 100644 index c90f70ca53c..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-self-003.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[align-self-003.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-self-008.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/align-self-008.html.ini deleted file mode 100644 index 6157f0bd5f5..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-self-008.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[align-self-008.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-self-009.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/align-self-009.html.ini deleted file mode 100644 index 084ec17f70b..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-self-009.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[align-self-009.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-items-center-2.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-items-center-2.html.ini deleted file mode 100644 index 0377e8d696d..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-items-center-2.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[flexbox_align-items-center-2.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-items-center.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-items-center.html.ini deleted file mode 100644 index 03b5dd0d6db..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-items-center.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[flexbox_align-items-center.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-items-flexend-2.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-items-flexend-2.html.ini deleted file mode 100644 index 66bf99e66ee..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-items-flexend-2.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[flexbox_align-items-flexend-2.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-items-flexend.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-items-flexend.html.ini deleted file mode 100644 index c64e6cacb61..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-items-flexend.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[flexbox_align-items-flexend.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-items-flexstart-2.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-items-flexstart-2.html.ini deleted file mode 100644 index 841c8205a99..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-items-flexstart-2.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[flexbox_align-items-flexstart-2.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-items-flexstart.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-items-flexstart.html.ini deleted file mode 100644 index 7e5c7f05193..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-items-flexstart.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[flexbox_align-items-flexstart.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-self-auto.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-self-auto.html.ini deleted file mode 100644 index a69f887f3e4..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-self-auto.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[flexbox_align-self-auto.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-self-baseline.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-self-baseline.html.ini deleted file mode 100644 index 36b2f7ad0e1..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-self-baseline.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[flexbox_align-self-baseline.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-self-center.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-self-center.html.ini deleted file mode 100644 index 734d8ab62a0..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-self-center.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[flexbox_align-self-center.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-self-flexend.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-self-flexend.html.ini deleted file mode 100644 index 26cc3c951fa..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-self-flexend.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[flexbox_align-self-flexend.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-self-flexstart.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-self-flexstart.html.ini deleted file mode 100644 index 93eae01e768..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-self-flexstart.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[flexbox_align-self-flexstart.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-self-stretch.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-self-stretch.html.ini deleted file mode 100644 index 0d711b77ec6..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-self-stretch.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[flexbox_align-self-stretch.html] - expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-items-baseline.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-items-baseline.html.ini deleted file mode 100644 index 76afd2659d2..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-items-baseline.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[flexbox_computedstyle_align-items-baseline.html] - [flexbox | computed style | align-items: baseline] - expected: FAIL - diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-items-center.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-items-center.html.ini deleted file mode 100644 index af73af3fd23..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-items-center.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[flexbox_computedstyle_align-items-center.html] - [flexbox | computed style | align-items: center] - expected: FAIL - diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-items-flex-end.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-items-flex-end.html.ini deleted file mode 100644 index b9d0dee6b7e..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-items-flex-end.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[flexbox_computedstyle_align-items-flex-end.html] - [flexbox | computed style | align-items: flex-end] - expected: FAIL - diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-items-flex-start.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-items-flex-start.html.ini deleted file mode 100644 index 9641b40e773..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-items-flex-start.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[flexbox_computedstyle_align-items-flex-start.html] - [flexbox | computed style | align-items: flex-start] - expected: FAIL - diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-items-stretch.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-items-stretch.html.ini deleted file mode 100644 index 906a9dcbeba..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-items-stretch.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[flexbox_computedstyle_align-items-stretch.html] - [flexbox | computed style | align-items: stretch] - expected: FAIL - diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-self-baseline.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-self-baseline.html.ini deleted file mode 100644 index fd7decfa83a..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-self-baseline.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[flexbox_computedstyle_align-self-baseline.html] - [flexbox | computed style | align-self: baseline] - expected: FAIL - diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-self-center.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-self-center.html.ini deleted file mode 100644 index 335dbf5254a..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-self-center.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[flexbox_computedstyle_align-self-center.html] - [flexbox | computed style | align-self: center] - expected: FAIL - diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-self-flex-end.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-self-flex-end.html.ini deleted file mode 100644 index 94c9c74972d..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-self-flex-end.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[flexbox_computedstyle_align-self-flex-end.html] - [flexbox | computed style | align-self: flex-end] - expected: FAIL - diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-self-flex-start.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-self-flex-start.html.ini deleted file mode 100644 index 9e8c0a7e51a..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-self-flex-start.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[flexbox_computedstyle_align-self-flex-start.html] - [flexbox | computed style | align-self: flex-start] - expected: FAIL - diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-self-stretch.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-self-stretch.html.ini deleted file mode 100644 index d329ffcff54..00000000000 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-self-stretch.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[flexbox_computedstyle_align-self-stretch.html] - [flexbox | computed style | align-self: stretch] - expected: FAIL - diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/inheritance.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/inheritance.html.ini index 7f017d75b1d..934a21d347d 100644 --- a/tests/wpt/metadata-layout-2020/css/css-flexbox/inheritance.html.ini +++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/inheritance.html.ini @@ -11,9 +11,6 @@ [Property justify-content has initial value normal] expected: FAIL - [Property align-items does not inherit] - expected: FAIL - [Property align-self has initial value auto] expected: FAIL From f2bfa08a85cdadcbdd514bb704cab864d344abe0 Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Mon, 20 Jul 2020 14:29:44 -0700 Subject: [PATCH 7/7] Add manual test for align-self --- tests/html/flexbox-align-self.html | 41 ++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 tests/html/flexbox-align-self.html diff --git a/tests/html/flexbox-align-self.html b/tests/html/flexbox-align-self.html new file mode 100644 index 00000000000..64758feb550 --- /dev/null +++ b/tests/html/flexbox-align-self.html @@ -0,0 +1,41 @@ + +
+
A
+
B
+
C
+
D
+
E
+