From 74798c4b7bf173fc99b96e219c6c2cab136d5c4c Mon Sep 17 00:00:00 2001 From: Martin Robinson Date: Thu, 21 Dec 2023 15:45:34 +0100 Subject: [PATCH] layout: Add support for `text-align-last` (#30905) This change adds support for `text-align-last` as well as ensuring that it also applies to lines before forced line breaks. Two tests start to fail because they rely on right-to-left text to pass: - /css/css-text/text-align/text-align-last-010.html.ini - /css/css-text/text-align/text-align-last-011.html.ini --- components/layout_2020/flow/inline.rs | 51 +++-- .../longhands/inherited_text.mako.rs | 2 +- .../css/css-text/inheritance.html.ini | 6 - .../parsing/text-align-last-computed.html.ini | 22 -- .../parsing/text-align-last-valid.html.ini | 22 -- .../text-align-last-interpolation.html.ini | 189 ------------------ .../block-in-inline-align-last-001.html.ini | 2 - .../meta/css/css-text/inheritance.html.ini | 6 - .../parsing/text-align-last-computed.html.ini | 21 -- .../parsing/text-align-last-valid.html.ini | 21 -- .../text-align-center-last-center.html.ini | 2 - .../text-align-center-last-end.html.ini | 2 - .../text-align-center-last-justify.html.ini | 2 - .../text-align-center-last-start.html.ini | 2 - .../text-align-end-last-center.html.ini | 2 - .../text-align-end-last-end.html.ini | 2 - .../text-align-end-last-justify.html.ini | 2 - .../text-align-end-last-start.html.ini | 2 - .../text-align-justify-last-center.html.ini | 2 - .../text-align-justify-last-end.html.ini | 2 - .../text-align-justify-last-justify.html.ini | 2 - .../text-align-justify-last-start.html.ini | 2 - .../text-align/text-align-last-010.html.ini | 2 + .../text-align/text-align-last-011.html.ini | 2 + .../text-align-last-center.html.ini | 2 - .../text-align/text-align-last-end.html.ini | 2 - .../text-align-last-interpolation.html.ini | 189 ------------------ .../text-align-last-justify.html.ini | 2 - .../text-align-last-simple.html.ini | 2 - .../text-align/text-align-last-start.html.ini | 2 - .../text-align-last-wins-001.html.ini | 2 - .../text-align-start-last-center.html.ini | 2 - .../text-align-start-last-end.html.ini | 2 - .../text-align-start-last-justify.html.ini | 2 - .../text-align-start-last-start.html.ini | 2 - .../text-justify-inter-word-001.html.ini | 2 - 36 files changed, 37 insertions(+), 544 deletions(-) delete mode 100644 tests/wpt/meta/css/CSS2/normal-flow/block-in-inline-align-last-001.html.ini delete mode 100644 tests/wpt/meta/css/css-text/text-align/text-align-center-last-center.html.ini delete mode 100644 tests/wpt/meta/css/css-text/text-align/text-align-center-last-end.html.ini delete mode 100644 tests/wpt/meta/css/css-text/text-align/text-align-center-last-justify.html.ini delete mode 100644 tests/wpt/meta/css/css-text/text-align/text-align-center-last-start.html.ini delete mode 100644 tests/wpt/meta/css/css-text/text-align/text-align-end-last-center.html.ini delete mode 100644 tests/wpt/meta/css/css-text/text-align/text-align-end-last-end.html.ini delete mode 100644 tests/wpt/meta/css/css-text/text-align/text-align-end-last-justify.html.ini delete mode 100644 tests/wpt/meta/css/css-text/text-align/text-align-end-last-start.html.ini delete mode 100644 tests/wpt/meta/css/css-text/text-align/text-align-justify-last-center.html.ini delete mode 100644 tests/wpt/meta/css/css-text/text-align/text-align-justify-last-end.html.ini delete mode 100644 tests/wpt/meta/css/css-text/text-align/text-align-justify-last-justify.html.ini delete mode 100644 tests/wpt/meta/css/css-text/text-align/text-align-justify-last-start.html.ini create mode 100644 tests/wpt/meta/css/css-text/text-align/text-align-last-010.html.ini create mode 100644 tests/wpt/meta/css/css-text/text-align/text-align-last-011.html.ini delete mode 100644 tests/wpt/meta/css/css-text/text-align/text-align-last-center.html.ini delete mode 100644 tests/wpt/meta/css/css-text/text-align/text-align-last-end.html.ini delete mode 100644 tests/wpt/meta/css/css-text/text-align/text-align-last-justify.html.ini delete mode 100644 tests/wpt/meta/css/css-text/text-align/text-align-last-simple.html.ini delete mode 100644 tests/wpt/meta/css/css-text/text-align/text-align-last-start.html.ini delete mode 100644 tests/wpt/meta/css/css-text/text-align/text-align-last-wins-001.html.ini delete mode 100644 tests/wpt/meta/css/css-text/text-align/text-align-start-last-center.html.ini delete mode 100644 tests/wpt/meta/css/css-text/text-align/text-align-start-last-end.html.ini delete mode 100644 tests/wpt/meta/css/css-text/text-align/text-align-start-last-justify.html.ini delete mode 100644 tests/wpt/meta/css/css-text/text-align/text-align-start-last-start.html.ini delete mode 100644 tests/wpt/meta/css/css-text/text-justify/text-justify-inter-word-001.html.ini diff --git a/components/layout_2020/flow/inline.rs b/components/layout_2020/flow/inline.rs index ca5360469ac..f67e95400f4 100644 --- a/components/layout_2020/flow/inline.rs +++ b/components/layout_2020/flow/inline.rs @@ -20,7 +20,7 @@ use style::properties::ComputedValues; use style::values::computed::Length; use style::values::generics::text::LineHeight; use style::values::specified::text::{TextAlignKeyword, TextDecorationLine}; -use style::values::specified::TextJustify; +use style::values::specified::{TextAlignLast, TextJustify}; use style::Zero; use webrender_api::FontInstanceKey; use xi_unicode::{linebreak_property, LineBreakLeafIter}; @@ -537,20 +537,19 @@ impl<'a, 'b> InlineFormattingContextState<'a, 'b> { // Finally we finish the line itself and convert all of the LineItems into // fragments. - self.finish_current_line_and_reset(true /* last_line */); + self.finish_current_line_and_reset(true /* last_line_or_forced_line_break */); } /// Finish layout of all inline boxes for the current line. This will gather all /// [`LineItem`]s and turn them into [`Fragment`]s, then reset the /// [`InlineFormattingContextState`] preparing it for laying out a new line. - fn finish_current_line_and_reset(&mut self, last_line: bool) { + fn finish_current_line_and_reset(&mut self, last_line_or_forced_line_break: bool) { let whitespace_trimmed = self.current_line.trim_trailing_whitespace(); - let (inline_start_position, mut justification_adjustment) = self - .calculate_current_line_inline_start_and_justification_adjustment(whitespace_trimmed); - - if last_line { - justification_adjustment = Length::zero(); - } + let (inline_start_position, justification_adjustment) = self + .calculate_current_line_inline_start_and_justification_adjustment( + whitespace_trimmed, + last_line_or_forced_line_break, + ); let block_start_position = self .current_line @@ -642,18 +641,32 @@ impl<'a, 'b> InlineFormattingContextState<'a, 'b> { fn calculate_current_line_inline_start_and_justification_adjustment( &self, whitespace_trimmed: Length, + last_line_or_forced_line_break: bool, ) -> (Length, Length) { enum TextAlign { Start, Center, End, } - let line_left_is_inline_start = self - .containing_block - .style - .writing_mode - .line_left_is_inline_start(); - let text_align_keyword = self.containing_block.style.clone_text_align(); + let style = self.containing_block.style; + let line_left_is_inline_start = style.writing_mode.line_left_is_inline_start(); + let mut text_align_keyword = style.clone_text_align(); + + if last_line_or_forced_line_break { + text_align_keyword = match style.clone_text_align_last() { + TextAlignLast::Auto if text_align_keyword == TextAlignKeyword::Justify => { + TextAlignKeyword::Start + }, + TextAlignLast::Auto => text_align_keyword, + TextAlignLast::Start => TextAlignKeyword::Start, + TextAlignLast::End => TextAlignKeyword::End, + TextAlignLast::Left => TextAlignKeyword::Left, + TextAlignLast::Right => TextAlignKeyword::Right, + TextAlignLast::Center => TextAlignKeyword::Center, + TextAlignLast::Justify => TextAlignKeyword::Justify, + }; + } + let text_align = match text_align_keyword { TextAlignKeyword::Start => TextAlign::Start, TextAlignKeyword::Center => TextAlign::Center, @@ -936,7 +949,7 @@ impl<'a, 'b> InlineFormattingContextState<'a, 'b> { } self.commit_current_segment_to_line(); - self.process_line_break(); + self.process_line_break(true /* forced_line_break */); self.linebreak_before_new_content = false; } @@ -1023,13 +1036,13 @@ impl<'a, 'b> InlineFormattingContextState<'a, 'b> { self.propagate_current_nesting_level_white_space_style(); } - fn process_line_break(&mut self) { + fn process_line_break(&mut self, forced_line_break: bool) { self.current_line_segment .prepare_for_placement_on_empty_line( &self.current_line, self.inline_box_state_stack.len(), ); - self.finish_current_line_and_reset(false /* last_line */); + self.finish_current_line_and_reset(forced_line_break); } /// Process a soft wrap opportunity. This will either commit the current unbreakble @@ -1052,7 +1065,7 @@ impl<'a, 'b> InlineFormattingContextState<'a, 'b> { }; if self.new_potential_line_size_causes_line_break(&potential_line_size) { - self.process_line_break(); + self.process_line_break(false /* forced_line_break */); } self.commit_current_segment_to_line(); } diff --git a/components/style/properties/longhands/inherited_text.mako.rs b/components/style/properties/longhands/inherited_text.mako.rs index 578bfa5f30b..0513a5cd387 100644 --- a/components/style/properties/longhands/inherited_text.mako.rs +++ b/components/style/properties/longhands/inherited_text.mako.rs @@ -111,7 +111,7 @@ ${helpers.predefined_type( "text-align-last", "TextAlignLast", "computed::text::TextAlignLast::Auto", - engines="gecko", + engines="gecko servo", animation_value_type="discrete", spec="https://drafts.csswg.org/css-text/#propdef-text-align-last", )} diff --git a/tests/wpt/meta-legacy-layout/css/css-text/inheritance.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/inheritance.html.ini index 5eb631e5b9b..3b2023462b9 100644 --- a/tests/wpt/meta-legacy-layout/css/css-text/inheritance.html.ini +++ b/tests/wpt/meta-legacy-layout/css/css-text/inheritance.html.ini @@ -14,9 +14,6 @@ [Property hyphens inherits] expected: FAIL - [Property text-align-last inherits] - expected: FAIL - [Property hyphens has initial value manual] expected: FAIL @@ -29,9 +26,6 @@ [Property text-align-all inherits] expected: FAIL - [Property text-align-last has initial value auto] - expected: FAIL - [Property line-break has initial value auto] expected: FAIL diff --git a/tests/wpt/meta-legacy-layout/css/css-text/parsing/text-align-last-computed.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/parsing/text-align-last-computed.html.ini index cc223d31d55..4c29bccf1d3 100644 --- a/tests/wpt/meta-legacy-layout/css/css-text/parsing/text-align-last-computed.html.ini +++ b/tests/wpt/meta-legacy-layout/css/css-text/parsing/text-align-last-computed.html.ini @@ -23,27 +23,5 @@ [Property text-align-last value 'left' computes to 'left'] expected: FAIL - [Property text-align-last value 'end'] - expected: FAIL - - [Property text-align-last value 'center'] - expected: FAIL - - [Property text-align-last value 'auto'] - expected: FAIL - - [Property text-align-last value 'start'] - expected: FAIL - - [Property text-align-last value 'right'] - expected: FAIL - - [Property text-align-last value 'left'] - expected: FAIL - [Property text-align-last value 'match-parent'] expected: FAIL - - [Property text-align-last value 'justify'] - expected: FAIL - diff --git a/tests/wpt/meta-legacy-layout/css/css-text/parsing/text-align-last-valid.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/parsing/text-align-last-valid.html.ini index c3cc42fa761..d9a6b8dbb9e 100644 --- a/tests/wpt/meta-legacy-layout/css/css-text/parsing/text-align-last-valid.html.ini +++ b/tests/wpt/meta-legacy-layout/css/css-text/parsing/text-align-last-valid.html.ini @@ -1,25 +1,3 @@ [text-align-last-valid.html] [e.style['text-align-last'\] = "match-parent" should set the property value] expected: FAIL - - [e.style['text-align-last'\] = "right" should set the property value] - expected: FAIL - - [e.style['text-align-last'\] = "center" should set the property value] - expected: FAIL - - [e.style['text-align-last'\] = "auto" should set the property value] - expected: FAIL - - [e.style['text-align-last'\] = "left" should set the property value] - expected: FAIL - - [e.style['text-align-last'\] = "justify" should set the property value] - expected: FAIL - - [e.style['text-align-last'\] = "end" should set the property value] - expected: FAIL - - [e.style['text-align-last'\] = "start" should set the property value] - expected: FAIL - diff --git a/tests/wpt/meta-legacy-layout/css/css-text/text-align/text-align-last-interpolation.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/text-align/text-align-last-interpolation.html.ini index ddfb48f17bc..23280d719e7 100644 --- a/tests/wpt/meta-legacy-layout/css/css-text/text-align/text-align-last-interpolation.html.ini +++ b/tests/wpt/meta-legacy-layout/css/css-text/text-align/text-align-last-interpolation.html.ini @@ -1,67 +1,4 @@ [text-align-last-interpolation.html] - [CSS Transitions: property from [auto\] to [start\] at (-0.3) should be [start\]] - expected: FAIL - - [CSS Transitions: property from [auto\] to [start\] at (0) should be [start\]] - expected: FAIL - - [CSS Transitions: property from [auto\] to [start\] at (0.3) should be [start\]] - expected: FAIL - - [CSS Transitions: property from [auto\] to [start\] at (0.5) should be [start\]] - expected: FAIL - - [CSS Transitions: property from [auto\] to [start\] at (0.6) should be [start\]] - expected: FAIL - - [CSS Transitions: property from [auto\] to [start\] at (1) should be [start\]] - expected: FAIL - - [CSS Transitions: property from [auto\] to [start\] at (1.5) should be [start\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [auto\] to [start\] at (-0.3) should be [start\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [auto\] to [start\] at (0) should be [start\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [auto\] to [start\] at (0.3) should be [start\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [auto\] to [start\] at (0.5) should be [start\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [auto\] to [start\] at (0.6) should be [start\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [auto\] to [start\] at (1) should be [start\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [auto\] to [start\] at (1.5) should be [start\]] - expected: FAIL - - [CSS Animations: property from [auto\] to [start\] at (-0.3) should be [auto\]] - expected: FAIL - - [CSS Animations: property from [auto\] to [start\] at (0) should be [auto\]] - expected: FAIL - - [CSS Animations: property from [auto\] to [start\] at (0.3) should be [auto\]] - expected: FAIL - - [CSS Animations: property from [auto\] to [start\] at (0.5) should be [start\]] - expected: FAIL - - [CSS Animations: property from [auto\] to [start\] at (0.6) should be [start\]] - expected: FAIL - - [CSS Animations: property from [auto\] to [start\] at (1) should be [start\]] - expected: FAIL - - [CSS Animations: property from [auto\] to [start\] at (1.5) should be [start\]] - expected: FAIL - [Web Animations: property from [auto\] to [start\] at (-0.3) should be [auto\]] expected: FAIL @@ -83,69 +20,6 @@ [Web Animations: property from [auto\] to [start\] at (1.5) should be [start\]] expected: FAIL - [CSS Transitions: property from [justify\] to [center\] at (-0.3) should be [center\]] - expected: FAIL - - [CSS Transitions: property from [justify\] to [center\] at (0) should be [center\]] - expected: FAIL - - [CSS Transitions: property from [justify\] to [center\] at (0.3) should be [center\]] - expected: FAIL - - [CSS Transitions: property from [justify\] to [center\] at (0.5) should be [center\]] - expected: FAIL - - [CSS Transitions: property from [justify\] to [center\] at (0.6) should be [center\]] - expected: FAIL - - [CSS Transitions: property from [justify\] to [center\] at (1) should be [center\]] - expected: FAIL - - [CSS Transitions: property from [justify\] to [center\] at (1.5) should be [center\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [justify\] to [center\] at (-0.3) should be [center\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [justify\] to [center\] at (0) should be [center\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [justify\] to [center\] at (0.3) should be [center\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [justify\] to [center\] at (0.5) should be [center\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [justify\] to [center\] at (0.6) should be [center\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [justify\] to [center\] at (1) should be [center\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [justify\] to [center\] at (1.5) should be [center\]] - expected: FAIL - - [CSS Animations: property from [justify\] to [center\] at (-0.3) should be [justify\]] - expected: FAIL - - [CSS Animations: property from [justify\] to [center\] at (0) should be [justify\]] - expected: FAIL - - [CSS Animations: property from [justify\] to [center\] at (0.3) should be [justify\]] - expected: FAIL - - [CSS Animations: property from [justify\] to [center\] at (0.5) should be [center\]] - expected: FAIL - - [CSS Animations: property from [justify\] to [center\] at (0.6) should be [center\]] - expected: FAIL - - [CSS Animations: property from [justify\] to [center\] at (1) should be [center\]] - expected: FAIL - - [CSS Animations: property from [justify\] to [center\] at (1.5) should be [center\]] - expected: FAIL - [Web Animations: property from [justify\] to [center\] at (-0.3) should be [justify\]] expected: FAIL @@ -167,69 +41,6 @@ [Web Animations: property from [justify\] to [center\] at (1.5) should be [center\]] expected: FAIL - [CSS Transitions: property from [left\] to [right\] at (-0.3) should be [right\]] - expected: FAIL - - [CSS Transitions: property from [left\] to [right\] at (0) should be [right\]] - expected: FAIL - - [CSS Transitions: property from [left\] to [right\] at (0.3) should be [right\]] - expected: FAIL - - [CSS Transitions: property from [left\] to [right\] at (0.5) should be [right\]] - expected: FAIL - - [CSS Transitions: property from [left\] to [right\] at (0.6) should be [right\]] - expected: FAIL - - [CSS Transitions: property from [left\] to [right\] at (1) should be [right\]] - expected: FAIL - - [CSS Transitions: property from [left\] to [right\] at (1.5) should be [right\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [left\] to [right\] at (-0.3) should be [right\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [left\] to [right\] at (0) should be [right\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [left\] to [right\] at (0.3) should be [right\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [left\] to [right\] at (0.5) should be [right\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [left\] to [right\] at (0.6) should be [right\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [left\] to [right\] at (1) should be [right\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [left\] to [right\] at (1.5) should be [right\]] - expected: FAIL - - [CSS Animations: property from [left\] to [right\] at (-0.3) should be [left\]] - expected: FAIL - - [CSS Animations: property from [left\] to [right\] at (0) should be [left\]] - expected: FAIL - - [CSS Animations: property from [left\] to [right\] at (0.3) should be [left\]] - expected: FAIL - - [CSS Animations: property from [left\] to [right\] at (0.5) should be [right\]] - expected: FAIL - - [CSS Animations: property from [left\] to [right\] at (0.6) should be [right\]] - expected: FAIL - - [CSS Animations: property from [left\] to [right\] at (1) should be [right\]] - expected: FAIL - - [CSS Animations: property from [left\] to [right\] at (1.5) should be [right\]] - expected: FAIL - [Web Animations: property from [left\] to [right\] at (-0.3) should be [left\]] expected: FAIL diff --git a/tests/wpt/meta/css/CSS2/normal-flow/block-in-inline-align-last-001.html.ini b/tests/wpt/meta/css/CSS2/normal-flow/block-in-inline-align-last-001.html.ini deleted file mode 100644 index 7c2bdce3fa8..00000000000 --- a/tests/wpt/meta/css/CSS2/normal-flow/block-in-inline-align-last-001.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[block-in-inline-align-last-001.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-text/inheritance.html.ini b/tests/wpt/meta/css/css-text/inheritance.html.ini index 786f2217d0f..bee17bc7144 100644 --- a/tests/wpt/meta/css/css-text/inheritance.html.ini +++ b/tests/wpt/meta/css/css-text/inheritance.html.ini @@ -29,12 +29,6 @@ [Property text-align-all inherits] expected: FAIL - [Property text-align-last has initial value auto] - expected: FAIL - - [Property text-align-last inherits] - expected: FAIL - [Property text-wrap has initial value wrap] expected: FAIL diff --git a/tests/wpt/meta/css/css-text/parsing/text-align-last-computed.html.ini b/tests/wpt/meta/css/css-text/parsing/text-align-last-computed.html.ini index caacd247918..a91db1c2995 100644 --- a/tests/wpt/meta/css/css-text/parsing/text-align-last-computed.html.ini +++ b/tests/wpt/meta/css/css-text/parsing/text-align-last-computed.html.ini @@ -1,24 +1,3 @@ [text-align-last-computed.html] - [Property text-align-last value 'auto'] - expected: FAIL - - [Property text-align-last value 'start'] - expected: FAIL - - [Property text-align-last value 'end'] - expected: FAIL - - [Property text-align-last value 'left'] - expected: FAIL - - [Property text-align-last value 'right'] - expected: FAIL - - [Property text-align-last value 'center'] - expected: FAIL - - [Property text-align-last value 'justify'] - expected: FAIL - [Property text-align-last value 'match-parent'] expected: FAIL diff --git a/tests/wpt/meta/css/css-text/parsing/text-align-last-valid.html.ini b/tests/wpt/meta/css/css-text/parsing/text-align-last-valid.html.ini index 7dfe1171ac5..d9a6b8dbb9e 100644 --- a/tests/wpt/meta/css/css-text/parsing/text-align-last-valid.html.ini +++ b/tests/wpt/meta/css/css-text/parsing/text-align-last-valid.html.ini @@ -1,24 +1,3 @@ [text-align-last-valid.html] - [e.style['text-align-last'\] = "auto" should set the property value] - expected: FAIL - - [e.style['text-align-last'\] = "start" should set the property value] - expected: FAIL - - [e.style['text-align-last'\] = "end" should set the property value] - expected: FAIL - - [e.style['text-align-last'\] = "left" should set the property value] - expected: FAIL - - [e.style['text-align-last'\] = "right" should set the property value] - expected: FAIL - - [e.style['text-align-last'\] = "center" should set the property value] - expected: FAIL - - [e.style['text-align-last'\] = "justify" should set the property value] - expected: FAIL - [e.style['text-align-last'\] = "match-parent" should set the property value] expected: FAIL diff --git a/tests/wpt/meta/css/css-text/text-align/text-align-center-last-center.html.ini b/tests/wpt/meta/css/css-text/text-align/text-align-center-last-center.html.ini deleted file mode 100644 index 62e1b27c70e..00000000000 --- a/tests/wpt/meta/css/css-text/text-align/text-align-center-last-center.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[text-align-center-last-center.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-text/text-align/text-align-center-last-end.html.ini b/tests/wpt/meta/css/css-text/text-align/text-align-center-last-end.html.ini deleted file mode 100644 index 042f2f8bf02..00000000000 --- a/tests/wpt/meta/css/css-text/text-align/text-align-center-last-end.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[text-align-center-last-end.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-text/text-align/text-align-center-last-justify.html.ini b/tests/wpt/meta/css/css-text/text-align/text-align-center-last-justify.html.ini deleted file mode 100644 index aa6a0515375..00000000000 --- a/tests/wpt/meta/css/css-text/text-align/text-align-center-last-justify.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[text-align-center-last-justify.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-text/text-align/text-align-center-last-start.html.ini b/tests/wpt/meta/css/css-text/text-align/text-align-center-last-start.html.ini deleted file mode 100644 index d46d5de295b..00000000000 --- a/tests/wpt/meta/css/css-text/text-align/text-align-center-last-start.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[text-align-center-last-start.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-text/text-align/text-align-end-last-center.html.ini b/tests/wpt/meta/css/css-text/text-align/text-align-end-last-center.html.ini deleted file mode 100644 index fa3456758a2..00000000000 --- a/tests/wpt/meta/css/css-text/text-align/text-align-end-last-center.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[text-align-end-last-center.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-text/text-align/text-align-end-last-end.html.ini b/tests/wpt/meta/css/css-text/text-align/text-align-end-last-end.html.ini deleted file mode 100644 index 60b0cb302b0..00000000000 --- a/tests/wpt/meta/css/css-text/text-align/text-align-end-last-end.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[text-align-end-last-end.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-text/text-align/text-align-end-last-justify.html.ini b/tests/wpt/meta/css/css-text/text-align/text-align-end-last-justify.html.ini deleted file mode 100644 index cd226f88c6d..00000000000 --- a/tests/wpt/meta/css/css-text/text-align/text-align-end-last-justify.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[text-align-end-last-justify.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-text/text-align/text-align-end-last-start.html.ini b/tests/wpt/meta/css/css-text/text-align/text-align-end-last-start.html.ini deleted file mode 100644 index cf65a2ac72c..00000000000 --- a/tests/wpt/meta/css/css-text/text-align/text-align-end-last-start.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[text-align-end-last-start.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-text/text-align/text-align-justify-last-center.html.ini b/tests/wpt/meta/css/css-text/text-align/text-align-justify-last-center.html.ini deleted file mode 100644 index f1e50778dd7..00000000000 --- a/tests/wpt/meta/css/css-text/text-align/text-align-justify-last-center.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[text-align-justify-last-center.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-text/text-align/text-align-justify-last-end.html.ini b/tests/wpt/meta/css/css-text/text-align/text-align-justify-last-end.html.ini deleted file mode 100644 index 509eb0d468c..00000000000 --- a/tests/wpt/meta/css/css-text/text-align/text-align-justify-last-end.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[text-align-justify-last-end.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-text/text-align/text-align-justify-last-justify.html.ini b/tests/wpt/meta/css/css-text/text-align/text-align-justify-last-justify.html.ini deleted file mode 100644 index 866b27ea6c8..00000000000 --- a/tests/wpt/meta/css/css-text/text-align/text-align-justify-last-justify.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[text-align-justify-last-justify.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-text/text-align/text-align-justify-last-start.html.ini b/tests/wpt/meta/css/css-text/text-align/text-align-justify-last-start.html.ini deleted file mode 100644 index 65856b78cae..00000000000 --- a/tests/wpt/meta/css/css-text/text-align/text-align-justify-last-start.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[text-align-justify-last-start.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-text/text-align/text-align-last-010.html.ini b/tests/wpt/meta/css/css-text/text-align/text-align-last-010.html.ini new file mode 100644 index 00000000000..5bb041d4ef5 --- /dev/null +++ b/tests/wpt/meta/css/css-text/text-align/text-align-last-010.html.ini @@ -0,0 +1,2 @@ +[text-align-last-010.html] + expected: FAIL diff --git a/tests/wpt/meta/css/css-text/text-align/text-align-last-011.html.ini b/tests/wpt/meta/css/css-text/text-align/text-align-last-011.html.ini new file mode 100644 index 00000000000..86aab50e484 --- /dev/null +++ b/tests/wpt/meta/css/css-text/text-align/text-align-last-011.html.ini @@ -0,0 +1,2 @@ +[text-align-last-011.html] + expected: FAIL diff --git a/tests/wpt/meta/css/css-text/text-align/text-align-last-center.html.ini b/tests/wpt/meta/css/css-text/text-align/text-align-last-center.html.ini deleted file mode 100644 index 5e13389ad8d..00000000000 --- a/tests/wpt/meta/css/css-text/text-align/text-align-last-center.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[text-align-last-center.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-text/text-align/text-align-last-end.html.ini b/tests/wpt/meta/css/css-text/text-align/text-align-last-end.html.ini deleted file mode 100644 index 2ca98e0865c..00000000000 --- a/tests/wpt/meta/css/css-text/text-align/text-align-last-end.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[text-align-last-end.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-text/text-align/text-align-last-interpolation.html.ini b/tests/wpt/meta/css/css-text/text-align/text-align-last-interpolation.html.ini index 254c1998a2f..3099f99dbfc 100644 --- a/tests/wpt/meta/css/css-text/text-align/text-align-last-interpolation.html.ini +++ b/tests/wpt/meta/css/css-text/text-align/text-align-last-interpolation.html.ini @@ -1,67 +1,4 @@ [text-align-last-interpolation.html] - [CSS Transitions: property from [auto\] to [start\] at (-0.3) should be [start\]] - expected: FAIL - - [CSS Transitions: property from [auto\] to [start\] at (0) should be [start\]] - expected: FAIL - - [CSS Transitions: property from [auto\] to [start\] at (0.3) should be [start\]] - expected: FAIL - - [CSS Transitions: property from [auto\] to [start\] at (0.5) should be [start\]] - expected: FAIL - - [CSS Transitions: property from [auto\] to [start\] at (0.6) should be [start\]] - expected: FAIL - - [CSS Transitions: property from [auto\] to [start\] at (1) should be [start\]] - expected: FAIL - - [CSS Transitions: property from [auto\] to [start\] at (1.5) should be [start\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [auto\] to [start\] at (-0.3) should be [start\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [auto\] to [start\] at (0) should be [start\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [auto\] to [start\] at (0.3) should be [start\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [auto\] to [start\] at (0.5) should be [start\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [auto\] to [start\] at (0.6) should be [start\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [auto\] to [start\] at (1) should be [start\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [auto\] to [start\] at (1.5) should be [start\]] - expected: FAIL - - [CSS Animations: property from [auto\] to [start\] at (-0.3) should be [auto\]] - expected: FAIL - - [CSS Animations: property from [auto\] to [start\] at (0) should be [auto\]] - expected: FAIL - - [CSS Animations: property from [auto\] to [start\] at (0.3) should be [auto\]] - expected: FAIL - - [CSS Animations: property from [auto\] to [start\] at (0.5) should be [start\]] - expected: FAIL - - [CSS Animations: property from [auto\] to [start\] at (0.6) should be [start\]] - expected: FAIL - - [CSS Animations: property from [auto\] to [start\] at (1) should be [start\]] - expected: FAIL - - [CSS Animations: property from [auto\] to [start\] at (1.5) should be [start\]] - expected: FAIL - [Web Animations: property from [auto\] to [start\] at (-0.3) should be [auto\]] expected: FAIL @@ -83,69 +20,6 @@ [Web Animations: property from [auto\] to [start\] at (1.5) should be [start\]] expected: FAIL - [CSS Transitions: property from [justify\] to [center\] at (-0.3) should be [center\]] - expected: FAIL - - [CSS Transitions: property from [justify\] to [center\] at (0) should be [center\]] - expected: FAIL - - [CSS Transitions: property from [justify\] to [center\] at (0.3) should be [center\]] - expected: FAIL - - [CSS Transitions: property from [justify\] to [center\] at (0.5) should be [center\]] - expected: FAIL - - [CSS Transitions: property from [justify\] to [center\] at (0.6) should be [center\]] - expected: FAIL - - [CSS Transitions: property from [justify\] to [center\] at (1) should be [center\]] - expected: FAIL - - [CSS Transitions: property from [justify\] to [center\] at (1.5) should be [center\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [justify\] to [center\] at (-0.3) should be [center\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [justify\] to [center\] at (0) should be [center\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [justify\] to [center\] at (0.3) should be [center\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [justify\] to [center\] at (0.5) should be [center\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [justify\] to [center\] at (0.6) should be [center\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [justify\] to [center\] at (1) should be [center\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [justify\] to [center\] at (1.5) should be [center\]] - expected: FAIL - - [CSS Animations: property from [justify\] to [center\] at (-0.3) should be [justify\]] - expected: FAIL - - [CSS Animations: property from [justify\] to [center\] at (0) should be [justify\]] - expected: FAIL - - [CSS Animations: property from [justify\] to [center\] at (0.3) should be [justify\]] - expected: FAIL - - [CSS Animations: property from [justify\] to [center\] at (0.5) should be [center\]] - expected: FAIL - - [CSS Animations: property from [justify\] to [center\] at (0.6) should be [center\]] - expected: FAIL - - [CSS Animations: property from [justify\] to [center\] at (1) should be [center\]] - expected: FAIL - - [CSS Animations: property from [justify\] to [center\] at (1.5) should be [center\]] - expected: FAIL - [Web Animations: property from [justify\] to [center\] at (-0.3) should be [justify\]] expected: FAIL @@ -167,69 +41,6 @@ [Web Animations: property from [justify\] to [center\] at (1.5) should be [center\]] expected: FAIL - [CSS Transitions: property from [left\] to [right\] at (-0.3) should be [right\]] - expected: FAIL - - [CSS Transitions: property from [left\] to [right\] at (0) should be [right\]] - expected: FAIL - - [CSS Transitions: property from [left\] to [right\] at (0.3) should be [right\]] - expected: FAIL - - [CSS Transitions: property from [left\] to [right\] at (0.5) should be [right\]] - expected: FAIL - - [CSS Transitions: property from [left\] to [right\] at (0.6) should be [right\]] - expected: FAIL - - [CSS Transitions: property from [left\] to [right\] at (1) should be [right\]] - expected: FAIL - - [CSS Transitions: property from [left\] to [right\] at (1.5) should be [right\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [left\] to [right\] at (-0.3) should be [right\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [left\] to [right\] at (0) should be [right\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [left\] to [right\] at (0.3) should be [right\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [left\] to [right\] at (0.5) should be [right\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [left\] to [right\] at (0.6) should be [right\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [left\] to [right\] at (1) should be [right\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [left\] to [right\] at (1.5) should be [right\]] - expected: FAIL - - [CSS Animations: property from [left\] to [right\] at (-0.3) should be [left\]] - expected: FAIL - - [CSS Animations: property from [left\] to [right\] at (0) should be [left\]] - expected: FAIL - - [CSS Animations: property from [left\] to [right\] at (0.3) should be [left\]] - expected: FAIL - - [CSS Animations: property from [left\] to [right\] at (0.5) should be [right\]] - expected: FAIL - - [CSS Animations: property from [left\] to [right\] at (0.6) should be [right\]] - expected: FAIL - - [CSS Animations: property from [left\] to [right\] at (1) should be [right\]] - expected: FAIL - - [CSS Animations: property from [left\] to [right\] at (1.5) should be [right\]] - expected: FAIL - [Web Animations: property from [left\] to [right\] at (-0.3) should be [left\]] expected: FAIL diff --git a/tests/wpt/meta/css/css-text/text-align/text-align-last-justify.html.ini b/tests/wpt/meta/css/css-text/text-align/text-align-last-justify.html.ini deleted file mode 100644 index 5dff3629a07..00000000000 --- a/tests/wpt/meta/css/css-text/text-align/text-align-last-justify.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[text-align-last-justify.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-text/text-align/text-align-last-simple.html.ini b/tests/wpt/meta/css/css-text/text-align/text-align-last-simple.html.ini deleted file mode 100644 index 0e0bed4b056..00000000000 --- a/tests/wpt/meta/css/css-text/text-align/text-align-last-simple.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[text-align-last-simple.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-text/text-align/text-align-last-start.html.ini b/tests/wpt/meta/css/css-text/text-align/text-align-last-start.html.ini deleted file mode 100644 index 8092f237578..00000000000 --- a/tests/wpt/meta/css/css-text/text-align/text-align-last-start.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[text-align-last-start.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-text/text-align/text-align-last-wins-001.html.ini b/tests/wpt/meta/css/css-text/text-align/text-align-last-wins-001.html.ini deleted file mode 100644 index 4c9d37a3754..00000000000 --- a/tests/wpt/meta/css/css-text/text-align/text-align-last-wins-001.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[text-align-last-wins-001.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-text/text-align/text-align-start-last-center.html.ini b/tests/wpt/meta/css/css-text/text-align/text-align-start-last-center.html.ini deleted file mode 100644 index 87aedd06889..00000000000 --- a/tests/wpt/meta/css/css-text/text-align/text-align-start-last-center.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[text-align-start-last-center.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-text/text-align/text-align-start-last-end.html.ini b/tests/wpt/meta/css/css-text/text-align/text-align-start-last-end.html.ini deleted file mode 100644 index a4ce5fc026a..00000000000 --- a/tests/wpt/meta/css/css-text/text-align/text-align-start-last-end.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[text-align-start-last-end.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-text/text-align/text-align-start-last-justify.html.ini b/tests/wpt/meta/css/css-text/text-align/text-align-start-last-justify.html.ini deleted file mode 100644 index 6c15133f382..00000000000 --- a/tests/wpt/meta/css/css-text/text-align/text-align-start-last-justify.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[text-align-start-last-justify.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-text/text-align/text-align-start-last-start.html.ini b/tests/wpt/meta/css/css-text/text-align/text-align-start-last-start.html.ini deleted file mode 100644 index b47149d40f4..00000000000 --- a/tests/wpt/meta/css/css-text/text-align/text-align-start-last-start.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[text-align-start-last-start.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-text/text-justify/text-justify-inter-word-001.html.ini b/tests/wpt/meta/css/css-text/text-justify/text-justify-inter-word-001.html.ini deleted file mode 100644 index 2f7cba4cf56..00000000000 --- a/tests/wpt/meta/css/css-text/text-justify/text-justify-inter-word-001.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[text-justify-inter-word-001.html] - expected: FAIL