diff --git a/components/layout_2020/display_list/stacking_context.rs b/components/layout_2020/display_list/stacking_context.rs index 62e4085086e..ece8502c21e 100644 --- a/components/layout_2020/display_list/stacking_context.rs +++ b/components/layout_2020/display_list/stacking_context.rs @@ -986,7 +986,7 @@ impl BoxFragment { return Some(StackingContextType::FloatStackingContainer); } - if box_style.display.is_atomic_inline_level() { + if self.is_atomic_inline_level() { return Some(StackingContextType::AtomicInlineStackingContainer); } diff --git a/components/layout_2020/fragment_tree/box_fragment.rs b/components/layout_2020/fragment_tree/box_fragment.rs index f8f0e233a2f..4e2a38a6232 100644 --- a/components/layout_2020/fragment_tree/box_fragment.rs +++ b/components/layout_2020/fragment_tree/box_fragment.rs @@ -12,6 +12,7 @@ use style::computed_values::overflow_x::T as ComputedOverflow; use style::computed_values::position::T as ComputedPosition; use style::logical_geometry::WritingMode; use style::properties::ComputedValues; +use style::values::specified::box_::DisplayOutside; use super::{BaseFragment, BaseFragmentInfo, CollapsedBlockMargins, Fragment}; use crate::formatting_contexts::Baselines; @@ -348,6 +349,12 @@ impl BoxFragment { self.style.is_inline_box(self.base.flags) } + /// Whether this is an atomic inline-level box. + /// + pub(crate) fn is_atomic_inline_level(&self) -> bool { + self.style.get_box().display.outside() == DisplayOutside::Inline && !self.is_inline_box() + } + /// Whether this is a table wrapper box. /// pub(crate) fn is_table_wrapper(&self) -> bool { diff --git a/tests/wpt/meta/css/css-grid/alignment/grid-gutters-015.html.ini b/tests/wpt/meta/css/css-grid/alignment/grid-gutters-015.html.ini deleted file mode 100644 index 01fa5d5c83d..00000000000 --- a/tests/wpt/meta/css/css-grid/alignment/grid-gutters-015.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[grid-gutters-015.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/grid-container-baseline-synthesized-001.html.ini b/tests/wpt/meta/css/css-grid/grid-container-baseline-synthesized-001.html.ini deleted file mode 100644 index 4bf18d5d0b2..00000000000 --- a/tests/wpt/meta/css/css-grid/grid-container-baseline-synthesized-001.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[grid-container-baseline-synthesized-001.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/grid-container-baseline-synthesized-002.html.ini b/tests/wpt/meta/css/css-grid/grid-container-baseline-synthesized-002.html.ini deleted file mode 100644 index b1f0ed70bf8..00000000000 --- a/tests/wpt/meta/css/css-grid/grid-container-baseline-synthesized-002.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[grid-container-baseline-synthesized-002.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/grid-container-baseline-synthesized-003.html.ini b/tests/wpt/meta/css/css-grid/grid-container-baseline-synthesized-003.html.ini deleted file mode 100644 index 30e114170b9..00000000000 --- a/tests/wpt/meta/css/css-grid/grid-container-baseline-synthesized-003.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[grid-container-baseline-synthesized-003.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/grid-container-baseline-synthesized-004.html.ini b/tests/wpt/meta/css/css-grid/grid-container-baseline-synthesized-004.html.ini deleted file mode 100644 index 6847ef99a24..00000000000 --- a/tests/wpt/meta/css/css-grid/grid-container-baseline-synthesized-004.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[grid-container-baseline-synthesized-004.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/grid-model/grid-container-scrollbars-sizing-002.html.ini b/tests/wpt/meta/css/css-grid/grid-model/grid-container-scrollbars-sizing-002.html.ini deleted file mode 100644 index 65f447695c9..00000000000 --- a/tests/wpt/meta/css/css-grid/grid-model/grid-container-scrollbars-sizing-002.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[grid-container-scrollbars-sizing-002.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/subgrid/independent-tracks-from-parent-grid.html.ini b/tests/wpt/meta/css/css-grid/subgrid/independent-tracks-from-parent-grid.html.ini deleted file mode 100644 index 3797183cdbd..00000000000 --- a/tests/wpt/meta/css/css-grid/subgrid/independent-tracks-from-parent-grid.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[independent-tracks-from-parent-grid.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/subgrid/repeat-auto-fill-005.html.ini b/tests/wpt/meta/css/css-grid/subgrid/repeat-auto-fill-005.html.ini new file mode 100644 index 00000000000..882d1cfda55 --- /dev/null +++ b/tests/wpt/meta/css/css-grid/subgrid/repeat-auto-fill-005.html.ini @@ -0,0 +1,2 @@ +[repeat-auto-fill-005.html] + expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/subgrid/subgrid-baseline-012.html.ini b/tests/wpt/meta/css/css-grid/subgrid/subgrid-baseline-012.html.ini deleted file mode 100644 index 59602ca238f..00000000000 --- a/tests/wpt/meta/css/css-grid/subgrid/subgrid-baseline-012.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[subgrid-baseline-012.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/subgrid/subgrid-no-items-on-edges-001.html.ini b/tests/wpt/meta/css/css-grid/subgrid/subgrid-no-items-on-edges-001.html.ini deleted file mode 100644 index f4d72c5c3f8..00000000000 --- a/tests/wpt/meta/css/css-grid/subgrid/subgrid-no-items-on-edges-001.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[subgrid-no-items-on-edges-001.html] - expected: FAIL