diff --git a/components/layout_2020/table/layout.rs b/components/layout_2020/table/layout.rs index 92628918137..a5d5a9d1014 100644 --- a/components/layout_2020/table/layout.rs +++ b/components/layout_2020/table/layout.rs @@ -5,6 +5,7 @@ use app_units::{Au, MAX_AU}; use euclid::num::Zero; use log::warn; +use style::computed_values::border_collapse::T as BorderCollapse; use style::logical_geometry::WritingMode; use style::values::computed::{CSSPixelLength, Length, LengthOrAuto, Percentage}; use style::values::generics::length::GenericLengthPercentageOrAuto::{Auto, LengthPercentage}; @@ -335,6 +336,7 @@ impl<'a> TableLayout<'a> { ) -> (usize, Vec) { let mut next_span_n = usize::MAX; let mut new_content_sizes_for_columns = Vec::new(); + let border_spacing = self.table.border_spacing(); for column_index in 0..self.table.size.width { let old_column_measure = &old_column_measures[column_index]; @@ -368,7 +370,6 @@ impl<'a> TableLayout<'a> { }, ); - // TODO: Take into account border spacing. let old_column_content_size = old_column_measure.content_sizes; // > **min-content width of a column based on cells of span up to N (N > 1)** @@ -388,8 +389,7 @@ impl<'a> TableLayout<'a> { // > 2. Define the baseline border spacing as the sum of the horizontal // > border-spacing for any columns spanned by the cell, other than the one in // > which the cell originates. - // - // TODO: Take into account border spacing. + let baseline_border_spacing = border_spacing.inline * (n as i32 - 1); // > 3. The contribution of the cell is the sum of: // > a. the min-content width of the column based on cells of span up to N-1 @@ -407,8 +407,6 @@ impl<'a> TableLayout<'a> { // > min-content width and the baseline border spacing, clamped to be // > at least 0 and at most the difference between the baseline // > max-content width and the baseline min-content width - // - // TODO: Take into account border spacing. let old_content_size_difference = old_column_content_size.max_content - old_column_content_size.min_content; let baseline_difference = baseline_min_content_width - baseline_max_content_width; @@ -419,7 +417,8 @@ impl<'a> TableLayout<'a> { b = 0.0; } let b = (cell_inline_content_sizes.min_content - - baseline_content_sizes.min_content) + baseline_content_sizes.min_content - + baseline_border_spacing) .clamp_between_extremums(Au::zero(), Some(baseline_difference)) .scale_by(b); @@ -430,7 +429,8 @@ impl<'a> TableLayout<'a> { // > max-content width and baseline border spacing, or 0 if this is // > negative let c = (cell_inline_content_sizes.min_content - - baseline_content_sizes.max_content) + baseline_content_sizes.max_content - + baseline_border_spacing) .min(Au::zero()) .scale_by( old_column_content_size.max_content.to_f32_px() / @@ -454,7 +454,7 @@ impl<'a> TableLayout<'a> { // > border-spacing for any columns spanned by the cell, other than the one in // > which the cell originates. // - // TODO: Take into account. border spacing. + // This is calculated above for min-content width. // > 3. The contribution of the cell is the sum of: // > a. the max-content width of the column based on cells of span up to N-1 @@ -469,10 +469,9 @@ impl<'a> TableLayout<'a> { // > 2. the outer max-content width of the cell minus the baseline // > max-content width and the baseline border spacing, or 0 if this // > is negative - // - // TODO: Take into account. border spacing. let b_2 = (cell_inline_content_sizes.max_content - - baseline_content_sizes.max_content) + baseline_content_sizes.max_content - + baseline_border_spacing) .min(Au::zero()); let b = b_2.scale_by(b_1); let new_column_max_content_width = a + b + c; @@ -542,12 +541,17 @@ impl<'a> TableLayout<'a> { // https://drafts.csswg.org/css-tables/#gridmax: // > The row/column-grid width maximum (GRIDMAX) width is the sum of the max-content width of // > all the columns plus cell spacing or borders. - let grid_min_and_max = self + + let mut grid_min_and_max = self .column_measures .iter() .fold(ContentSizes::zero(), |result, measure| { result + measure.content_sizes }); + let border_spacing = self.table.border_spacing(); + let inline_border_spacing = border_spacing.inline * (self.table.size.width as i32 + 1); + grid_min_and_max.min_content += inline_border_spacing; + grid_min_and_max.max_content += inline_border_spacing; self.pbm = self.table.style.padding_border_margin(containing_block); let content_box_size = self @@ -583,7 +587,10 @@ impl<'a> TableLayout<'a> { .max(used_min_width_of_table), }; - self.assignable_width = used_width_of_table; + // > The assignable table width is the used width of the table minus the total horizontal + // > border spacing (if any). This is the width that we will be able to allocate to the + // > columns. + self.assignable_width = used_width_of_table - inline_border_spacing; } /// Distribute width to columns, performing step 2.4 of table layout from @@ -972,10 +979,11 @@ impl<'a> TableLayout<'a> { assert_eq!(self.table.size.height, self.row_sizes.len()); assert_eq!(self.table.size.width, self.distributed_column_widths.len()); + let border_spacing = self.table.border_spacing(); let mut fragments = Vec::new(); - let mut row_offset = Au::zero(); + let mut row_offset = border_spacing.block; for row_index in 0..self.table.size.height { - let mut column_offset = Au::zero(); + let mut column_offset = border_spacing.inline; let row_size = self.row_sizes[row_index]; for column_index in 0..self.table.size.width { @@ -1010,10 +1018,10 @@ impl<'a> TableLayout<'a> { positioning_context, ))); - column_offset += column_size; + column_offset += column_size + border_spacing.inline; } - row_offset += row_size; + row_offset += row_size + border_spacing.block; } (fragments, row_offset) @@ -1021,6 +1029,18 @@ impl<'a> TableLayout<'a> { } impl Table { + fn border_spacing(&self) -> LogicalVec2 { + if self.style.clone_border_collapse() == BorderCollapse::Collapse { + LogicalVec2::zero() + } else { + let border_spacing = self.style.clone_border_spacing(); + LogicalVec2 { + inline: border_spacing.horizontal(), + block: border_spacing.vertical(), + } + } + } + fn inline_content_sizes_for_cell_at( &self, coords: TableSlotCoordinates, diff --git a/components/style/properties/longhands/inherited_table.mako.rs b/components/style/properties/longhands/inherited_table.mako.rs index 9eba882c345..a720c33f47e 100644 --- a/components/style/properties/longhands/inherited_table.mako.rs +++ b/components/style/properties/longhands/inherited_table.mako.rs @@ -44,7 +44,6 @@ ${helpers.predefined_type( "BorderSpacing", "computed::BorderSpacing::zero()", engines="gecko servo", - servo_pref="layout.legacy_layout", animation_value_type="BorderSpacing", boxed=True, spec="https://drafts.csswg.org/css-tables/#propdef-border-spacing", diff --git a/tests/wpt/meta/css/CSS2/floats-clear/floats-153.xht.ini b/tests/wpt/meta/css/CSS2/floats-clear/floats-153.xht.ini deleted file mode 100644 index 8feb591dc7d..00000000000 --- a/tests/wpt/meta/css/CSS2/floats-clear/floats-153.xht.ini +++ /dev/null @@ -1,2 +0,0 @@ -[floats-153.xht] - expected: FAIL diff --git a/tests/wpt/meta/css/CSS2/tables/border-collapse-offset-001.xht.ini b/tests/wpt/meta/css/CSS2/tables/border-collapse-offset-001.xht.ini new file mode 100644 index 00000000000..5eb08879f5d --- /dev/null +++ b/tests/wpt/meta/css/CSS2/tables/border-collapse-offset-001.xht.ini @@ -0,0 +1,2 @@ +[border-collapse-offset-001.xht] + expected: FAIL diff --git a/tests/wpt/meta/css/CSS2/tables/separated-border-model-004a.xht.ini b/tests/wpt/meta/css/CSS2/tables/separated-border-model-004a.xht.ini deleted file mode 100644 index 81b492ba93c..00000000000 --- a/tests/wpt/meta/css/CSS2/tables/separated-border-model-004a.xht.ini +++ /dev/null @@ -1,2 +0,0 @@ -[separated-border-model-004a.xht] - expected: FAIL diff --git a/tests/wpt/meta/css/CSS2/tables/separated-border-model-004b.xht.ini b/tests/wpt/meta/css/CSS2/tables/separated-border-model-004b.xht.ini deleted file mode 100644 index 4e9cd35b5aa..00000000000 --- a/tests/wpt/meta/css/CSS2/tables/separated-border-model-004b.xht.ini +++ /dev/null @@ -1,2 +0,0 @@ -[separated-border-model-004b.xht] - expected: FAIL diff --git a/tests/wpt/meta/css/CSS2/tables/separated-border-model-007.xht.ini b/tests/wpt/meta/css/CSS2/tables/separated-border-model-007.xht.ini new file mode 100644 index 00000000000..4212826241c --- /dev/null +++ b/tests/wpt/meta/css/CSS2/tables/separated-border-model-007.xht.ini @@ -0,0 +1,2 @@ +[separated-border-model-007.xht] + expected: FAIL diff --git a/tests/wpt/meta/css/CSS2/tables/separated-border-model-008.xht.ini b/tests/wpt/meta/css/CSS2/tables/separated-border-model-008.xht.ini new file mode 100644 index 00000000000..7535b349492 --- /dev/null +++ b/tests/wpt/meta/css/CSS2/tables/separated-border-model-008.xht.ini @@ -0,0 +1,2 @@ +[separated-border-model-008.xht] + expected: FAIL diff --git a/tests/wpt/meta/css/CSS2/tables/separated-border-model-009.xht.ini b/tests/wpt/meta/css/CSS2/tables/separated-border-model-009.xht.ini new file mode 100644 index 00000000000..2a6b14fa145 --- /dev/null +++ b/tests/wpt/meta/css/CSS2/tables/separated-border-model-009.xht.ini @@ -0,0 +1,2 @@ +[separated-border-model-009.xht] + expected: FAIL diff --git a/tests/wpt/meta/css/CSS2/tables/table-backgrounds-bs-cell-001.xht.ini b/tests/wpt/meta/css/CSS2/tables/table-backgrounds-bs-cell-001.xht.ini deleted file mode 100644 index e754c500942..00000000000 --- a/tests/wpt/meta/css/CSS2/tables/table-backgrounds-bs-cell-001.xht.ini +++ /dev/null @@ -1,2 +0,0 @@ -[table-backgrounds-bs-cell-001.xht] - expected: FAIL diff --git a/tests/wpt/meta/css/CSS2/tables/table-margin-004.xht.ini b/tests/wpt/meta/css/CSS2/tables/table-margin-004.xht.ini deleted file mode 100644 index bee23241ac5..00000000000 --- a/tests/wpt/meta/css/CSS2/tables/table-margin-004.xht.ini +++ /dev/null @@ -1,2 +0,0 @@ -[table-margin-004.xht] - expected: FAIL diff --git a/tests/wpt/meta/css/css-tables/absolute-tables-003.html.ini b/tests/wpt/meta/css/css-tables/absolute-tables-003.html.ini index 50d4d15e05c..63d0e9bc392 100644 --- a/tests/wpt/meta/css/css-tables/absolute-tables-003.html.ini +++ b/tests/wpt/meta/css/css-tables/absolute-tables-003.html.ini @@ -1,10 +1,4 @@ [absolute-tables-003.html] - [.table 1] - expected: FAIL - - [.table 2] - expected: FAIL - [.table 3] expected: FAIL diff --git a/tests/wpt/meta/css/css-tables/animations/border-spacing-interpolation.html.ini b/tests/wpt/meta/css/css-tables/animations/border-spacing-interpolation.html.ini index f5c1bb8027f..d9561355dad 100644 --- a/tests/wpt/meta/css/css-tables/animations/border-spacing-interpolation.html.ini +++ b/tests/wpt/meta/css/css-tables/animations/border-spacing-interpolation.html.ini @@ -1,58 +1,4 @@ [border-spacing-interpolation.html] - [CSS Transitions: property from neutral to [20px\] at (-0.3) should be [7px 7px\]] - expected: FAIL - - [CSS Transitions: property from neutral to [20px\] at (0) should be [10px 10px\]] - expected: FAIL - - [CSS Transitions: property from neutral to [20px\] at (0.3) should be [13px 13px\]] - expected: FAIL - - [CSS Transitions: property from neutral to [20px\] at (0.6) should be [16px 16px\]] - expected: FAIL - - [CSS Transitions: property from neutral to [20px\] at (1) should be [20px 20px\]] - expected: FAIL - - [CSS Transitions: property from neutral to [20px\] at (1.5) should be [25px 25px\]] - expected: FAIL - - [CSS Transitions with transition: all: property from neutral to [20px\] at (-0.3) should be [7px 7px\]] - expected: FAIL - - [CSS Transitions with transition: all: property from neutral to [20px\] at (0) should be [10px 10px\]] - expected: FAIL - - [CSS Transitions with transition: all: property from neutral to [20px\] at (0.3) should be [13px 13px\]] - expected: FAIL - - [CSS Transitions with transition: all: property from neutral to [20px\] at (0.6) should be [16px 16px\]] - expected: FAIL - - [CSS Transitions with transition: all: property from neutral to [20px\] at (1) should be [20px 20px\]] - expected: FAIL - - [CSS Transitions with transition: all: property from neutral to [20px\] at (1.5) should be [25px 25px\]] - expected: FAIL - - [CSS Animations: property from neutral to [20px\] at (-0.3) should be [7px 7px\]] - expected: FAIL - - [CSS Animations: property from neutral to [20px\] at (0) should be [10px 10px\]] - expected: FAIL - - [CSS Animations: property from neutral to [20px\] at (0.3) should be [13px 13px\]] - expected: FAIL - - [CSS Animations: property from neutral to [20px\] at (0.6) should be [16px 16px\]] - expected: FAIL - - [CSS Animations: property from neutral to [20px\] at (1) should be [20px 20px\]] - expected: FAIL - - [CSS Animations: property from neutral to [20px\] at (1.5) should be [25px 25px\]] - expected: FAIL - [Web Animations: property from neutral to [20px\] at (-0.3) should be [7px 7px\]] expected: FAIL @@ -71,60 +17,6 @@ [Web Animations: property from neutral to [20px\] at (1.5) should be [25px 25px\]] expected: FAIL - [CSS Transitions: property from [initial\] to [20px\] at (-0.3) should be [0px 0px\]] - expected: FAIL - - [CSS Transitions: property from [initial\] to [20px\] at (0) should be [0px 0px\]] - expected: FAIL - - [CSS Transitions: property from [initial\] to [20px\] at (0.3) should be [6px 6px\]] - expected: FAIL - - [CSS Transitions: property from [initial\] to [20px\] at (0.6) should be [12px 12px\]] - expected: FAIL - - [CSS Transitions: property from [initial\] to [20px\] at (1) should be [20px 20px\]] - expected: FAIL - - [CSS Transitions: property from [initial\] to [20px\] at (1.5) should be [30px 30px\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [initial\] to [20px\] at (-0.3) should be [0px 0px\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [initial\] to [20px\] at (0) should be [0px 0px\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [initial\] to [20px\] at (0.3) should be [6px 6px\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [initial\] to [20px\] at (0.6) should be [12px 12px\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [initial\] to [20px\] at (1) should be [20px 20px\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [initial\] to [20px\] at (1.5) should be [30px 30px\]] - expected: FAIL - - [CSS Animations: property from [initial\] to [20px\] at (-0.3) should be [0px 0px\]] - expected: FAIL - - [CSS Animations: property from [initial\] to [20px\] at (0) should be [0px 0px\]] - expected: FAIL - - [CSS Animations: property from [initial\] to [20px\] at (0.3) should be [6px 6px\]] - expected: FAIL - - [CSS Animations: property from [initial\] to [20px\] at (0.6) should be [12px 12px\]] - expected: FAIL - - [CSS Animations: property from [initial\] to [20px\] at (1) should be [20px 20px\]] - expected: FAIL - - [CSS Animations: property from [initial\] to [20px\] at (1.5) should be [30px 30px\]] - expected: FAIL - [Web Animations: property from [initial\] to [20px\] at (-0.3) should be [0px 0px\]] expected: FAIL @@ -143,60 +35,6 @@ [Web Animations: property from [initial\] to [20px\] at (1.5) should be [30px 30px\]] expected: FAIL - [CSS Transitions: property from [inherit\] to [20px\] at (-0.3) should be [33px 33px\]] - expected: FAIL - - [CSS Transitions: property from [inherit\] to [20px\] at (0) should be [30px 30px\]] - expected: FAIL - - [CSS Transitions: property from [inherit\] to [20px\] at (0.3) should be [27px 27px\]] - expected: FAIL - - [CSS Transitions: property from [inherit\] to [20px\] at (0.6) should be [24px 24px\]] - expected: FAIL - - [CSS Transitions: property from [inherit\] to [20px\] at (1) should be [20px 20px\]] - expected: FAIL - - [CSS Transitions: property from [inherit\] to [20px\] at (1.5) should be [15px 15px\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [inherit\] to [20px\] at (-0.3) should be [33px 33px\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [inherit\] to [20px\] at (0) should be [30px 30px\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [inherit\] to [20px\] at (0.3) should be [27px 27px\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [inherit\] to [20px\] at (0.6) should be [24px 24px\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [inherit\] to [20px\] at (1) should be [20px 20px\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [inherit\] to [20px\] at (1.5) should be [15px 15px\]] - expected: FAIL - - [CSS Animations: property from [inherit\] to [20px\] at (-0.3) should be [33px 33px\]] - expected: FAIL - - [CSS Animations: property from [inherit\] to [20px\] at (0) should be [30px 30px\]] - expected: FAIL - - [CSS Animations: property from [inherit\] to [20px\] at (0.3) should be [27px 27px\]] - expected: FAIL - - [CSS Animations: property from [inherit\] to [20px\] at (0.6) should be [24px 24px\]] - expected: FAIL - - [CSS Animations: property from [inherit\] to [20px\] at (1) should be [20px 20px\]] - expected: FAIL - - [CSS Animations: property from [inherit\] to [20px\] at (1.5) should be [15px 15px\]] - expected: FAIL - [Web Animations: property from [inherit\] to [20px\] at (-0.3) should be [33px 33px\]] expected: FAIL @@ -215,60 +53,6 @@ [Web Animations: property from [inherit\] to [20px\] at (1.5) should be [15px 15px\]] expected: FAIL - [CSS Transitions: property from [unset\] to [20px\] at (-0.3) should be [33px 33px\]] - expected: FAIL - - [CSS Transitions: property from [unset\] to [20px\] at (0) should be [30px 30px\]] - expected: FAIL - - [CSS Transitions: property from [unset\] to [20px\] at (0.3) should be [27px 27px\]] - expected: FAIL - - [CSS Transitions: property from [unset\] to [20px\] at (0.6) should be [24px 24px\]] - expected: FAIL - - [CSS Transitions: property from [unset\] to [20px\] at (1) should be [20px 20px\]] - expected: FAIL - - [CSS Transitions: property from [unset\] to [20px\] at (1.5) should be [15px 15px\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [unset\] to [20px\] at (-0.3) should be [33px 33px\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [unset\] to [20px\] at (0) should be [30px 30px\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [unset\] to [20px\] at (0.3) should be [27px 27px\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [unset\] to [20px\] at (0.6) should be [24px 24px\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [unset\] to [20px\] at (1) should be [20px 20px\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [unset\] to [20px\] at (1.5) should be [15px 15px\]] - expected: FAIL - - [CSS Animations: property from [unset\] to [20px\] at (-0.3) should be [33px 33px\]] - expected: FAIL - - [CSS Animations: property from [unset\] to [20px\] at (0) should be [30px 30px\]] - expected: FAIL - - [CSS Animations: property from [unset\] to [20px\] at (0.3) should be [27px 27px\]] - expected: FAIL - - [CSS Animations: property from [unset\] to [20px\] at (0.6) should be [24px 24px\]] - expected: FAIL - - [CSS Animations: property from [unset\] to [20px\] at (1) should be [20px 20px\]] - expected: FAIL - - [CSS Animations: property from [unset\] to [20px\] at (1.5) should be [15px 15px\]] - expected: FAIL - [Web Animations: property from [unset\] to [20px\] at (-0.3) should be [33px 33px\]] expected: FAIL @@ -287,60 +71,6 @@ [Web Animations: property from [unset\] to [20px\] at (1.5) should be [15px 15px\]] expected: FAIL - [CSS Transitions: property from [0px\] to [10px\] at (-0.3) should be [0px 0px\]] - expected: FAIL - - [CSS Transitions: property from [0px\] to [10px\] at (0) should be [0px 0px\]] - expected: FAIL - - [CSS Transitions: property from [0px\] to [10px\] at (0.3) should be [3px 3px\]] - expected: FAIL - - [CSS Transitions: property from [0px\] to [10px\] at (0.6) should be [6px 6px\]] - expected: FAIL - - [CSS Transitions: property from [0px\] to [10px\] at (1) should be [10px 10px\]] - expected: FAIL - - [CSS Transitions: property from [0px\] to [10px\] at (1.5) should be [15px 15px\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [0px\] to [10px\] at (-0.3) should be [0px 0px\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [0px\] to [10px\] at (0) should be [0px 0px\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [0px\] to [10px\] at (0.3) should be [3px 3px\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [0px\] to [10px\] at (0.6) should be [6px 6px\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [0px\] to [10px\] at (1) should be [10px 10px\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [0px\] to [10px\] at (1.5) should be [15px 15px\]] - expected: FAIL - - [CSS Animations: property from [0px\] to [10px\] at (-0.3) should be [0px 0px\]] - expected: FAIL - - [CSS Animations: property from [0px\] to [10px\] at (0) should be [0px 0px\]] - expected: FAIL - - [CSS Animations: property from [0px\] to [10px\] at (0.3) should be [3px 3px\]] - expected: FAIL - - [CSS Animations: property from [0px\] to [10px\] at (0.6) should be [6px 6px\]] - expected: FAIL - - [CSS Animations: property from [0px\] to [10px\] at (1) should be [10px 10px\]] - expected: FAIL - - [CSS Animations: property from [0px\] to [10px\] at (1.5) should be [15px 15px\]] - expected: FAIL - [Web Animations: property from [0px\] to [10px\] at (-0.3) should be [0px 0px\]] expected: FAIL diff --git a/tests/wpt/meta/css/css-tables/auto-layout-calc-width-001.html.ini b/tests/wpt/meta/css/css-tables/auto-layout-calc-width-001.html.ini new file mode 100644 index 00000000000..fed12f24824 --- /dev/null +++ b/tests/wpt/meta/css/css-tables/auto-layout-calc-width-001.html.ini @@ -0,0 +1,3 @@ +[auto-layout-calc-width-001.html] + [#theTable 1] + expected: FAIL diff --git a/tests/wpt/meta/css/css-tables/border-collapse-dynamic-section.html.ini b/tests/wpt/meta/css/css-tables/border-collapse-dynamic-section.html.ini new file mode 100644 index 00000000000..faf6c2dcd8e --- /dev/null +++ b/tests/wpt/meta/css/css-tables/border-collapse-dynamic-section.html.ini @@ -0,0 +1,2 @@ +[border-collapse-dynamic-section.html] + expected: FAIL diff --git a/tests/wpt/meta/css/css-tables/bounding-box-computation-1.html.ini b/tests/wpt/meta/css/css-tables/bounding-box-computation-1.html.ini index d6fd984b971..884d05d6c38 100644 --- a/tests/wpt/meta/css/css-tables/bounding-box-computation-1.html.ini +++ b/tests/wpt/meta/css/css-tables/bounding-box-computation-1.html.ini @@ -1,7 +1,4 @@ [bounding-box-computation-1.html] - [Table-cell is 100px wide] - expected: FAIL - [Table-cell is 100px tall] expected: FAIL diff --git a/tests/wpt/meta/css/css-tables/bounding-box-computation-3.html.ini b/tests/wpt/meta/css/css-tables/bounding-box-computation-3.html.ini index 0ac3c94e14c..5283592a112 100644 --- a/tests/wpt/meta/css/css-tables/bounding-box-computation-3.html.ini +++ b/tests/wpt/meta/css/css-tables/bounding-box-computation-3.html.ini @@ -2,9 +2,6 @@ [Control test: Table width is 120px] expected: FAIL - [Control test: Table height is 120px] - expected: FAIL - [First (empty) table-row-group should be located at 10px left] expected: FAIL diff --git a/tests/wpt/meta/css/css-tables/column-track-merging.html.ini b/tests/wpt/meta/css/css-tables/column-track-merging.html.ini index ff35b117ec5..4a4c2714d9c 100644 --- a/tests/wpt/meta/css/css-tables/column-track-merging.html.ini +++ b/tests/wpt/meta/css/css-tables/column-track-merging.html.ini @@ -14,12 +14,6 @@ [main table 6] expected: FAIL - [main table 7] - expected: FAIL - - [main table 8] - expected: FAIL - [main table 10] expected: FAIL diff --git a/tests/wpt/meta/css/css-tables/fixed-layout-calc-width-001.html.ini b/tests/wpt/meta/css/css-tables/fixed-layout-calc-width-001.html.ini new file mode 100644 index 00000000000..6e16210b7cf --- /dev/null +++ b/tests/wpt/meta/css/css-tables/fixed-layout-calc-width-001.html.ini @@ -0,0 +1,3 @@ +[fixed-layout-calc-width-001.html] + [#theTable 1] + expected: FAIL diff --git a/tests/wpt/meta/css/css-tables/fixed-layout-excess-width-distribution-001.html.ini b/tests/wpt/meta/css/css-tables/fixed-layout-excess-width-distribution-001.html.ini new file mode 100644 index 00000000000..5d81ad8624d --- /dev/null +++ b/tests/wpt/meta/css/css-tables/fixed-layout-excess-width-distribution-001.html.ini @@ -0,0 +1,3 @@ +[fixed-layout-excess-width-distribution-001.html] + [#theTable 1] + expected: FAIL diff --git a/tests/wpt/meta/css/css-tables/fractional-percent-width.html.ini b/tests/wpt/meta/css/css-tables/fractional-percent-width.html.ini new file mode 100644 index 00000000000..b135a696409 --- /dev/null +++ b/tests/wpt/meta/css/css-tables/fractional-percent-width.html.ini @@ -0,0 +1,6 @@ +[fractional-percent-width.html] + [.cell 2] + expected: FAIL + + [.cell 3] + expected: FAIL diff --git a/tests/wpt/meta/css/css-tables/html5-table-formatting-3.html.ini b/tests/wpt/meta/css/css-tables/html5-table-formatting-3.html.ini index 6a5dbdf9b88..e075cb4c292 100644 --- a/tests/wpt/meta/css/css-tables/html5-table-formatting-3.html.ini +++ b/tests/wpt/meta/css/css-tables/html5-table-formatting-3.html.ini @@ -2,9 +2,6 @@ [Control test for table-cell padding and border-spacing, etc (width)] expected: FAIL - [Control test for table-cell padding and border-spacing (height)] - expected: FAIL - [Anonymous consecutive columns spanned by the same set of cells are merged] expected: FAIL @@ -14,9 +11,6 @@ [Explicitely-defined consecutive columns spanned by the same set of cells are not merged] expected: FAIL - [Explicitely-defined consecutive rows spanned by the same set of cells are not merged] - expected: FAIL - [Explicitely-defined consecutive columns spanned by the same set of cells are not merged, and cells span across border-spacing] expected: FAIL diff --git a/tests/wpt/meta/css/css-tables/html5-table-formatting-fixed-layout-1.html.ini b/tests/wpt/meta/css/css-tables/html5-table-formatting-fixed-layout-1.html.ini index 7675ca248fb..b466346e79d 100644 --- a/tests/wpt/meta/css/css-tables/html5-table-formatting-fixed-layout-1.html.ini +++ b/tests/wpt/meta/css/css-tables/html5-table-formatting-fixed-layout-1.html.ini @@ -1,6 +1,3 @@ [html5-table-formatting-fixed-layout-1.html] [Redundant columns of fixed-layout tables are not being merged] expected: FAIL - - [Redundant rows of fixed-layout tables are not being merged] - expected: FAIL diff --git a/tests/wpt/meta/css/css-tables/inheritance.html.ini b/tests/wpt/meta/css/css-tables/inheritance.html.ini index 0c16acc84b3..de530fe6947 100644 --- a/tests/wpt/meta/css/css-tables/inheritance.html.ini +++ b/tests/wpt/meta/css/css-tables/inheritance.html.ini @@ -8,9 +8,6 @@ [Property border-spacing has initial value 0px 0px] expected: FAIL - [Property border-spacing inherits] - expected: FAIL - [Property caption-side has initial value top] expected: FAIL diff --git a/tests/wpt/meta/css/css-tables/internal-containing-block-001.html.ini b/tests/wpt/meta/css/css-tables/internal-containing-block-001.html.ini new file mode 100644 index 00000000000..6694febf2dd --- /dev/null +++ b/tests/wpt/meta/css/css-tables/internal-containing-block-001.html.ini @@ -0,0 +1,2 @@ +[internal-containing-block-001.html] + expected: FAIL diff --git a/tests/wpt/meta/css/css-tables/parsing/border-spacing-computed.html.ini b/tests/wpt/meta/css/css-tables/parsing/border-spacing-computed.html.ini index 736543ce744..47de48119ec 100644 --- a/tests/wpt/meta/css/css-tables/parsing/border-spacing-computed.html.ini +++ b/tests/wpt/meta/css/css-tables/parsing/border-spacing-computed.html.ini @@ -1,12 +1,3 @@ [border-spacing-computed.html] - [Property border-spacing value '10px 20px'] - expected: FAIL - [Property border-spacing value '0'] expected: FAIL - - [Property border-spacing value 'calc(10px + 0.5em) calc(10px - 0.5em)'] - expected: FAIL - - [Property border-spacing value 'calc(10px - 0.5em) calc(10px + 0.5em)'] - expected: FAIL diff --git a/tests/wpt/meta/css/css-tables/parsing/border-spacing-valid.html.ini b/tests/wpt/meta/css/css-tables/parsing/border-spacing-valid.html.ini deleted file mode 100644 index 55fa9fab83f..00000000000 --- a/tests/wpt/meta/css/css-tables/parsing/border-spacing-valid.html.ini +++ /dev/null @@ -1,9 +0,0 @@ -[border-spacing-valid.html] - [e.style['border-spacing'\] = "0px" should set the property value] - expected: FAIL - - [e.style['border-spacing'\] = "10px 20px" should set the property value] - expected: FAIL - - [e.style['border-spacing'\] = "calc(10px + 0.5em) calc(10px - 0.5em)" should set the property value] - expected: FAIL diff --git a/tests/wpt/meta/css/css-tables/tentative/colspan-redistribution.html.ini b/tests/wpt/meta/css/css-tables/tentative/colspan-redistribution.html.ini index 00015d4a33b..60cfeb3eafd 100644 --- a/tests/wpt/meta/css/css-tables/tentative/colspan-redistribution.html.ini +++ b/tests/wpt/meta/css/css-tables/tentative/colspan-redistribution.html.ini @@ -11,9 +11,6 @@ [table 4] expected: FAIL - [table 5] - expected: FAIL - [table 6] expected: FAIL diff --git a/tests/wpt/meta/css/css-tables/tentative/table-width-redistribution-fixed-padding.html.ini b/tests/wpt/meta/css/css-tables/tentative/table-width-redistribution-fixed-padding.html.ini index 6fb3f132232..54341180381 100644 --- a/tests/wpt/meta/css/css-tables/tentative/table-width-redistribution-fixed-padding.html.ini +++ b/tests/wpt/meta/css/css-tables/tentative/table-width-redistribution-fixed-padding.html.ini @@ -5,9 +5,6 @@ [table 2] expected: FAIL - [table 3] - expected: FAIL - [table 4] expected: FAIL diff --git a/tests/wpt/meta/css/css-tables/tentative/table-width-redistribution-fixed.html.ini b/tests/wpt/meta/css/css-tables/tentative/table-width-redistribution-fixed.html.ini index 9b7b17a5961..c4cb48ce7bc 100644 --- a/tests/wpt/meta/css/css-tables/tentative/table-width-redistribution-fixed.html.ini +++ b/tests/wpt/meta/css/css-tables/tentative/table-width-redistribution-fixed.html.ini @@ -11,9 +11,6 @@ [table 5] expected: FAIL - [table 6] - expected: FAIL - [table 7] expected: FAIL @@ -53,18 +50,9 @@ [table 19] expected: FAIL - [table 20] - expected: FAIL - - [table 21] - expected: FAIL - [table 22] expected: FAIL - [table 23] - expected: FAIL - [table 24] expected: FAIL diff --git a/tests/wpt/meta/css/css-tables/tentative/table-width-redistribution.html.ini b/tests/wpt/meta/css/css-tables/tentative/table-width-redistribution.html.ini index ede3bbcf666..20e125a8e18 100644 --- a/tests/wpt/meta/css/css-tables/tentative/table-width-redistribution.html.ini +++ b/tests/wpt/meta/css/css-tables/tentative/table-width-redistribution.html.ini @@ -17,12 +17,6 @@ [table 6] expected: FAIL - [table 7] - expected: FAIL - - [table 8] - expected: FAIL - [table 9] expected: FAIL @@ -44,15 +38,6 @@ [table 15] expected: FAIL - [table 16] - expected: FAIL - - [table 17] - expected: FAIL - - [table 18] - expected: FAIL - [table 19] expected: FAIL diff --git a/tests/wpt/meta/css/css-tables/tentative/td-box-sizing-001.html.ini b/tests/wpt/meta/css/css-tables/tentative/td-box-sizing-001.html.ini index b4689e07a36..554b536e7b8 100644 --- a/tests/wpt/meta/css/css-tables/tentative/td-box-sizing-001.html.ini +++ b/tests/wpt/meta/css/css-tables/tentative/td-box-sizing-001.html.ini @@ -5,12 +5,6 @@ [table 2] expected: FAIL - [table 3] - expected: FAIL - - [table 4] - expected: FAIL - [table 5] expected: FAIL @@ -32,9 +26,6 @@ [table 11] expected: FAIL - [table 12] - expected: FAIL - [table 13] expected: FAIL diff --git a/tests/wpt/meta/css/css-tables/visibility-collapse-col-004-dynamic.html.ini b/tests/wpt/meta/css/css-tables/visibility-collapse-col-004-dynamic.html.ini index d943dbea69f..c5aaa6b0953 100644 --- a/tests/wpt/meta/css/css-tables/visibility-collapse-col-004-dynamic.html.ini +++ b/tests/wpt/meta/css/css-tables/visibility-collapse-col-004-dynamic.html.ini @@ -1,6 +1,3 @@ [visibility-collapse-col-004-dynamic.html] - [col visibility:collapse doesn't change table height] - expected: FAIL - [col visibility:collapse changes table width] expected: FAIL diff --git a/tests/wpt/meta/css/css-tables/visibility-collapse-col-005.html.ini b/tests/wpt/meta/css/css-tables/visibility-collapse-col-005.html.ini index 98aed8b9e60..ba36584d30b 100644 --- a/tests/wpt/meta/css/css-tables/visibility-collapse-col-005.html.ini +++ b/tests/wpt/meta/css/css-tables/visibility-collapse-col-005.html.ini @@ -1,3 +1,6 @@ [visibility-collapse-col-005.html] [col visibility:collapse changes table width] expected: FAIL + + [col visibility:collapse doesn't change table height] + expected: FAIL diff --git a/tests/wpt/meta/css/css-values/viewport-units-css2-001.html.ini b/tests/wpt/meta/css/css-values/viewport-units-css2-001.html.ini deleted file mode 100644 index 00e83dee93e..00000000000 --- a/tests/wpt/meta/css/css-values/viewport-units-css2-001.html.ini +++ /dev/null @@ -1,24 +0,0 @@ -[viewport-units-css2-001.html] - [vw length applied to border-spacing] - expected: FAIL - - [vw length applied to border-spacing: getComputedStyle returns a non-zero px-based value] - expected: FAIL - - [vh length applied to border-spacing] - expected: FAIL - - [vh length applied to border-spacing: getComputedStyle returns a non-zero px-based value] - expected: FAIL - - [vmin length applied to border-spacing] - expected: FAIL - - [vmin length applied to border-spacing: getComputedStyle returns a non-zero px-based value] - expected: FAIL - - [vmax length applied to border-spacing] - expected: FAIL - - [vmax length applied to border-spacing: getComputedStyle returns a non-zero px-based value] - expected: FAIL diff --git a/tests/wpt/meta/css/css-variables/variable-substitution-basic.html.ini b/tests/wpt/meta/css/css-variables/variable-substitution-basic.html.ini index ae7b4cc72ff..77d8f440b5d 100644 --- a/tests/wpt/meta/css/css-variables/variable-substitution-basic.html.ini +++ b/tests/wpt/meta/css/css-variables/variable-substitution-basic.html.ini @@ -5,20 +5,8 @@ [You can't build up a single token where part of it is provided by a variable] expected: FAIL - [Multiple variable references in a single property] - expected: FAIL - - [Multiple variable references in a single property (no spaces)] - expected: FAIL - [Fallback value] expected: FAIL [Fallback value which is also a variable reference] expected: FAIL - - [Multiple var references in fallback value] - expected: FAIL - - [Multiple nested fallbacks] - expected: FAIL diff --git a/tests/wpt/meta/css/cssom/cssom-setProperty-shorthand.html.ini b/tests/wpt/meta/css/cssom/cssom-setProperty-shorthand.html.ini deleted file mode 100644 index 976c59f51e9..00000000000 --- a/tests/wpt/meta/css/cssom/cssom-setProperty-shorthand.html.ini +++ /dev/null @@ -1,6 +0,0 @@ -[cssom-setProperty-shorthand.html] - [shorthand border-spacing can be set with setProperty] - expected: FAIL - - [shorthand border-spacing can be set with setProperty and priority !important] - expected: FAIL diff --git a/tests/wpt/meta/css/cssom/serialize-values.html.ini b/tests/wpt/meta/css/cssom/serialize-values.html.ini index 1db183acd4e..50b47dc0348 100644 --- a/tests/wpt/meta/css/cssom/serialize-values.html.ini +++ b/tests/wpt/meta/css/cssom/serialize-values.html.ini @@ -92,18 +92,6 @@ [border-collapse: inherit] expected: FAIL - [border-spacing: 0px] - expected: FAIL - - [border-spacing: 1px] - expected: FAIL - - [border-spacing: .1em] - expected: FAIL - - [border-spacing: inherit] - expected: FAIL - [caption-side: top] expected: FAIL diff --git a/tests/wpt/mozilla/meta/mozilla/calc.html.ini b/tests/wpt/mozilla/meta/mozilla/calc.html.ini index fe3cd742d23..b9e17a2e070 100644 --- a/tests/wpt/mozilla/meta/mozilla/calc.html.ini +++ b/tests/wpt/mozilla/meta/mozilla/calc.html.ini @@ -11,8 +11,5 @@ [calc for column-count] expected: FAIL - [calc for border-spacing] - expected: FAIL - [calc for counter-increment] expected: FAIL