updated-for-tests-with-fmt

Cargo.toml

@@ -64,7 +64,7 @@ keyboard-types = "0.6"
 lazy_static = "1.4"
 libc = "0.2"
 log = "0.4"
-malloc_size_of = { git = "https://github.com/servo/stylo", rev = "refs/pull/26/head", features = ["servo"] }
+malloc_size_of = { git = "https://github.com/servo/stylo", branch = "2023-09-01", features = ["servo"] }
 malloc_size_of_derive = "0.1"
 mime = "0.3.13"
 mime_guess = "2.0.3"
@@ -87,31 +87,31 @@ rustls = { version = "0.21.10", features = ["dangerous_configuration"] }
 rustls-pemfile = "1.0.4"
 script_layout_interface = { path = "components/shared/script_layout" }
 script_traits = { path = "components/shared/script" }
-selectors = { git = "https://github.com/servo/stylo", rev = "refs/pull/26/head" }
+selectors = { git = "https://github.com/servo/stylo", branch = "2023-09-01" }
 serde = "1.0.197"
 serde_bytes = "0.11"
 serde_json = "1.0"
 servo-media = { git = "https://github.com/servo/media" }
 servo-media-dummy = { git = "https://github.com/servo/media" }
 servo-media-gstreamer = { git = "https://github.com/servo/media" }
-servo_arc = { git = "https://github.com/servo/stylo", rev = "refs/pull/26/head" }
-servo_atoms = { git = "https://github.com/servo/stylo", rev = "refs/pull/26/head" }
-size_of_test = { git = "https://github.com/servo/stylo", rev = "refs/pull/26/head" }
+servo_arc = { git = "https://github.com/servo/stylo", branch = "2023-09-01" }
+servo_atoms = { git = "https://github.com/servo/stylo", branch = "2023-09-01" }
+size_of_test = { git = "https://github.com/servo/stylo", branch = "2023-09-01" }
 smallbitvec = "2.5.3"
 smallvec = "1.13"
 sparkle = "0.1.26"
 string_cache = "0.8"
 string_cache_codegen = "0.5"
-style = { git = "https://github.com/servo/stylo", rev = "refs/pull/26/head", features = ["servo"] }
-style_config = { git = "https://github.com/servo/stylo", rev = "refs/pull/26/head" }
-style_traits = { git = "https://github.com/servo/stylo", rev = "refs/pull/26/head", features = ["servo"] }
+style = { git = "https://github.com/servo/stylo", branch = "2023-09-01", features = ["servo"] }
+style_config = { git = "https://github.com/servo/stylo", branch = "2023-09-01" }
+style_traits = { git = "https://github.com/servo/stylo", branch = "2023-09-01", features = ["servo"] }
 # NOTE: the sm-angle feature only enables ANGLE on Windows, not other platforms!
 surfman = { version = "0.9", features = ["chains", "sm-angle", "sm-angle-default"] }
 syn = { version = "2", default-features = false, features = ["clone-impls", "derive", "parsing"] }
 synstructure = "0.13"
 thin-vec = "0.2.13"
 time = "0.1.41"
-to_shmem = { git = "https://github.com/servo/stylo", rev = "refs/pull/26/head" }
+to_shmem = { git = "https://github.com/servo/stylo", branch = "2023-09-01" }
 tokio = "1"
 tokio-rustls = "0.24"
 tungstenite = "0.20"

components/layout_2020/flow/inline.rs

@@ -85,7 +85,6 @@ use style::properties::ComputedValues;
 use style::values::computed::Length;
 use style::values::generics::box_::VerticalAlignKeyword;
 use style::values::generics::text::LineHeight;
-use style::values::specified::box_::BaselineSource;
 use style::values::specified::text::{TextAlignKeyword, TextDecorationLine};
 use style::values::specified::{TextAlignLast, TextJustify};
 use style::Zero;
@@ -2144,18 +2143,13 @@ 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> {
-        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
-            },
+        // 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;
+            }
         }
