diff --git a/Cargo.lock b/Cargo.lock index ef74007701e..fb7c23b0523 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7310,8 +7310,8 @@ dependencies = [ [[package]] name = "selectors" -version = "0.30.0" -source = "git+https://github.com/servo/stylo?branch=2025-07-01#22df130e1485834f336b8543e5f12b9e717ca620" +version = "0.31.0" +source = "git+https://github.com/servo/stylo?branch=2025-08-01#7f8df16fddb15b6ac9097f8ab25caffff1a7095e" dependencies = [ "bitflags 2.9.1", "cssparser", @@ -7617,7 +7617,7 @@ dependencies = [ [[package]] name = "servo_arc" version = "0.4.1" -source = "git+https://github.com/servo/stylo?branch=2025-07-01#22df130e1485834f336b8543e5f12b9e717ca620" +source = "git+https://github.com/servo/stylo?branch=2025-08-01#7f8df16fddb15b6ac9097f8ab25caffff1a7095e" dependencies = [ "serde", "stable_deref_trait", @@ -8088,8 +8088,8 @@ dependencies = [ [[package]] name = "stylo" -version = "0.5.0" -source = "git+https://github.com/servo/stylo?branch=2025-07-01#22df130e1485834f336b8543e5f12b9e717ca620" +version = "0.6.0" +source = "git+https://github.com/servo/stylo?branch=2025-08-01#7f8df16fddb15b6ac9097f8ab25caffff1a7095e" dependencies = [ "app_units", "arrayvec", @@ -8145,8 +8145,8 @@ dependencies = [ [[package]] name = "stylo_atoms" -version = "0.5.0" -source = "git+https://github.com/servo/stylo?branch=2025-07-01#22df130e1485834f336b8543e5f12b9e717ca620" +version = "0.6.0" +source = "git+https://github.com/servo/stylo?branch=2025-08-01#7f8df16fddb15b6ac9097f8ab25caffff1a7095e" dependencies = [ "string_cache", "string_cache_codegen", @@ -8154,13 +8154,13 @@ dependencies = [ [[package]] name = "stylo_config" -version = "0.5.0" -source = "git+https://github.com/servo/stylo?branch=2025-07-01#22df130e1485834f336b8543e5f12b9e717ca620" +version = "0.6.0" +source = "git+https://github.com/servo/stylo?branch=2025-08-01#7f8df16fddb15b6ac9097f8ab25caffff1a7095e" [[package]] name = "stylo_derive" -version = "0.5.0" -source = "git+https://github.com/servo/stylo?branch=2025-07-01#22df130e1485834f336b8543e5f12b9e717ca620" +version = "0.6.0" +source = "git+https://github.com/servo/stylo?branch=2025-08-01#7f8df16fddb15b6ac9097f8ab25caffff1a7095e" dependencies = [ "darling", "proc-macro2", @@ -8171,8 +8171,8 @@ dependencies = [ [[package]] name = "stylo_dom" -version = "0.5.0" -source = "git+https://github.com/servo/stylo?branch=2025-07-01#22df130e1485834f336b8543e5f12b9e717ca620" +version = "0.6.0" +source = "git+https://github.com/servo/stylo?branch=2025-08-01#7f8df16fddb15b6ac9097f8ab25caffff1a7095e" dependencies = [ "bitflags 2.9.1", "stylo_malloc_size_of", @@ -8180,8 +8180,8 @@ dependencies = [ [[package]] name = "stylo_malloc_size_of" -version = "0.5.0" -source = "git+https://github.com/servo/stylo?branch=2025-07-01#22df130e1485834f336b8543e5f12b9e717ca620" +version = "0.6.0" +source = "git+https://github.com/servo/stylo?branch=2025-08-01#7f8df16fddb15b6ac9097f8ab25caffff1a7095e" dependencies = [ "app_units", "cssparser", @@ -8197,13 +8197,13 @@ dependencies = [ [[package]] name = "stylo_static_prefs" -version = "0.5.0" -source = "git+https://github.com/servo/stylo?branch=2025-07-01#22df130e1485834f336b8543e5f12b9e717ca620" +version = "0.6.0" +source = "git+https://github.com/servo/stylo?branch=2025-08-01#7f8df16fddb15b6ac9097f8ab25caffff1a7095e" [[package]] name = "stylo_traits" -version = "0.5.0" -source = "git+https://github.com/servo/stylo?branch=2025-07-01#22df130e1485834f336b8543e5f12b9e717ca620" +version = "0.6.0" +source = "git+https://github.com/servo/stylo?branch=2025-08-01#7f8df16fddb15b6ac9097f8ab25caffff1a7095e" dependencies = [ "app_units", "bitflags 2.9.1", @@ -8618,7 +8618,7 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "to_shmem" version = "0.2.0" -source = "git+https://github.com/servo/stylo?branch=2025-07-01#22df130e1485834f336b8543e5f12b9e717ca620" +source = "git+https://github.com/servo/stylo?branch=2025-08-01#7f8df16fddb15b6ac9097f8ab25caffff1a7095e" dependencies = [ "cssparser", "servo_arc", @@ -8631,7 +8631,7 @@ dependencies = [ [[package]] name = "to_shmem_derive" version = "0.1.0" -source = "git+https://github.com/servo/stylo?branch=2025-07-01#22df130e1485834f336b8543e5f12b9e717ca620" +source = "git+https://github.com/servo/stylo?branch=2025-08-01#7f8df16fddb15b6ac9097f8ab25caffff1a7095e" dependencies = [ "darling", "proc-macro2", diff --git a/Cargo.toml b/Cargo.toml index 62d5382f23e..9a09c9c1811 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -124,7 +124,7 @@ rustls = { version = "0.23", default-features = false, features = ["logging", "s rustls-pemfile = "2.0" rustls-pki-types = "1.12" script_traits = { path = "components/shared/script" } -selectors = { git = "https://github.com/servo/stylo", branch = "2025-07-01" } +selectors = { git = "https://github.com/servo/stylo", branch = "2025-08-01" } serde = "1.0.219" serde_bytes = "0.11" serde_json = "1.0" @@ -132,7 +132,7 @@ 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-tracing = { path = "components/servo_tracing" } -servo_arc = { git = "https://github.com/servo/stylo", branch = "2025-07-01" } +servo_arc = { git = "https://github.com/servo/stylo", branch = "2025-08-01" } smallbitvec = "2.6.0" smallvec = { version = "1.15", features = ["serde", "union"] } static_assertions = "1.1" @@ -140,12 +140,12 @@ string_cache = "0.8" string_cache_codegen = "0.5" strum = "0.26" strum_macros = "0.26" -stylo = { git = "https://github.com/servo/stylo", branch = "2025-07-01" } -stylo_atoms = { git = "https://github.com/servo/stylo", branch = "2025-07-01" } -stylo_config = { git = "https://github.com/servo/stylo", branch = "2025-07-01" } -stylo_dom = { git = "https://github.com/servo/stylo", branch = "2025-07-01" } -stylo_malloc_size_of = { git = "https://github.com/servo/stylo", branch = "2025-07-01" } -stylo_traits = { git = "https://github.com/servo/stylo", branch = "2025-07-01" } +stylo = { git = "https://github.com/servo/stylo", branch = "2025-08-01" } +stylo_atoms = { git = "https://github.com/servo/stylo", branch = "2025-08-01" } +stylo_config = { git = "https://github.com/servo/stylo", branch = "2025-08-01" } +stylo_dom = { git = "https://github.com/servo/stylo", branch = "2025-08-01" } +stylo_malloc_size_of = { git = "https://github.com/servo/stylo", branch = "2025-08-01" } +stylo_traits = { git = "https://github.com/servo/stylo", branch = "2025-08-01" } surfman = { git = "https://github.com/servo/surfman", rev = "f7688b4585f9e0b5d4bf8ee8e4a91e82349610b1", features = ["chains"] } syn = { version = "2", default-features = false, features = ["clone-impls", "derive", "parsing"] } synstructure = "0.13" diff --git a/tests/wpt/meta/css/css-cascade/import-conditional-002.html.ini b/tests/wpt/meta/css/css-cascade/import-conditional-002.html.ini deleted file mode 100644 index ae70bfb0830..00000000000 --- a/tests/wpt/meta/css/css-cascade/import-conditional-002.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[import-conditional-002.html] - expected: FAIL diff --git a/tests/wpt/meta/css/css-cascade/import-conditions.html.ini b/tests/wpt/meta/css/css-cascade/import-conditions.html.ini index dd02309dd0b..eab8a08f296 100644 --- a/tests/wpt/meta/css/css-cascade/import-conditions.html.ini +++ b/tests/wpt/meta/css/css-cascade/import-conditions.html.ini @@ -1,37 +1,4 @@ [import-conditions.html] - [supports(display:block) is a valid import condition] - expected: FAIL - - [supports((display:flex)) is a valid import condition] - expected: FAIL - - [supports((display:block) and (display:flex)) is a valid import condition] - expected: FAIL - - [supports((display:block) or (display:flex)) is a valid import condition] - expected: FAIL - - [supports((display:block) or (foo:bar)) is a valid import condition] - expected: FAIL - - [supports(display: block !important) is a valid import condition] - expected: FAIL - - [supports(display:block) (width >= 0px) is a valid import condition] - expected: FAIL - - [supports(selector(a)) is a valid import condition] - expected: FAIL - - [supports(selector(p a)) is a valid import condition] - expected: FAIL - - [supports(selector(p > a)) is a valid import condition] - expected: FAIL - - [supports(selector(p + a)) is a valid import condition] - expected: FAIL - [supports(font-tech(color-COLRv1)) is a valid import condition] expected: FAIL @@ -43,6 +10,3 @@ [layer(A.B) supports(font-format(opentype)) is a valid import condition] expected: FAIL - - [layer supports(selector(a)) is a valid import condition] - expected: FAIL