diff --git a/Cargo.lock b/Cargo.lock index 5f564700aff..318daf40e30 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3204,9 +3204,9 @@ dependencies = [ [[package]] name = "grid" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71b01d27060ad58be4663b9e4ac9e2d4806918e8876af8912afbddd1a91d5eaa" +checksum = "12101ecc8225ea6d675bc70263074eab6169079621c2186fe0c66590b2df9681" [[package]] name = "gstreamer" @@ -8345,9 +8345,9 @@ dependencies = [ [[package]] name = "taffy" -version = "0.8.3" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7aaef0ac998e6527d6d0d5582f7e43953bb17221ac75bb8eb2fcc2db3396db1c" +checksum = "a13e5d13f79d558b5d353a98072ca8ca0e99da429467804de959aa8c83c9a004" dependencies = [ "arrayvec", "grid", diff --git a/Cargo.toml b/Cargo.toml index 9a09c9c1811..9ae74bf142a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -149,7 +149,7 @@ stylo_traits = { git = "https://github.com/servo/stylo", branch = "2025-08-01" } surfman = { git = "https://github.com/servo/surfman", rev = "f7688b4585f9e0b5d4bf8ee8e4a91e82349610b1", features = ["chains"] } syn = { version = "2", default-features = false, features = ["clone-impls", "derive", "parsing"] } synstructure = "0.13" -taffy = { version = "0.8.3", default-features = false, features = ["detailed_layout_info", "grid", "std"] } +taffy = { version = "0.9", default-features = false, features = ["calc", "detailed_layout_info", "grid", "std"] } tikv-jemalloc-sys = "0.6.0" tikv-jemallocator = "0.6.0" time = { package = "time", version = "0.3", features = ["large-dates", "local-offset", "serde"] } diff --git a/components/layout/taffy/layout.rs b/components/layout/taffy/layout.rs index 45add7e8cb4..0c5de6c9c7f 100644 --- a/components/layout/taffy/layout.rs +++ b/components/layout/taffy/layout.rs @@ -4,10 +4,10 @@ use app_units::Au; use atomic_refcell::{AtomicRef, AtomicRefCell}; -use style::Zero; use style::properties::ComputedValues; use style::values::specified::align::AlignFlags; use style::values::specified::box_::DisplayInside; +use style::{Atom, Zero}; use taffy::style_helpers::{TaffyMaxContent, TaffyMinContent}; use taffy::{AvailableSpace, MaybeMath, RequestedAxis, RunMode}; @@ -98,6 +98,8 @@ impl taffy::TraversePartialTree for TaffyContainerContext<'_> { } impl taffy::LayoutPartialTree for TaffyContainerContext<'_> { + type CustomIdent = Atom; + type CoreContainerStyle<'a> = TaffyStyloStyle<&'a ComputedValues> where diff --git a/components/layout/taffy/stylo_taffy/convert.rs b/components/layout/taffy/stylo_taffy/convert.rs index 1b365cde6f6..859b9aef59a 100644 --- a/components/layout/taffy/stylo_taffy/convert.rs +++ b/components/layout/taffy/stylo_taffy/convert.rs @@ -2,40 +2,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -/// Private module of type aliases so we can refer to stylo types with nicer names -mod stylo { - pub(crate) use style::properties::generated::longhands::box_sizing::computed_value::T as BoxSizing; - pub(crate) use style::properties::longhands::aspect_ratio::computed_value::T as AspectRatio; - pub(crate) use style::properties::longhands::position::computed_value::T as Position; - pub(crate) use style::values::computed::length_percentage::Unpacked as UnpackedLengthPercentage; - pub(crate) use style::values::computed::{LengthPercentage, Percentage}; - pub(crate) use style::values::generics::NonNegative; - pub(crate) use style::values::generics::length::{ - GenericLengthPercentageOrNormal, GenericMargin, GenericMaxSize, GenericSize, - }; - pub(crate) use style::values::generics::position::{Inset as GenericInset, PreferredRatio}; - pub(crate) use style::values::specified::align::{AlignFlags, ContentDistribution}; - pub(crate) use style::values::specified::box_::{ - Display, DisplayInside, DisplayOutside, Overflow, - }; - pub(crate) type MarginVal = GenericMargin; - pub(crate) type InsetVal = GenericInset; - pub(crate) type Size = GenericSize>; - pub(crate) type MaxSize = GenericMaxSize>; - - pub(crate) type Gap = GenericLengthPercentageOrNormal>; - - pub(crate) use style::computed_values::grid_auto_flow::T as GridAutoFlow; - pub(crate) use style::values::computed::{GridLine, GridTemplateComponent, ImplicitGridTracks}; - pub(crate) use style::values::generics::grid::{ - RepeatCount, TrackBreadth, TrackListValue, TrackSize, - }; - pub(crate) use style::values::specified::GenericGridTemplateComponent; -} - +use style::Atom; +use stylo_atoms::atom; use taffy::MaxTrackSizingFunction; use taffy::style_helpers::*; +use super::stylo; + #[inline] pub fn length_percentage(val: &stylo::LengthPercentage) -> taffy::LengthPercentage { match val.unpack() { @@ -238,66 +211,38 @@ pub fn grid_auto_flow(input: stylo::GridAutoFlow) -> taffy::GridAutoFlow { } #[inline] -pub fn grid_line(input: &stylo::GridLine) -> taffy::GridPlacement { +pub fn grid_line(input: &stylo::GridLine) -> taffy::GridPlacement { if input.is_auto() { taffy::GridPlacement::Auto } else if input.is_span { - taffy::style_helpers::span(input.line_num.try_into().unwrap()) - } else if input.line_num == 0 { - taffy::GridPlacement::Auto + if input.ident.0 != atom!("") { + taffy::GridPlacement::NamedSpan( + input.ident.0.clone(), + input.line_num.try_into().unwrap(), + ) + } else { + taffy::GridPlacement::Span(input.line_num as u16) + } + } else if input.ident.0 != atom!("") { + taffy::GridPlacement::NamedLine(input.ident.0.clone(), input.line_num as i16) + } else if input.line_num != 0 { + taffy::style_helpers::line(input.line_num as i16) } else { - taffy::style_helpers::line(input.line_num.try_into().unwrap()) + taffy::GridPlacement::Auto } } #[inline] -pub fn grid_template_tracks( - input: &stylo::GridTemplateComponent, -) -> Vec { +pub fn track_repeat(input: stylo::RepeatCount) -> taffy::RepetitionCount { match input { - stylo::GenericGridTemplateComponent::None => Vec::new(), - stylo::GenericGridTemplateComponent::TrackList(list) => list - .values - .iter() - .map(|track| match track { - stylo::TrackListValue::TrackSize(size) => { - taffy::TrackSizingFunction::Single(track_size(size)) - }, - stylo::TrackListValue::TrackRepeat(repeat) => taffy::TrackSizingFunction::Repeat( - track_repeat(repeat.count), - repeat.track_sizes.iter().map(track_size).collect(), - ), - }) - .collect(), - - // TODO: Implement subgrid and masonry - stylo::GenericGridTemplateComponent::Subgrid(_) => Vec::new(), - stylo::GenericGridTemplateComponent::Masonry => Vec::new(), + stylo::RepeatCount::Number(val) => taffy::RepetitionCount::Count(val.try_into().unwrap()), + stylo::RepeatCount::AutoFill => taffy::RepetitionCount::AutoFill, + stylo::RepeatCount::AutoFit => taffy::RepetitionCount::AutoFit, } } #[inline] -pub fn grid_auto_tracks( - input: &stylo::ImplicitGridTracks, -) -> Vec { - input.0.iter().map(track_size).collect() -} - -#[inline] -pub fn track_repeat(input: stylo::RepeatCount) -> taffy::GridTrackRepetition { - match input { - stylo::RepeatCount::Number(val) => { - taffy::GridTrackRepetition::Count(val.try_into().unwrap()) - }, - stylo::RepeatCount::AutoFill => taffy::GridTrackRepetition::AutoFill, - stylo::RepeatCount::AutoFit => taffy::GridTrackRepetition::AutoFit, - } -} - -#[inline] -pub fn track_size( - input: &stylo::TrackSize, -) -> taffy::NonRepeatedTrackSizingFunction { +pub fn track_size(input: &stylo::TrackSize) -> taffy::TrackSizingFunction { match input { stylo::TrackSize::Breadth(breadth) => taffy::MinMax { min: min_track(breadth), diff --git a/components/layout/taffy/stylo_taffy/mod.rs b/components/layout/taffy/stylo_taffy/mod.rs index 15ddaa2c244..0d693edcccb 100644 --- a/components/layout/taffy/stylo_taffy/mod.rs +++ b/components/layout/taffy/stylo_taffy/mod.rs @@ -6,4 +6,36 @@ mod convert; mod wrapper; + pub(crate) use wrapper::TaffyStyloStyle; + +/// Private module of type aliases so we can refer to stylo types with nicer names +mod stylo { + pub(crate) use style::properties::generated::longhands::box_sizing::computed_value::T as BoxSizing; + pub(crate) use style::properties::longhands::aspect_ratio::computed_value::T as AspectRatio; + pub(crate) use style::properties::longhands::position::computed_value::T as Position; + pub(crate) use style::values::computed::length_percentage::Unpacked as UnpackedLengthPercentage; + pub(crate) use style::values::computed::{LengthPercentage, Percentage}; + pub(crate) use style::values::generics::NonNegative; + pub(crate) use style::values::generics::length::{ + GenericLengthPercentageOrNormal, GenericMargin, GenericMaxSize, GenericSize, + }; + pub(crate) use style::values::generics::position::{Inset as GenericInset, PreferredRatio}; + pub(crate) use style::values::specified::align::{AlignFlags, ContentDistribution}; + pub(crate) use style::values::specified::box_::{ + Display, DisplayInside, DisplayOutside, Overflow, + }; + pub(crate) type MarginVal = GenericMargin; + pub(crate) type InsetVal = GenericInset; + pub(crate) type Size = GenericSize>; + pub(crate) type MaxSize = GenericMaxSize>; + + pub(crate) type Gap = GenericLengthPercentageOrNormal>; + + pub(crate) use style::computed_values::grid_auto_flow::T as GridAutoFlow; + pub(crate) use style::values::computed::GridLine; + pub(crate) use style::values::generics::grid::{ + RepeatCount, TrackBreadth, TrackListValue, TrackSize, + }; + pub(crate) use style::values::specified::GenericGridTemplateComponent; +} diff --git a/components/layout/taffy/stylo_taffy/wrapper.rs b/components/layout/taffy/stylo_taffy/wrapper.rs index 22d02ffeb08..01410c7c074 100644 --- a/components/layout/taffy/stylo_taffy/wrapper.rs +++ b/components/layout/taffy/stylo_taffy/wrapper.rs @@ -5,8 +5,13 @@ use std::ops::Deref; use style::properties::ComputedValues; +use style::values::CustomIdent; +use style::values::computed::{GridTemplateAreas, LengthPercentage}; +use style::values::generics::grid::{TrackListValue, TrackRepeat, TrackSize}; +use style::values::specified::position::NamedArea; +use style::{Atom, OwnedSlice}; -use super::convert; +use super::{convert, stylo}; /// A wrapper struct for anything that Deref's to a [`ComputedValues`], which /// implements Taffy's layout traits and can used with Taffy's layout algorithms. @@ -25,6 +30,8 @@ impl> TaffyStyloStyle { } impl> taffy::CoreStyle for TaffyStyloStyle { + type CustomIdent = Atom; + #[inline] fn box_generation_mode(&self) -> taffy::BoxGenerationMode { convert::box_generation_mode(self.style.get_box().display) @@ -141,34 +148,199 @@ impl> taffy::CoreStyle for TaffyStyloStyle } } -impl> taffy::GridContainerStyle for TaffyStyloStyle { - type TemplateTrackList<'a> - = Vec +type SliceMapIter<'a, Input, Output> = + core::iter::Map, for<'c> fn(&'c Input) -> Output>; +type SliceMapRefIter<'a, Input, Output> = + core::iter::Map, for<'c> fn(&'c Input) -> &'c Output>; + +// Line name iterator type aliases +type LineNameSetIter<'a> = SliceMapRefIter<'a, CustomIdent, Atom>; +type LineNameIter<'a> = core::iter::Map< + core::slice::Iter<'a, OwnedSlice>, + fn(&OwnedSlice) -> LineNameSetIter<'_>, +>; + +#[derive(Clone)] +pub struct StyloLineNameIter<'a>(LineNameIter<'a>); +impl<'a> StyloLineNameIter<'a> { + fn new(names: &'a OwnedSlice>) -> Self { + Self(names.iter().map(|names| names.iter().map(|ident| &ident.0))) + } +} +impl<'a> Iterator for StyloLineNameIter<'a> { + type Item = core::iter::Map, fn(&CustomIdent) -> &Atom>; + fn next(&mut self) -> Option { + self.0.next() + } + fn size_hint(&self) -> (usize, Option) { + self.0.size_hint() + } +} +impl ExactSizeIterator for StyloLineNameIter<'_> {} +impl<'a> taffy::TemplateLineNames<'a, Atom> for StyloLineNameIter<'a> { + type LineNameSet<'b> + = SliceMapRefIter<'b, CustomIdent, Atom> + where + Self: 'b; +} + +pub struct RepetitionWrapper<'a>(&'a TrackRepeat); + +impl taffy::GenericRepetition for RepetitionWrapper<'_> { + type CustomIdent = Atom; + + type RepetitionTrackList<'a> + = SliceMapIter<'a, stylo::TrackSize, taffy::TrackSizingFunction> where Self: 'a; + + type TemplateLineNames<'a> + = StyloLineNameIter<'a> + where + Self: 'a; + + fn count(&self) -> taffy::RepetitionCount { + convert::track_repeat(self.0.count) + } + + fn tracks(&self) -> Self::RepetitionTrackList<'_> { + self.0.track_sizes.iter().map(convert::track_size) + } + + fn lines_names(&self) -> Self::TemplateLineNames<'_> { + StyloLineNameIter::new(&self.0.line_names) + } +} + +impl> taffy::GridContainerStyle for TaffyStyloStyle { + type Repetition<'a> + = RepetitionWrapper<'a> + where + Self: 'a; + + type TemplateTrackList<'a> + = core::iter::Map< + core::slice::Iter<'a, TrackListValue>, + fn( + &'a TrackListValue, + ) -> taffy::GenericGridTemplateComponent>, + > + where + Self: 'a; + type AutoTrackList<'a> - = Vec + = SliceMapIter<'a, TrackSize, taffy::TrackSizingFunction> + where + Self: 'a; + + type TemplateLineNames<'a> + = StyloLineNameIter<'a> + where + Self: 'a; + type GridTemplateAreas<'a> + = SliceMapIter<'a, NamedArea, taffy::GridTemplateArea> where Self: 'a; #[inline] - fn grid_template_rows(&self) -> Self::TemplateTrackList<'_> { - convert::grid_template_tracks(&self.style.get_position().grid_template_rows) + fn grid_template_rows(&self) -> Option> { + match &self.style.get_position().grid_template_rows { + stylo::GenericGridTemplateComponent::None => None, + stylo::GenericGridTemplateComponent::TrackList(list) => { + Some(list.values.iter().map(|track| match track { + stylo::TrackListValue::TrackSize(size) => { + taffy::GenericGridTemplateComponent::Single(convert::track_size(size)) + }, + stylo::TrackListValue::TrackRepeat(repeat) => { + taffy::GenericGridTemplateComponent::Repeat(RepetitionWrapper(repeat)) + }, + })) + }, + + // TODO: Implement subgrid and masonry + stylo::GenericGridTemplateComponent::Subgrid(_) => None, + stylo::GenericGridTemplateComponent::Masonry => None, + } } #[inline] - fn grid_template_columns(&self) -> Self::TemplateTrackList<'_> { - convert::grid_template_tracks(&self.style.get_position().grid_template_columns) + fn grid_template_columns(&self) -> Option> { + match &self.style.get_position().grid_template_columns { + stylo::GenericGridTemplateComponent::None => None, + stylo::GenericGridTemplateComponent::TrackList(list) => { + Some(list.values.iter().map(|track| match track { + stylo::TrackListValue::TrackSize(size) => { + taffy::GenericGridTemplateComponent::Single(convert::track_size(size)) + }, + stylo::TrackListValue::TrackRepeat(repeat) => { + taffy::GenericGridTemplateComponent::Repeat(RepetitionWrapper(repeat)) + }, + })) + }, + + // TODO: Implement subgrid and masonry + stylo::GenericGridTemplateComponent::Subgrid(_) => None, + stylo::GenericGridTemplateComponent::Masonry => None, + } } #[inline] fn grid_auto_rows(&self) -> Self::AutoTrackList<'_> { - convert::grid_auto_tracks(&self.style.get_position().grid_auto_rows) + self.style + .get_position() + .grid_auto_rows + .0 + .iter() + .map(convert::track_size) } #[inline] fn grid_auto_columns(&self) -> Self::AutoTrackList<'_> { - convert::grid_auto_tracks(&self.style.get_position().grid_auto_columns) + self.style + .get_position() + .grid_auto_columns + .0 + .iter() + .map(convert::track_size) + } + + fn grid_template_areas(&self) -> Option> { + match &self.style.get_position().grid_template_areas { + GridTemplateAreas::Areas(areas) => { + Some(areas.0.areas.iter().map(|area| taffy::GridTemplateArea { + name: area.name.clone(), + row_start: area.rows.start as u16, + row_end: area.rows.end as u16, + column_start: area.columns.start as u16, + column_end: area.columns.end as u16, + })) + }, + GridTemplateAreas::None => None, + } + } + + fn grid_template_column_names(&self) -> Option> { + match &self.style.get_position().grid_template_columns { + stylo::GenericGridTemplateComponent::None => None, + stylo::GenericGridTemplateComponent::TrackList(list) => { + Some(StyloLineNameIter::new(&list.line_names)) + }, + // TODO: Implement subgrid and masonry + stylo::GenericGridTemplateComponent::Subgrid(_) => None, + stylo::GenericGridTemplateComponent::Masonry => None, + } + } + + fn grid_template_row_names(&self) -> Option> { + match &self.style.get_position().grid_template_rows { + stylo::GenericGridTemplateComponent::None => None, + stylo::GenericGridTemplateComponent::TrackList(list) => { + Some(StyloLineNameIter::new(&list.line_names)) + }, + // TODO: Implement subgrid and masonry + stylo::GenericGridTemplateComponent::Subgrid(_) => None, + stylo::GenericGridTemplateComponent::Masonry => None, + } } #[inline] @@ -208,7 +380,7 @@ impl> taffy::GridContainerStyle for TaffyStylo impl> taffy::GridItemStyle for TaffyStyloStyle { #[inline] - fn grid_row(&self) -> taffy::Line { + fn grid_row(&self) -> taffy::Line> { let position_styles = self.style.get_position(); taffy::Line { start: convert::grid_line(&position_styles.grid_row_start), @@ -217,7 +389,7 @@ impl> taffy::GridItemStyle for TaffyStyloStyle } #[inline] - fn grid_column(&self) -> taffy::Line { + fn grid_column(&self) -> taffy::Line> { let position_styles = self.style.get_position(); taffy::Line { start: convert::grid_line(&position_styles.grid_column_start), diff --git a/tests/wpt/meta/css/css-grid/alignment/grid-content-alignment-and-self-alignment-002.html.ini b/tests/wpt/meta/css/css-grid/alignment/grid-content-alignment-and-self-alignment-002.html.ini index a3f532d72bb..ce1eedbc21e 100644 --- a/tests/wpt/meta/css/css-grid/alignment/grid-content-alignment-and-self-alignment-002.html.ini +++ b/tests/wpt/meta/css/css-grid/alignment/grid-content-alignment-and-self-alignment-002.html.ini @@ -1,52 +1,4 @@ [grid-content-alignment-and-self-alignment-002.html] - [.grid 1] - expected: FAIL - - [.grid 2] - expected: FAIL - - [.grid 3] - expected: FAIL - - [.grid 4] - expected: FAIL - - [.grid 5] - expected: FAIL - - [.grid 6] - expected: FAIL - - [.grid 7] - expected: FAIL - - [.grid 8] - expected: FAIL - - [.grid 9] - expected: FAIL - - [.grid 10] - expected: FAIL - - [.grid 11] - expected: FAIL - - [.grid 12] - expected: FAIL - - [.grid 13] - expected: FAIL - - [.grid 14] - expected: FAIL - - [.grid 15] - expected: FAIL - - [.grid 16] - expected: FAIL - [.grid 17] expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/alignment/grid-content-alignment-with-span-001.html.ini b/tests/wpt/meta/css/css-grid/alignment/grid-content-alignment-with-span-001.html.ini index cb310e22ffd..89712e48064 100644 --- a/tests/wpt/meta/css/css-grid/alignment/grid-content-alignment-with-span-001.html.ini +++ b/tests/wpt/meta/css/css-grid/alignment/grid-content-alignment-with-span-001.html.ini @@ -1,16 +1,4 @@ [grid-content-alignment-with-span-001.html] - [.grid 1] - expected: FAIL - - [.grid 2] - expected: FAIL - - [.grid 3] - expected: FAIL - - [.grid 4] - expected: FAIL - [.grid 5] expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/grid-definition/explicit-grid-size-001.html.ini b/tests/wpt/meta/css/css-grid/grid-definition/explicit-grid-size-001.html.ini deleted file mode 100644 index 054f354316e..00000000000 --- a/tests/wpt/meta/css/css-grid/grid-definition/explicit-grid-size-001.html.ini +++ /dev/null @@ -1,9 +0,0 @@ -[explicit-grid-size-001.html] - [.grid 7] - expected: FAIL - - [.grid 9] - expected: FAIL - - [.grid 10] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/grid-definition/grid-auto-fill-columns-001.html.ini b/tests/wpt/meta/css/css-grid/grid-definition/grid-auto-fill-columns-001.html.ini index 54797cf042b..70def1ffbc6 100644 --- a/tests/wpt/meta/css/css-grid/grid-definition/grid-auto-fill-columns-001.html.ini +++ b/tests/wpt/meta/css/css-grid/grid-definition/grid-auto-fill-columns-001.html.ini @@ -1,46 +1,7 @@ [grid-auto-fill-columns-001.html] - [.grid 3] - expected: FAIL - - [.grid 4] - expected: FAIL - - [.grid 5] - expected: FAIL - - [.grid 8] - expected: FAIL - - [.grid 10] - expected: FAIL - - [.grid 11] - expected: FAIL - - [.grid 13] - expected: FAIL - - [.grid 14] - expected: FAIL - - [.grid 15] - expected: FAIL - - [.grid 16] - expected: FAIL - - [.grid 17] - expected: FAIL - - [.grid 19] - expected: FAIL - [.grid 21] expected: FAIL - [.grid 22] - expected: FAIL - [.grid 23] expected: FAIL @@ -49,21 +10,3 @@ [.grid 25] expected: FAIL - - [.grid 27] - expected: FAIL - - [.grid 28] - expected: FAIL - - [.grid 30] - expected: FAIL - - [.grid 31] - expected: FAIL - - [.grid 32] - expected: FAIL - - [.grid 33] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/grid-definition/grid-auto-fill-rows-001.html.ini b/tests/wpt/meta/css/css-grid/grid-definition/grid-auto-fill-rows-001.html.ini index 67e5eff1907..62a643ae2a9 100644 --- a/tests/wpt/meta/css/css-grid/grid-definition/grid-auto-fill-rows-001.html.ini +++ b/tests/wpt/meta/css/css-grid/grid-definition/grid-auto-fill-rows-001.html.ini @@ -1,46 +1,7 @@ [grid-auto-fill-rows-001.html] - [.grid 3] - expected: FAIL - - [.grid 4] - expected: FAIL - - [.grid 5] - expected: FAIL - - [.grid 8] - expected: FAIL - - [.grid 12] - expected: FAIL - - [.grid 13] - expected: FAIL - - [.grid 15] - expected: FAIL - - [.grid 16] - expected: FAIL - - [.grid 17] - expected: FAIL - - [.grid 18] - expected: FAIL - - [.grid 19] - expected: FAIL - - [.grid 21] - expected: FAIL - [.grid 23] expected: FAIL - [.grid 24] - expected: FAIL - [.grid 25] expected: FAIL @@ -49,21 +10,3 @@ [.grid 27] expected: FAIL - - [.grid 29] - expected: FAIL - - [.grid 30] - expected: FAIL - - [.grid 32] - expected: FAIL - - [.grid 33] - expected: FAIL - - [.grid 34] - expected: FAIL - - [.grid 35] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/grid-definition/grid-auto-fit-columns-001.html.ini b/tests/wpt/meta/css/css-grid/grid-definition/grid-auto-fit-columns-001.html.ini index e120e6d0f1c..0fff12a46b7 100644 --- a/tests/wpt/meta/css/css-grid/grid-definition/grid-auto-fit-columns-001.html.ini +++ b/tests/wpt/meta/css/css-grid/grid-definition/grid-auto-fit-columns-001.html.ini @@ -1,46 +1,7 @@ [grid-auto-fit-columns-001.html] - [.grid 3] - expected: FAIL - - [.grid 4] - expected: FAIL - - [.grid 5] - expected: FAIL - - [.grid 8] - expected: FAIL - - [.grid 10] - expected: FAIL - - [.grid 11] - expected: FAIL - - [.grid 13] - expected: FAIL - - [.grid 14] - expected: FAIL - - [.grid 15] - expected: FAIL - - [.grid 16] - expected: FAIL - - [.grid 17] - expected: FAIL - - [.grid 19] - expected: FAIL - [.grid 21] expected: FAIL - [.grid 22] - expected: FAIL - [.grid 23] expected: FAIL @@ -50,21 +11,6 @@ [.grid 25] expected: FAIL - [.grid 27] - expected: FAIL - - [.grid 28] - expected: FAIL - - [.grid 30] - expected: FAIL - - [.grid 31] - expected: FAIL - - [.grid 32] - expected: FAIL - [.grid 34] expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/grid-definition/grid-auto-fit-rows-001.html.ini b/tests/wpt/meta/css/css-grid/grid-definition/grid-auto-fit-rows-001.html.ini index 68d34879f45..3c8583f656f 100644 --- a/tests/wpt/meta/css/css-grid/grid-definition/grid-auto-fit-rows-001.html.ini +++ b/tests/wpt/meta/css/css-grid/grid-definition/grid-auto-fit-rows-001.html.ini @@ -1,46 +1,7 @@ [grid-auto-fit-rows-001.html] - [.grid 3] - expected: FAIL - - [.grid 4] - expected: FAIL - - [.grid 5] - expected: FAIL - - [.grid 8] - expected: FAIL - - [.grid 10] - expected: FAIL - - [.grid 11] - expected: FAIL - - [.grid 13] - expected: FAIL - - [.grid 14] - expected: FAIL - - [.grid 15] - expected: FAIL - - [.grid 16] - expected: FAIL - - [.grid 17] - expected: FAIL - - [.grid 19] - expected: FAIL - [.grid 21] expected: FAIL - [.grid 22] - expected: FAIL - [.grid 23] expected: FAIL @@ -49,18 +10,3 @@ [.grid 25] expected: FAIL - - [.grid 27] - expected: FAIL - - [.grid 28] - expected: FAIL - - [.grid 30] - expected: FAIL - - [.grid 31] - expected: FAIL - - [.grid 32] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/grid-definition/grid-auto-repeat-min-size-004.html.ini b/tests/wpt/meta/css/css-grid/grid-definition/grid-auto-repeat-min-size-004.html.ini deleted file mode 100644 index 1a5322676df..00000000000 --- a/tests/wpt/meta/css/css-grid/grid-definition/grid-auto-repeat-min-size-004.html.ini +++ /dev/null @@ -1,3 +0,0 @@ -[grid-auto-repeat-min-size-004.html] - [.grid 1] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/grid-definition/grid-auto-repeat-minmax.html.ini b/tests/wpt/meta/css/css-grid/grid-definition/grid-auto-repeat-minmax.html.ini deleted file mode 100644 index 821eeaaa354..00000000000 --- a/tests/wpt/meta/css/css-grid/grid-definition/grid-auto-repeat-minmax.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[grid-auto-repeat-minmax.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/grid-definition/grid-auto-repeat-multiple-values-002.html.ini b/tests/wpt/meta/css/css-grid/grid-definition/grid-auto-repeat-multiple-values-002.html.ini deleted file mode 100644 index dff55667834..00000000000 --- a/tests/wpt/meta/css/css-grid/grid-definition/grid-auto-repeat-multiple-values-002.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[grid-auto-repeat-multiple-values-002.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/grid-definition/grid-auto-repeat-multiple-values-003.html.ini b/tests/wpt/meta/css/css-grid/grid-definition/grid-auto-repeat-multiple-values-003.html.ini deleted file mode 100644 index 2b35667ed37..00000000000 --- a/tests/wpt/meta/css/css-grid/grid-definition/grid-auto-repeat-multiple-values-003.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[grid-auto-repeat-multiple-values-003.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/grid-definition/grid-inline-auto-repeat-001.html.ini b/tests/wpt/meta/css/css-grid/grid-definition/grid-inline-auto-repeat-001.html.ini deleted file mode 100644 index 79630976da3..00000000000 --- a/tests/wpt/meta/css/css-grid/grid-definition/grid-inline-auto-repeat-001.html.ini +++ /dev/null @@ -1,3 +0,0 @@ -[grid-inline-auto-repeat-001.html] - ['autoFitColumns' with: grid-template-columns: repeat(auto-fit, 9px); and grid-template-rows: 20px;] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/grid-definition/grid-repeat-max-width-001.html.ini b/tests/wpt/meta/css/css-grid/grid-definition/grid-repeat-max-width-001.html.ini new file mode 100644 index 00000000000..9fdc3e2c723 --- /dev/null +++ b/tests/wpt/meta/css/css-grid/grid-definition/grid-repeat-max-width-001.html.ini @@ -0,0 +1,2 @@ +[grid-repeat-max-width-001.html] + expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/grid-definition/grid-support-named-grid-lines-002.html.ini b/tests/wpt/meta/css/css-grid/grid-definition/grid-support-named-grid-lines-002.html.ini deleted file mode 100644 index 433542d206d..00000000000 --- a/tests/wpt/meta/css/css-grid/grid-definition/grid-support-named-grid-lines-002.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[grid-support-named-grid-lines-002.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/grid-definition/grid-support-named-grid-lines-003.html.ini b/tests/wpt/meta/css/css-grid/grid-definition/grid-support-named-grid-lines-003.html.ini deleted file mode 100644 index 31dac385fcc..00000000000 --- a/tests/wpt/meta/css/css-grid/grid-definition/grid-support-named-grid-lines-003.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[grid-support-named-grid-lines-003.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/grid-model/grid-gutters-and-tracks-001.html.ini b/tests/wpt/meta/css/css-grid/grid-model/grid-gutters-and-tracks-001.html.ini index e2c0b2d0245..1dc84dab6d3 100644 --- a/tests/wpt/meta/css/css-grid/grid-model/grid-gutters-and-tracks-001.html.ini +++ b/tests/wpt/meta/css/css-grid/grid-model/grid-gutters-and-tracks-001.html.ini @@ -1,15 +1,9 @@ [grid-gutters-and-tracks-001.html] - [.grid 7] - expected: FAIL - [.grid 8] expected: FAIL [.grid 12] expected: FAIL - [.grid 13] - expected: FAIL - [.grid 17] expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/grid-model/grid-gutters-as-percentage-001.html.ini b/tests/wpt/meta/css/css-grid/grid-model/grid-gutters-as-percentage-001.html.ini index 8375a5d9912..1a3c14993d2 100644 --- a/tests/wpt/meta/css/css-grid/grid-model/grid-gutters-as-percentage-001.html.ini +++ b/tests/wpt/meta/css/css-grid/grid-model/grid-gutters-as-percentage-001.html.ini @@ -8,9 +8,6 @@ [.grid 9] expected: FAIL - [.grid 12] - expected: FAIL - [.grid 15] expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/layout-algorithm/grid-flex-track-intrinsic-sizes-002.html.ini b/tests/wpt/meta/css/css-grid/layout-algorithm/grid-flex-track-intrinsic-sizes-002.html.ini deleted file mode 100644 index 1518f246042..00000000000 --- a/tests/wpt/meta/css/css-grid/layout-algorithm/grid-flex-track-intrinsic-sizes-002.html.ini +++ /dev/null @@ -1,15 +0,0 @@ -[grid-flex-track-intrinsic-sizes-002.html] - ['grid' with: grid-template-columns: 1fr auto auto auto; and grid-template-rows: 1fr auto auto auto;] - expected: FAIL - - ['grid' with: grid-template-columns: minmax(0, 1fr) auto auto auto; and grid-template-rows: minmax(0, 1fr) auto auto auto;] - expected: FAIL - - ['grid' with: grid-template-columns: 1fr 1fr 1fr 1fr; and grid-template-rows: 1fr 1fr 1fr 1fr;] - expected: FAIL - - ['grid' with: grid-template-columns: 1fr 1fr 1fr 4fr; and grid-template-rows: 1fr 1fr 1fr 4fr;] - expected: FAIL - - ['grid' with: grid-template-columns: 1fr 1fr 1fr; and grid-template-rows: 1fr 1fr 1fr;] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/masonry/tentative/grid-placement/masonry-grid-placement-named-lines-002.html.ini b/tests/wpt/meta/css/css-grid/masonry/tentative/grid-placement/masonry-grid-placement-named-lines-002.html.ini index 9a9d7d63261..3883a104e47 100644 --- a/tests/wpt/meta/css/css-grid/masonry/tentative/grid-placement/masonry-grid-placement-named-lines-002.html.ini +++ b/tests/wpt/meta/css/css-grid/masonry/tentative/grid-placement/masonry-grid-placement-named-lines-002.html.ini @@ -1,2 +1,2 @@ [masonry-grid-placement-named-lines-002.html] - expected: CRASH + expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/parsing/grid-template-columns-computed-withcontent.html.ini b/tests/wpt/meta/css/css-grid/parsing/grid-template-columns-computed-withcontent.html.ini index d178f659bf9..030012397fe 100644 --- a/tests/wpt/meta/css/css-grid/parsing/grid-template-columns-computed-withcontent.html.ini +++ b/tests/wpt/meta/css/css-grid/parsing/grid-template-columns-computed-withcontent.html.ini @@ -1,74 +1,19 @@ [grid-template-columns-computed-withcontent.html] - expected: CRASH - [Property grid-template-columns value 'none'] - expected: FAIL - - [Property grid-template-columns value '20%'] - expected: FAIL - - [Property grid-template-columns value 'calc(-0.5em + 10px)'] - expected: FAIL - - [Property grid-template-columns value 'calc(0.5em + 10px)'] - expected: FAIL - [Property grid-template-columns value 'calc(30% + 40px)'] expected: FAIL - [Property grid-template-columns value '5fr'] - expected: FAIL - - [Property grid-template-columns value 'min-content'] - expected: FAIL - - [Property grid-template-columns value 'max-content'] - expected: FAIL - - [Property grid-template-columns value 'auto'] - expected: FAIL - - [Property grid-template-columns value 'minmax(10px, auto)'] - expected: FAIL - - [Property grid-template-columns value 'minmax(20%, max-content)'] - expected: FAIL - [Property grid-template-columns value 'minmax(min-content, calc(-0.5em + 10px))'] expected: FAIL [Property grid-template-columns value 'minmax(auto, 0)'] expected: FAIL - [Property grid-template-columns value 'fit-content(70px)'] - expected: FAIL - - [Property grid-template-columns value 'fit-content(20%)'] - expected: FAIL - - [Property grid-template-columns value 'fit-content(calc(-0.5em + 10px))'] - expected: FAIL - - [Property grid-template-columns value 'repeat(1, 10px)'] - expected: FAIL - [Property grid-template-columns value 'repeat(1, [one two\] 20%)'] expected: FAIL - [Property grid-template-columns value 'repeat(2, minmax(10px, auto))'] - expected: FAIL - [Property grid-template-columns value 'repeat(2, fit-content(20%) [three four\] 30px 40px [five six\])'] expected: FAIL - [Property grid-template-columns value 'min-content repeat(5, minmax(10px, auto))'] - expected: FAIL - - [Property grid-template-columns value '[\] 150px [\] 1fr [\]'] - expected: FAIL - - [Property grid-template-columns value 'repeat(auto-fill, 200px)'] - expected: FAIL - [Property grid-template-columns value 'repeat(auto-fit, [one\] 20%)'] expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/parsing/grid-template-columns-computed.html.ini b/tests/wpt/meta/css/css-grid/parsing/grid-template-columns-computed.html.ini index 8b9b4fad06a..0e40a08f0c1 100644 --- a/tests/wpt/meta/css/css-grid/parsing/grid-template-columns-computed.html.ini +++ b/tests/wpt/meta/css/css-grid/parsing/grid-template-columns-computed.html.ini @@ -1,11 +1,4 @@ [grid-template-columns-computed.html] - expected: CRASH - [Property grid-template-columns value 'none'] - expected: FAIL - - [Property grid-template-columns value '1px'] - expected: FAIL - [Property grid-template-columns value '1px [a\]'] expected: FAIL @@ -18,15 +11,6 @@ [Property grid-template-columns value '[a\] 1px [b\]'] expected: FAIL - [Property grid-template-columns value '1px repeat(1, 2px) 3px'] - expected: FAIL - - [Property grid-template-columns value '1px repeat(auto-fill, 2px) 3px'] - expected: FAIL - - [Property grid-template-columns value '1px repeat(auto-fit, 2px) 3px'] - expected: FAIL - [Property grid-template-columns value '1px [a\] repeat(1, 2px 3px) [b\] 4px'] expected: FAIL @@ -71,3 +55,6 @@ [Property grid-template-columns value '[a\] 1em repeat(auto-fit, 2em [b\] 3em) 4em [d\]'] expected: FAIL + + [Property grid-template-columns value 'repeat(calc(1 + 3 * sign(100em - 1px)), 150px)'] + expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/parsing/grid-template-rows-computed-implicit-track.html.ini b/tests/wpt/meta/css/css-grid/parsing/grid-template-rows-computed-implicit-track.html.ini index 57c99cca8fe..2e0b12f0a9d 100644 --- a/tests/wpt/meta/css/css-grid/parsing/grid-template-rows-computed-implicit-track.html.ini +++ b/tests/wpt/meta/css/css-grid/parsing/grid-template-rows-computed-implicit-track.html.ini @@ -1,11 +1,7 @@ [grid-template-rows-computed-implicit-track.html] - expected: CRASH [Property grid-template-rows value 'none' computes to '10px'] expected: FAIL - [Property grid-template-rows value '1px' computes to '10px 1px'] - expected: FAIL - [Property grid-template-rows value '1px [a\]' computes to '10px 1px [a\]'] expected: FAIL @@ -18,15 +14,6 @@ [Property grid-template-rows value '[a\] 1px [b\]' computes to '10px [a\] 1px [b\]'] expected: FAIL - [Property grid-template-rows value '1px repeat(1, 2px) 3px' computes to '10px 1px 2px 3px'] - expected: FAIL - - [Property grid-template-rows value '1px repeat(auto-fill, 2px) 3px' computes to '10px 1px 2px 3px'] - expected: FAIL - - [Property grid-template-rows value '1px repeat(auto-fit, 2px) 3px' computes to '10px 1px 0px 3px'] - expected: FAIL - [Property grid-template-rows value '1px [a\] repeat(1, 2px 3px) [b\] 4px' computes to '10px 1px [a\] 2px 3px [b\] 4px'] expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/parsing/grid-template-rows-computed.html.ini b/tests/wpt/meta/css/css-grid/parsing/grid-template-rows-computed.html.ini index d305505c691..c1dbc587092 100644 --- a/tests/wpt/meta/css/css-grid/parsing/grid-template-rows-computed.html.ini +++ b/tests/wpt/meta/css/css-grid/parsing/grid-template-rows-computed.html.ini @@ -1,11 +1,4 @@ [grid-template-rows-computed.html] - expected: CRASH - [Property grid-template-rows value 'none'] - expected: FAIL - - [Property grid-template-rows value '1px'] - expected: FAIL - [Property grid-template-rows value '1px [a\]'] expected: FAIL @@ -18,15 +11,6 @@ [Property grid-template-rows value '[a\] 1px [b\]'] expected: FAIL - [Property grid-template-rows value '1px repeat(1, 2px) 3px'] - expected: FAIL - - [Property grid-template-rows value '1px repeat(auto-fill, 2px) 3px'] - expected: FAIL - - [Property grid-template-rows value '1px repeat(auto-fit, 2px) 3px'] - expected: FAIL - [Property grid-template-rows value '1px [a\] repeat(1, 2px 3px) [b\] 4px'] expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/placement/grid-placement-using-named-grid-lines-001.html.ini b/tests/wpt/meta/css/css-grid/placement/grid-placement-using-named-grid-lines-001.html.ini deleted file mode 100644 index dec14955805..00000000000 --- a/tests/wpt/meta/css/css-grid/placement/grid-placement-using-named-grid-lines-001.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[grid-placement-using-named-grid-lines-001.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/placement/grid-placement-using-named-grid-lines-002.html.ini b/tests/wpt/meta/css/css-grid/placement/grid-placement-using-named-grid-lines-002.html.ini deleted file mode 100644 index b57d92fd5f9..00000000000 --- a/tests/wpt/meta/css/css-grid/placement/grid-placement-using-named-grid-lines-002.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[grid-placement-using-named-grid-lines-002.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/placement/grid-placement-using-named-grid-lines-003.html.ini b/tests/wpt/meta/css/css-grid/placement/grid-placement-using-named-grid-lines-003.html.ini deleted file mode 100644 index ed32e5e31dd..00000000000 --- a/tests/wpt/meta/css/css-grid/placement/grid-placement-using-named-grid-lines-003.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[grid-placement-using-named-grid-lines-003.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/placement/grid-placement-using-named-grid-lines-006.html.ini b/tests/wpt/meta/css/css-grid/placement/grid-placement-using-named-grid-lines-006.html.ini deleted file mode 100644 index bfd761d9be8..00000000000 --- a/tests/wpt/meta/css/css-grid/placement/grid-placement-using-named-grid-lines-006.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[grid-placement-using-named-grid-lines-006.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/placement/grid-placement-using-named-grid-lines-009.html.ini b/tests/wpt/meta/css/css-grid/placement/grid-placement-using-named-grid-lines-009.html.ini deleted file mode 100644 index 0c449181721..00000000000 --- a/tests/wpt/meta/css/css-grid/placement/grid-placement-using-named-grid-lines-009.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[grid-placement-using-named-grid-lines-009.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/subgrid/line-names-001.html.ini b/tests/wpt/meta/css/css-grid/subgrid/line-names-001.html.ini index 209ebfe257f..fbfa0be6562 100644 --- a/tests/wpt/meta/css/css-grid/subgrid/line-names-001.html.ini +++ b/tests/wpt/meta/css/css-grid/subgrid/line-names-001.html.ini @@ -1,2 +1,2 @@ [line-names-001.html] - expected: CRASH + expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/subgrid/line-names-002.html.ini b/tests/wpt/meta/css/css-grid/subgrid/line-names-002.html.ini deleted file mode 100644 index 059132230f6..00000000000 --- a/tests/wpt/meta/css/css-grid/subgrid/line-names-002.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[line-names-002.html] - expected: CRASH diff --git a/tests/wpt/meta/css/css-grid/subgrid/line-names-003.html.ini b/tests/wpt/meta/css/css-grid/subgrid/line-names-003.html.ini deleted file mode 100644 index 2d126e04a6b..00000000000 --- a/tests/wpt/meta/css/css-grid/subgrid/line-names-003.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[line-names-003.html] - expected: CRASH diff --git a/tests/wpt/meta/css/css-grid/subgrid/line-names-004.html.ini b/tests/wpt/meta/css/css-grid/subgrid/line-names-004.html.ini index 80e497391ae..2096ce9ab65 100644 --- a/tests/wpt/meta/css/css-grid/subgrid/line-names-004.html.ini +++ b/tests/wpt/meta/css/css-grid/subgrid/line-names-004.html.ini @@ -1,2 +1,2 @@ [line-names-004.html] - expected: CRASH + expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/subgrid/line-names-005.html.ini b/tests/wpt/meta/css/css-grid/subgrid/line-names-005.html.ini index de48d73d98d..4becd791199 100644 --- a/tests/wpt/meta/css/css-grid/subgrid/line-names-005.html.ini +++ b/tests/wpt/meta/css/css-grid/subgrid/line-names-005.html.ini @@ -1,2 +1,2 @@ [line-names-005.html] - expected: CRASH + expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/subgrid/line-names-009.html.ini b/tests/wpt/meta/css/css-grid/subgrid/line-names-009.html.ini index 28d5d655317..49e7f04307f 100644 --- a/tests/wpt/meta/css/css-grid/subgrid/line-names-009.html.ini +++ b/tests/wpt/meta/css/css-grid/subgrid/line-names-009.html.ini @@ -1,2 +1,2 @@ [line-names-009.html] - expected: CRASH + expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/subgrid/line-names-014.html.ini b/tests/wpt/meta/css/css-grid/subgrid/line-names-014.html.ini deleted file mode 100644 index 4c1cfd6bc3c..00000000000 --- a/tests/wpt/meta/css/css-grid/subgrid/line-names-014.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[line-names-014.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/subgrid/line-names-015.html.ini b/tests/wpt/meta/css/css-grid/subgrid/line-names-015.html.ini deleted file mode 100644 index d7cb6aaa099..00000000000 --- a/tests/wpt/meta/css/css-grid/subgrid/line-names-015.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[line-names-015.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/subgrid/parent-repeat-auto-fit-001.html.ini b/tests/wpt/meta/css/css-grid/subgrid/parent-repeat-auto-fit-001.html.ini index 39552849b69..e133dc715ee 100644 --- a/tests/wpt/meta/css/css-grid/subgrid/parent-repeat-auto-fit-001.html.ini +++ b/tests/wpt/meta/css/css-grid/subgrid/parent-repeat-auto-fit-001.html.ini @@ -1,2 +1,2 @@ [parent-repeat-auto-fit-001.html] - expected: CRASH + expected: FAIL diff --git a/tests/wpt/meta/css/css-grid/subgrid/parent-repeat-auto-fit-002.html.ini b/tests/wpt/meta/css/css-grid/subgrid/parent-repeat-auto-fit-002.html.ini index e61f8d2ea46..f654157e92f 100644 --- a/tests/wpt/meta/css/css-grid/subgrid/parent-repeat-auto-fit-002.html.ini +++ b/tests/wpt/meta/css/css-grid/subgrid/parent-repeat-auto-fit-002.html.ini @@ -1,2 +1,2 @@ [parent-repeat-auto-fit-002.html] - expected: CRASH + expected: FAIL