+        baselines.first
     }
 
     fn get_block_sizes_and_baseline_offset(

tests/wpt/include.ini

@@ -49,6 +49,8 @@ skip: true
     skip: true
   [css-inline]
     skip: true
+    [baseline-source]
+      skip: false
   [css-layout-api]
     skip: true
   [css-masking]

tests/wpt/meta-legacy-layout/css/css-inline/baseline-source/baseline-source-computed.html.ini

@@ -0,0 +1,9 @@
+[baseline-source-computed.html]
+  [Property baseline-source value 'auto']
+    expected: FAIL
+
+  [Property baseline-source value 'first']
+    expected: FAIL
+
+  [Property baseline-source value 'last']
+    expected: FAIL

tests/wpt/meta-legacy-layout/css/css-inline/baseline-source/baseline-source-first-001.html.ini

@@ -0,0 +1,42 @@
+[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
+
+  [.target > * 10]
+    expected: FAIL
+
+  [.target > * 11]
+    expected: FAIL
+
+  [.target > * 13]
+    expected: FAIL
+
+  [.target > * 14]
+    expected: FAIL
+
+  [.target > * 15]
+    expected: FAIL
+
+  [.target > * 17]
+    expected: FAIL
+
+  [.target > * 19]
+    expected: FAIL
+
+  [.target > * 20]
+    expected: FAIL
+
+  [.target > * 21]
+    expected: FAIL

tests/wpt/meta-legacy-layout/css/css-inline/baseline-source/baseline-source-first-002.html.ini

@@ -0,0 +1,60 @@
+[baseline-source-first-002.html]
+  [.target > * 1]
+    expected: FAIL
+
+  [.target > * 2]
+    expected: FAIL
+
+  [.target > * 3]
+    expected: FAIL
+
+  [.target > * 4]
+    expected: FAIL
+
+  [.target > * 5]
+    expected: FAIL
+
+  [.target > * 6]
+    expected: FAIL
+
+  [.target > * 7]
+    expected: FAIL
+
+  [.target > * 8]
+    expected: FAIL
+
+  [.target > * 9]
+    expected: FAIL
+
+  [.target > * 11]
+    expected: FAIL
+
+  [.target > * 12]
+    expected: FAIL
+
+  [.target > * 13]
+    expected: FAIL
+
+  [.target > * 15]
+    expected: FAIL
+
+  [.target > * 16]
+    expected: FAIL
+
+  [.target > * 17]
+    expected: FAIL
+
+  [.target > * 18]
+    expected: FAIL
+
+  [.target > * 19]
+    expected: FAIL
+
+  [.target > * 20]
+    expected: FAIL
+
+  [.target > * 21]
+    expected: FAIL
+
+  [.target > * 22]
+    expected: FAIL

tests/wpt/meta-legacy-layout/css/css-inline/baseline-source/baseline-source-first-003.html.ini

@@ -0,0 +1,60 @@
+[baseline-source-first-003.html]
+  [.target > * 1]
+    expected: FAIL
+
+  [.target > * 2]
+    expected: FAIL
+
+  [.target > * 3]
+    expected: FAIL
+
+  [.target > * 4]
+    expected: FAIL
+
+  [.target > * 5]
+    expected: FAIL
+
+  [.target > * 6]
+    expected: FAIL
+
+  [.target > * 7]
+    expected: FAIL
+
+  [.target > * 8]
+    expected: FAIL
+
+  [.target > * 9]
+    expected: FAIL
+
+  [.target > * 11]
+    expected: FAIL
+
+  [.target > * 12]
+    expected: FAIL
+
+  [.target > * 13]
+    expected: FAIL
+
+  [.target > * 15]
+    expected: FAIL
+
+  [.target > * 16]
+    expected: FAIL
+
+  [.target > * 17]
+    expected: FAIL
+
+  [.target > * 18]
+    expected: FAIL
+
+  [.target > * 19]
+    expected: FAIL
+
+  [.target > * 20]
+    expected: FAIL
+
+  [.target > * 21]
+    expected: FAIL
+
+  [.target > * 22]
+    expected: FAIL