Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade Stylo to 2025-01-02 (#34894)

Browse source 
* Upgrade Stylo to 2025-01-02

Signed-off-by: Oriol Brufau <obrufau@igalia.com>

* Update test expectations

Signed-off-by: Oriol Brufau <obrufau@igalia.com>

---------

Signed-off-by: Oriol Brufau <obrufau@igalia.com>
This commit is contained in:
Oriol Brufau 2025-01-08 12:51:44 -08:00 • committed by GitHub
parent 06dfef9298
commit ec8a5c37cd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 21 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Cargo.lock generated
View file

@ -1593,7 +1593,7 @@ dependencies = [
[[package]] [[package]]
name = "dom" name = "dom"
version = "0.0.1" version = "0.0.1"
source = "git+https://github.com/servo/stylo?branch=2024-12-04#fbd6a1448bb699000ae18067ea1b455e4cce7c97" source = "git+https://github.com/servo/stylo?branch=2025-01-02#dfed17bd04a713f5dce775176c3a28c39c934970"
dependencies = [ dependencies = [
"bitflags 2.6.0", "bitflags 2.6.0",
"malloc_size_of", "malloc_size_of",
@ -4325,7 +4325,7 @@ dependencies = [
[[package]] [[package]]
name = "malloc_size_of" name = "malloc_size_of"
version = "0.0.1" version = "0.0.1"
source = "git+https://github.com/servo/stylo?branch=2024-12-04#fbd6a1448bb699000ae18067ea1b455e4cce7c97" source = "git+https://github.com/servo/stylo?branch=2025-01-02#dfed17bd04a713f5dce775176c3a28c39c934970"
dependencies = [ dependencies = [
"app_units", "app_units",
"cssparser", "cssparser",
@ -6281,7 +6281,7 @@ dependencies = [
[[package]] [[package]]
name = "selectors" name = "selectors"
version = "0.26.0" version = "0.26.0"
source = "git+https://github.com/servo/stylo?branch=2024-12-04#fbd6a1448bb699000ae18067ea1b455e4cce7c97" source = "git+https://github.com/servo/stylo?branch=2025-01-02#dfed17bd04a713f5dce775176c3a28c39c934970"
dependencies = [ dependencies = [
"bitflags 2.6.0", "bitflags 2.6.0",
"cssparser", "cssparser",
@ -6569,7 +6569,7 @@ dependencies = [
[[package]] [[package]]
name = "servo_arc" name = "servo_arc"
version = "0.4.0" version = "0.4.0"
source = "git+https://github.com/servo/stylo?branch=2024-12-04#fbd6a1448bb699000ae18067ea1b455e4cce7c97" source = "git+https://github.com/servo/stylo?branch=2025-01-02#dfed17bd04a713f5dce775176c3a28c39c934970"
dependencies = [ dependencies = [
"serde", "serde",
"stable_deref_trait", "stable_deref_trait",
@ -6578,7 +6578,7 @@ dependencies = [
[[package]] [[package]]
name = "servo_atoms" name = "servo_atoms"
version = "0.0.1" version = "0.0.1"
source = "git+https://github.com/servo/stylo?branch=2024-12-04#fbd6a1448bb699000ae18067ea1b455e4cce7c97" source = "git+https://github.com/servo/stylo?branch=2025-01-02#dfed17bd04a713f5dce775176c3a28c39c934970"
dependencies = [ dependencies = [
"string_cache", "string_cache",
"string_cache_codegen", "string_cache_codegen",
@ -6950,7 +6950,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
[[package]] [[package]]
name = "static_prefs" name = "static_prefs"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/servo/stylo?branch=2024-12-04#fbd6a1448bb699000ae18067ea1b455e4cce7c97" source = "git+https://github.com/servo/stylo?branch=2025-01-02#dfed17bd04a713f5dce775176c3a28c39c934970"
[[package]] [[package]]
name = "strck" name = "strck"
@ -7009,7 +7009,7 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
[[package]] [[package]]
name = "style" name = "style"
version = "0.0.1" version = "0.0.1"
source = "git+https://github.com/servo/stylo?branch=2024-12-04#fbd6a1448bb699000ae18067ea1b455e4cce7c97" source = "git+https://github.com/servo/stylo?branch=2025-01-02#dfed17bd04a713f5dce775176c3a28c39c934970"
dependencies = [ dependencies = [
"app_units", "app_units",
"arrayvec", "arrayvec",
@ -7067,7 +7067,7 @@ dependencies = [
[[package]] [[package]]
name = "style_config" name = "style_config"
version = "0.0.1" version = "0.0.1"
source = "git+https://github.com/servo/stylo?branch=2024-12-04#fbd6a1448bb699000ae18067ea1b455e4cce7c97" source = "git+https://github.com/servo/stylo?branch=2025-01-02#dfed17bd04a713f5dce775176c3a28c39c934970"
dependencies = [ dependencies = [
"lazy_static", "lazy_static",
] ]
@ -7075,7 +7075,7 @@ dependencies = [
[[package]] [[package]]
name = "style_derive" name = "style_derive"
version = "0.0.1" version = "0.0.1"
source = "git+https://github.com/servo/stylo?branch=2024-12-04#fbd6a1448bb699000ae18067ea1b455e4cce7c97" source = "git+https://github.com/servo/stylo?branch=2025-01-02#dfed17bd04a713f5dce775176c3a28c39c934970"
dependencies = [ dependencies = [
"darling", "darling",
"proc-macro2", "proc-macro2",
@ -7105,7 +7105,7 @@ dependencies = [
[[package]] [[package]]
name = "style_traits" name = "style_traits"
version = "0.0.1" version = "0.0.1"
source = "git+https://github.com/servo/stylo?branch=2024-12-04#fbd6a1448bb699000ae18067ea1b455e4cce7c97" source = "git+https://github.com/servo/stylo?branch=2025-01-02#dfed17bd04a713f5dce775176c3a28c39c934970"
dependencies = [ dependencies = [
"app_units", "app_units",
"bitflags 2.6.0", "bitflags 2.6.0",
@ -7500,7 +7500,7 @@ dependencies = [
[[package]] [[package]]
name = "to_shmem" name = "to_shmem"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/servo/stylo?branch=2024-12-04#fbd6a1448bb699000ae18067ea1b455e4cce7c97" source = "git+https://github.com/servo/stylo?branch=2025-01-02#dfed17bd04a713f5dce775176c3a28c39c934970"
dependencies = [ dependencies = [
"cssparser", "cssparser",
"servo_arc", "servo_arc",
@ -7513,7 +7513,7 @@ dependencies = [
[[package]] [[package]]
name = "to_shmem_derive" name = "to_shmem_derive"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/servo/stylo?branch=2024-12-04#fbd6a1448bb699000ae18067ea1b455e4cce7c97" source = "git+https://github.com/servo/stylo?branch=2025-01-02#dfed17bd04a713f5dce775176c3a28c39c934970"
dependencies = [ dependencies = [
"darling", "darling",
"proc-macro2", "proc-macro2",

18
Cargo.toml
View file

@ -110,25 +110,25 @@ rustls-pemfile = "2.0"
rustls-pki-types = "1.10" rustls-pki-types = "1.10"
script_layout_interface = { path = "components/shared/script_layout" } script_layout_interface = { path = "components/shared/script_layout" }
script_traits = { path = "components/shared/script" } script_traits = { path = "components/shared/script" }
selectors = { git = "https://github.com/servo/stylo", branch = "2024-12-04" } selectors = { git = "https://github.com/servo/stylo", branch = "2025-01-02" }
serde = "1.0.217" serde = "1.0.217"
serde_bytes = "0.11" serde_bytes = "0.11"
serde_json = "1.0" serde_json = "1.0"
servo-media = { git = "https://github.com/servo/media" } servo-media = { git = "https://github.com/servo/media" }
servo-media-dummy = { 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-media-gstreamer = { git = "https://github.com/servo/media" }
servo_arc = { git = "https://github.com/servo/stylo", branch = "2024-12-04", features = ["servo"] } servo_arc = { git = "https://github.com/servo/stylo", branch = "2025-01-02", features = ["servo"] }
servo_atoms = { git = "https://github.com/servo/stylo", branch = "2024-12-04" } servo_atoms = { git = "https://github.com/servo/stylo", branch = "2025-01-02" }
smallbitvec = "2.5.3" smallbitvec = "2.5.3"
smallvec = "1.13" smallvec = "1.13"
static_assertions = "1.1" static_assertions = "1.1"
string_cache = "0.8" string_cache = "0.8"
string_cache_codegen = "0.5" string_cache_codegen = "0.5"
style = { git = "https://github.com/servo/stylo", branch = "2024-12-04", features = ["servo"] } style = { git = "https://github.com/servo/stylo", branch = "2025-01-02", features = ["servo"] }
style_config = { git = "https://github.com/servo/stylo", branch = "2024-12-04" } style_config = { git = "https://github.com/servo/stylo", branch = "2025-01-02" }
style_dom = { git = "https://github.com/servo/stylo", package = "dom", branch = "2024-12-04" } style_dom = { git = "https://github.com/servo/stylo", package = "dom", branch = "2025-01-02" }
style_traits = { git = "https://github.com/servo/stylo", branch = "2024-12-04", features = ["servo"] } style_traits = { git = "https://github.com/servo/stylo", branch = "2025-01-02", features = ["servo"] }
style_malloc_size_of = { package = "malloc_size_of", git = "https://github.com/servo/stylo", branch = "2024-12-04", features = ["servo"] } style_malloc_size_of = { package = "malloc_size_of", git = "https://github.com/servo/stylo", branch = "2025-01-02", features = ["servo"] }
surfman = { git = "https://github.com/servo/surfman", rev = "300789ddbda45c89e9165c31118bf1c4c07f89f6", features = ["chains"] } surfman = { git = "https://github.com/servo/surfman", rev = "300789ddbda45c89e9165c31118bf1c4c07f89f6", features = ["chains"] }
syn = { version = "2", default-features = false, features = ["clone-impls", "derive", "parsing"] } syn = { version = "2", default-features = false, features = ["clone-impls", "derive", "parsing"] }
synstructure = "0.13" synstructure = "0.13"
@ -137,7 +137,7 @@ thin-vec = "0.2.13"
tikv-jemalloc-sys = "0.6.0" tikv-jemalloc-sys = "0.6.0"
tikv-jemallocator = "0.6.0" tikv-jemallocator = "0.6.0"
time_03 = { package = "time", version = "0.3", features = ["large-dates", "local-offset", "serde"] } time_03 = { package = "time", version = "0.3", features = ["large-dates", "local-offset", "serde"] }
to_shmem = { git = "https://github.com/servo/stylo", branch = "2024-12-04" } to_shmem = { git = "https://github.com/servo/stylo", branch = "2025-01-02" }
tokio = "1" tokio = "1"
tokio-rustls = { version = "0.26", default-features = false, features = ["logging"] } tokio-rustls = { version = "0.26", default-features = false, features = ["logging"] }
tower-service = "0.3" tower-service = "0.3"

30
tests/wpt/meta/css/css-color/parsing/color-computed-relative-color.html.ini vendored
View file

@ -26,27 +26,6 @@
[Property color value 'rgb(from oklch(0 0.399 336.3) r g b)'] [Property color value 'rgb(from oklch(0 0.399 336.3) r g b)']
expected: FAIL expected: FAIL
[Property color value 'rgb(from rebeccapurple none none none)']
expected: FAIL
[Property color value 'rgb(from rebeccapurple none none none / none)']
expected: FAIL
[Property color value 'rgb(from rebeccapurple r g none)']
expected: FAIL
[Property color value 'rgb(from rebeccapurple r g none / alpha)']
expected: FAIL
[Property color value 'rgb(from rebeccapurple r g b / none)']
expected: FAIL
[Property color value 'rgb(from rgb(20% 40% 60% / 80%) r g none / alpha)']
expected: FAIL
[Property color value 'rgb(from rgb(20% 40% 60% / 80%) r g b / none)']
expected: FAIL
[Property color value 'hsl(from color(display-p3 0 1 0) h s l / alpha)'] [Property color value 'hsl(from color(display-p3 0 1 0) h s l / alpha)']
expected: FAIL expected: FAIL
@ -512,21 +491,12 @@
[Property color value 'color(from color-mix(in xyz, color(xyz-d65 0.7 0.5 0.3), color(xyz-d65 0.7 0.5 0.3)) xyz-d65 r g b / alpha)'] [Property color value 'color(from color-mix(in xyz, color(xyz-d65 0.7 0.5 0.3), color(xyz-d65 0.7 0.5 0.3)) xyz-d65 r g b / alpha)']
expected: FAIL expected: FAIL
[Property color value 'color(from rgb(from color(xyz-d50 0.99 0.88 0.77) r g b) xyz-d50 x y z)']
expected: FAIL
[Property color value 'color(from hwb(from color(xyz-d50 0.99 0.88 0.77) h w b) xyz-d50 x y z)'] [Property color value 'color(from hwb(from color(xyz-d50 0.99 0.88 0.77) h w b) xyz-d50 x y z)']
expected: FAIL expected: FAIL
[Property color value 'color(from rgb(from color(xyz-d65 0.99 0.88 0.77) r g b) xyz-d65 x y z)']
expected: FAIL
[Property color value 'color(from hwb(from color(xyz-d65 0.99 0.88 0.77) h w b) xyz-d65 x y z)'] [Property color value 'color(from hwb(from color(xyz-d65 0.99 0.88 0.77) h w b) xyz-d65 x y z)']
expected: FAIL expected: FAIL
[Property color value 'color-mix(in srgb, rgb(from rebeccapurple none g b), rebeccapurple)']
expected: FAIL
[Property color value 'light-dark(rgb(from rebeccapurple r g b), rgb(from rebeccapurple r g b))'] [Property color value 'light-dark(rgb(from rebeccapurple r g b), rgb(from rebeccapurple r g b))']
expected: FAIL expected: FAIL

27
tests/wpt/meta/css/css-color/parsing/relative-color-out-of-gamut.html.ini vendored
View file

@ -1,27 +0,0 @@
[relative-color-out-of-gamut.html]
[Property color value 'rgb(from color(display-p3 0 1 0) r g b / alpha)']
expected: FAIL
[Property color value 'rgb(from lab(100 104.3 -50.9) r g b)']
expected: FAIL
[Property color value 'rgb(from lab(0 104.3 -50.9) r g b)']
expected: FAIL
[Property color value 'rgb(from lch(100 116 334) r g b)']
expected: FAIL
[Property color value 'rgb(from lch(0 116 334) r g b)']
expected: FAIL
[Property color value 'rgb(from oklab(1 0.365 -0.16) r g b)']
expected: FAIL
[Property color value 'rgb(from oklab(0 0.365 -0.16) r g b)']
expected: FAIL
[Property color value 'rgb(from oklch(1 0.399 336.3) r g b)']
expected: FAIL
[Property color value 'rgb(from oklch(0 0.399 336.3) r g b)']
expected: FAIL