Updated Cargo files

Implementation-with-tests implemented-baseline-source cargo-files squahed-commits Enable baseline-source tests in css-inline-minor code changes wpt: Enable tests in `/css/css-inline/baseline-source/` (servo#31913) * updated-baseline-source * updated-for-tests-with-fmt rebased-for-tests minor-change
MunishMummadi · Apr 1, 2024 · b94b6d3 · b94b6d3
1 parent 8c8d68e
commit b94b6d3
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 244 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/components/layout_2020/flow/inline.rs b/components/layout_2020/flow/inline.rs
@@ -85,6 +85,7 @@ use style::properties::ComputedValues;
 use style::values::computed::Length;
 use style::values::generics::box_::VerticalAlignKeyword;
 use style::values::generics::font::LineHeight;
+use style::values::specified::box_::BaselineSource;
 use style::values::specified::text::{TextAlignKeyword, TextDecorationLine};
 use style::values::specified::{TextAlignLast, TextJustify};
 use style::Zero;
@@ -2143,13 +2144,18 @@ impl IndependentFormattingContext {
     /// Picks either the first or the last baseline, depending on `baseline-source`.
     /// <https://drafts.csswg.org/css-inline/#baseline-source>
     fn pick_baseline(&self, baselines: &Baselines) -> Option<Au> {
-        // TODO: Currently this only supports the initial `baseline-source: auto`.
-        if let Self::NonReplaced(non_replaced) = self {
-            if let NonReplacedFormattingContextContents::Flow(_) = non_replaced.contents {
-                return baselines.last;
-            }
+        match self.style().clone_baseline_source() {
+            BaselineSource::First => baselines.first,
+            BaselineSource::Last => baselines.last,
+            BaselineSource::Auto => {
+                if let Self::NonReplaced(non_replaced) = self {
+                    if let NonReplacedFormattingContextContents::Flow(_) = non_replaced.contents {
+                        return baselines.last;
+                    }
+                }
+                baselines.first
+            },
         }
-        baselines.first
     }
 
     fn get_block_sizes_and_baseline_offset(

diff --git a/...s/wpt/meta-legacy-layout/css/css-inline/baseline-source/baseline-source-computed.html.ini b/...s/wpt/meta-legacy-layout/css/css-inline/baseline-source/baseline-source-computed.html.ini
diff --git a/...ta-legacy-layout/css/css-inline/baseline-source/baseline-source-no-interpolation.html.ini b/...ta-legacy-layout/css/css-inline/baseline-source/baseline-source-no-interpolation.html.ini
@@ -37,90 +37,3 @@
 
   [Web Animations: property <baseline-source> from [initial\] to [last\] at (1.5) should be [last\]]
     expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <baseline-source> from [initial\] to [last\] at (0.5) should be [last\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <baseline-source> from [initial\] to [last\] at (0.6) should be [last\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <baseline-source> from [initial\] to [last\] at (1) should be [last\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <baseline-source> from [initial\] to [last\] at (1.5) should be [last\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <baseline-source> from [initial\] to [last\] at (0.5) should be [last\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <baseline-source> from [initial\] to [last\] at (0.6) should be [last\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <baseline-source> from [initial\] to [last\] at (1) should be [last\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <baseline-source> from [initial\] to [last\] at (1.5) should be [last\]]
-    expected: FAIL
-
-  [CSS Transitions: property <baseline-source> from [initial\] to [last\] at (-0.3) should be [last\]]
-    expected: FAIL
-
-  [CSS Transitions: property <baseline-source> from [initial\] to [last\] at (0) should be [last\]]
-    expected: FAIL
-
-  [CSS Transitions: property <baseline-source> from [initial\] to [last\] at (0.3) should be [last\]]
-    expected: FAIL
-
-  [CSS Transitions: property <baseline-source> from [initial\] to [last\] at (0.5) should be [last\]]
-    expected: FAIL
-
-  [CSS Transitions: property <baseline-source> from [initial\] to [last\] at (0.6) should be [last\]]
-    expected: FAIL
-
-  [CSS Transitions: property <baseline-source> from [initial\] to [last\] at (1) should be [last\]]
-    expected: FAIL
-
-  [CSS Transitions: property <baseline-source> from [initial\] to [last\] at (1.5) should be [last\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <baseline-source> from [initial\] to [last\] at (-0.3) should be [last\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <baseline-source> from [initial\] to [last\] at (0) should be [last\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <baseline-source> from [initial\] to [last\] at (0.3) should be [last\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <baseline-source> from [initial\] to [last\] at (0.5) should be [last\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <baseline-source> from [initial\] to [last\] at (0.6) should be [last\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <baseline-source> from [initial\] to [last\] at (1) should be [last\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <baseline-source> from [initial\] to [last\] at (1.5) should be [last\]]
-    expected: FAIL
-
-  [CSS Animations: property <baseline-source> from [initial\] to [last\] at (-0.3) should be [initial\]]
-    expected: FAIL
-
-  [CSS Animations: property <baseline-source> from [initial\] to [last\] at (0) should be [initial\]]
-    expected: FAIL
-
-  [CSS Animations: property <baseline-source> from [initial\] to [last\] at (0.3) should be [initial\]]
-    expected: FAIL
-
-  [CSS Animations: property <baseline-source> from [initial\] to [last\] at (0.5) should be [last\]]
-    expected: FAIL
-
-  [CSS Animations: property <baseline-source> from [initial\] to [last\] at (0.6) should be [last\]]
-    expected: FAIL
-
-  [CSS Animations: property <baseline-source> from [initial\] to [last\] at (1) should be [last\]]
-    expected: FAIL
-
-  [CSS Animations: property <baseline-source> from [initial\] to [last\] at (1.5) should be [last\]]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-inline/baseline-source/baseline-source-valid.html.ini b/tests/wpt/meta-legacy-layout/css/css-inline/baseline-source/baseline-source-valid.html.ini
diff --git a/tests/wpt/meta/css/css-inline/baseline-source/baseline-source-computed.html.ini b/tests/wpt/meta/css/css-inline/baseline-source/baseline-source-computed.html.ini
diff --git a/tests/wpt/meta/css/css-inline/baseline-source/baseline-source-first-001.html.ini b/tests/wpt/meta/css/css-inline/baseline-source/baseline-source-first-001.html.ini
@@ -1,16 +1,4 @@
 [baseline-source-first-001.html]
-  [.target > * 1]
-    expected: FAIL
-
-  [.target > * 3]
-    expected: FAIL
-
-  [.target > * 5]
-    expected: FAIL
-
-  [.target > * 7]
-    expected: FAIL
-
   [.target > * 9]
     expected: FAIL
 

diff --git a/...meta/css/css-inline/baseline-source/baseline-source-first-textarea-001.tentative.html.ini b/...meta/css/css-inline/baseline-source/baseline-source-first-textarea-001.tentative.html.ini
@@ -2,9 +2,6 @@
   [.target > * 1]
     expected: FAIL
 
-  [.target > * 3]
-    expected: FAIL
-
   [.target > * 5]
     expected: FAIL
 

diff --git a/tests/wpt/meta/css/css-inline/baseline-source/baseline-source-no-interpolation.html.ini b/tests/wpt/meta/css/css-inline/baseline-source/baseline-source-no-interpolation.html.ini
@@ -37,90 +37,3 @@
 
   [Web Animations: property <baseline-source> from [initial\] to [last\] at (1.5) should be [last\]]
     expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <baseline-source> from [initial\] to [last\] at (0.5) should be [last\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <baseline-source> from [initial\] to [last\] at (0.6) should be [last\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <baseline-source> from [initial\] to [last\] at (1) should be [last\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-behavior:allow-discrete: property <baseline-source> from [initial\] to [last\] at (1.5) should be [last\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <baseline-source> from [initial\] to [last\] at (0.5) should be [last\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <baseline-source> from [initial\] to [last\] at (0.6) should be [last\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <baseline-source> from [initial\] to [last\] at (1) should be [last\]]
-    expected: FAIL
-
-  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <baseline-source> from [initial\] to [last\] at (1.5) should be [last\]]
-    expected: FAIL
-
-  [CSS Transitions: property <baseline-source> from [initial\] to [last\] at (-0.3) should be [last\]]
-    expected: FAIL
-
-  [CSS Transitions: property <baseline-source> from [initial\] to [last\] at (0) should be [last\]]
-    expected: FAIL
-
-  [CSS Transitions: property <baseline-source> from [initial\] to [last\] at (0.3) should be [last\]]
-    expected: FAIL
-
-  [CSS Transitions: property <baseline-source> from [initial\] to [last\] at (0.5) should be [last\]]
-    expected: FAIL
-
-  [CSS Transitions: property <baseline-source> from [initial\] to [last\] at (0.6) should be [last\]]
-    expected: FAIL
-
-  [CSS Transitions: property <baseline-source> from [initial\] to [last\] at (1) should be [last\]]
-    expected: FAIL
-
-  [CSS Transitions: property <baseline-source> from [initial\] to [last\] at (1.5) should be [last\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <baseline-source> from [initial\] to [last\] at (-0.3) should be [last\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <baseline-source> from [initial\] to [last\] at (0) should be [last\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <baseline-source> from [initial\] to [last\] at (0.3) should be [last\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <baseline-source> from [initial\] to [last\] at (0.5) should be [last\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <baseline-source> from [initial\] to [last\] at (0.6) should be [last\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <baseline-source> from [initial\] to [last\] at (1) should be [last\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <baseline-source> from [initial\] to [last\] at (1.5) should be [last\]]
-    expected: FAIL
-
-  [CSS Animations: property <baseline-source> from [initial\] to [last\] at (-0.3) should be [initial\]]
-    expected: FAIL
-
-  [CSS Animations: property <baseline-source> from [initial\] to [last\] at (0) should be [initial\]]
-    expected: FAIL
-
-  [CSS Animations: property <baseline-source> from [initial\] to [last\] at (0.3) should be [initial\]]
-    expected: FAIL
-
-  [CSS Animations: property <baseline-source> from [initial\] to [last\] at (0.5) should be [last\]]
-    expected: FAIL
-
-  [CSS Animations: property <baseline-source> from [initial\] to [last\] at (0.6) should be [last\]]
-    expected: FAIL
-
-  [CSS Animations: property <baseline-source> from [initial\] to [last\] at (1) should be [last\]]
-    expected: FAIL
-
-  [CSS Animations: property <baseline-source> from [initial\] to [last\] at (1.5) should be [last\]]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-inline/baseline-source/baseline-source-valid.html.ini b/tests/wpt/meta/css/css-inline/baseline-source/baseline-source-valid.html.ini