diff --git a/Cargo.lock b/Cargo.lock index 9da33e8..0e263d3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8459,7 +8459,7 @@ dependencies = [ [[package]] name = "servo" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "accesskit", "arboard", @@ -8523,7 +8523,7 @@ dependencies = [ [[package]] name = "servo-allocator" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "libc", "tikv-jemalloc-sys", @@ -8534,7 +8534,7 @@ dependencies = [ [[package]] name = "servo-background-hang-monitor" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "backtrace", "crossbeam-channel", @@ -8549,7 +8549,7 @@ dependencies = [ [[package]] name = "servo-background-hang-monitor-api" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "serde", "servo-base", @@ -8558,7 +8558,7 @@ dependencies = [ [[package]] name = "servo-base" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "accesskit", "crossbeam-channel", @@ -8583,7 +8583,7 @@ dependencies = [ [[package]] name = "servo-canvas" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "bytemuck", "crossbeam-channel", @@ -8608,7 +8608,7 @@ dependencies = [ [[package]] name = "servo-canvas-traits" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "crossbeam-channel", "euclid", @@ -8630,7 +8630,7 @@ dependencies = [ [[package]] name = "servo-config" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "num_enum", "serde", @@ -8643,7 +8643,7 @@ dependencies = [ [[package]] name = "servo-config-macro" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "proc-macro2", "quote", @@ -8654,7 +8654,7 @@ dependencies = [ [[package]] name = "servo-constellation" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "accesskit", "backtrace", @@ -8698,7 +8698,7 @@ dependencies = [ [[package]] name = "servo-constellation-traits" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "base64", "content-security-policy", @@ -8733,7 +8733,7 @@ dependencies = [ [[package]] name = "servo-default-resources" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "servo-embedder-traits", ] @@ -8741,7 +8741,7 @@ dependencies = [ [[package]] name = "servo-deny-public-fields" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "proc-macro2", "syn 2.0.117", @@ -8751,7 +8751,7 @@ dependencies = [ [[package]] name = "servo-devtools" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "atomic_refcell", "base64", @@ -8781,7 +8781,7 @@ dependencies = [ [[package]] name = "servo-devtools-traits" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "http 1.4.0", "malloc_size_of_derive", @@ -8798,7 +8798,7 @@ dependencies = [ [[package]] name = "servo-dom-struct" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "prettyplease", "proc-macro2", @@ -8809,7 +8809,7 @@ dependencies = [ [[package]] name = "servo-embedder-traits" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "accesskit", "bitflags 2.11.1", @@ -8843,7 +8843,7 @@ dependencies = [ [[package]] name = "servo-fonts" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "app_units", "bitflags 2.11.1", @@ -8900,7 +8900,7 @@ dependencies = [ [[package]] name = "servo-fonts-traits" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "atomic_refcell", "dwrote", @@ -8924,7 +8924,7 @@ dependencies = [ [[package]] name = "servo-geometry" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "app_units", "euclid", @@ -8937,7 +8937,7 @@ dependencies = [ [[package]] name = "servo-hyper-serde" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "cookie 0.18.1", "headers", @@ -8951,7 +8951,7 @@ dependencies = [ [[package]] name = "servo-jstraceable-derive" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "proc-macro2", "syn 2.0.117", @@ -8961,7 +8961,7 @@ dependencies = [ [[package]] name = "servo-layout" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "accesskit", "app_units", @@ -9018,7 +9018,7 @@ dependencies = [ [[package]] name = "servo-layout-api" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "app_units", "atomic_refcell", @@ -9051,7 +9051,7 @@ dependencies = [ [[package]] name = "servo-malloc-size-of" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "app_units", "atomic_refcell", @@ -9094,7 +9094,7 @@ dependencies = [ [[package]] name = "servo-media" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "servo-base", "servo-media-audio", @@ -9107,7 +9107,7 @@ dependencies = [ [[package]] name = "servo-media-audio" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "byte-slice-cast", "euclid", @@ -9130,7 +9130,7 @@ dependencies = [ [[package]] name = "servo-media-derive" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "proc-macro2", "quote", @@ -9140,7 +9140,7 @@ dependencies = [ [[package]] name = "servo-media-dummy" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "servo-base", "servo-media", @@ -9154,7 +9154,7 @@ dependencies = [ [[package]] name = "servo-media-ohos" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "crossbeam-channel", "libc", @@ -9177,7 +9177,7 @@ dependencies = [ [[package]] name = "servo-media-player" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "malloc_size_of_derive", "serde", @@ -9190,7 +9190,7 @@ dependencies = [ [[package]] name = "servo-media-streams" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "malloc_size_of_derive", "servo-malloc-size-of", @@ -9200,7 +9200,7 @@ dependencies = [ [[package]] name = "servo-media-thread" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "euclid", "ipc-channel", @@ -9219,7 +9219,7 @@ dependencies = [ [[package]] name = "servo-media-traits" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "malloc_size_of_derive", "servo-malloc-size-of", @@ -9228,7 +9228,7 @@ dependencies = [ [[package]] name = "servo-media-webrtc" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "log", "servo-media-streams", @@ -9238,7 +9238,7 @@ dependencies = [ [[package]] name = "servo-metrics" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "malloc_size_of_derive", "servo-base", @@ -9253,7 +9253,7 @@ dependencies = [ [[package]] name = "servo-net" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "async-compression", "async-recursion", @@ -9323,7 +9323,7 @@ dependencies = [ [[package]] name = "servo-net-traits" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "content-security-policy", "cookie 0.18.1", @@ -9363,7 +9363,7 @@ dependencies = [ [[package]] name = "servo-paint" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "bitflags 2.11.1", "crossbeam-channel", @@ -9400,7 +9400,7 @@ dependencies = [ [[package]] name = "servo-paint-api" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "bitflags 2.11.1", "crossbeam-channel", @@ -9435,7 +9435,7 @@ dependencies = [ [[package]] name = "servo-pixels" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "euclid", "image", @@ -9450,7 +9450,7 @@ dependencies = [ [[package]] name = "servo-profile" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "libc", "log", @@ -9468,7 +9468,7 @@ dependencies = [ [[package]] name = "servo-profile-traits" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "crossbeam-channel", "ipc-channel", @@ -9484,7 +9484,7 @@ dependencies = [ [[package]] name = "servo-script" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "aes 0.9.1", "aes-gcm", @@ -9624,7 +9624,7 @@ dependencies = [ [[package]] name = "servo-script-bindings" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "bitflags 2.11.1", "crossbeam-channel", @@ -9663,7 +9663,7 @@ dependencies = [ [[package]] name = "servo-script-traits" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "accesskit", "crossbeam-channel", @@ -9697,7 +9697,7 @@ dependencies = [ [[package]] name = "servo-storage" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "libc", "log", @@ -9722,7 +9722,7 @@ dependencies = [ [[package]] name = "servo-storage-traits" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "malloc_size_of_derive", "serde", @@ -9736,7 +9736,7 @@ dependencies = [ [[package]] name = "servo-timers" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "crossbeam-channel", "malloc_size_of_derive", @@ -9746,7 +9746,7 @@ dependencies = [ [[package]] name = "servo-tracing" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "proc-macro2", "quote", @@ -9756,7 +9756,7 @@ dependencies = [ [[package]] name = "servo-url" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "encoding_rs", "malloc_size_of_derive", @@ -9770,7 +9770,7 @@ dependencies = [ [[package]] name = "servo-wakelock" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "serde", "servo-embedder-traits", @@ -9779,7 +9779,7 @@ dependencies = [ [[package]] name = "servo-webgl" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "bitflags 2.11.1", "byteorder", @@ -9803,7 +9803,7 @@ dependencies = [ [[package]] name = "servo-webxr-api" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "euclid", "ipc-channel", @@ -9819,7 +9819,7 @@ dependencies = [ [[package]] name = "servo-xpath" version = "0.4.0" -source = "git+https://github.com/servo/servo.git?rev=a87625150758fe91a29e7f6553ff2f798b87027e#a87625150758fe91a29e7f6553ff2f798b87027e" +source = "git+https://github.com/ZacharyZhang-NY/servo.git?rev=8f6850ceb0bd92aea4127d8078ebb2c0485e7f39#8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" dependencies = [ "log", "malloc_size_of_derive", diff --git a/Cargo.toml b/Cargo.toml index b69b695..8fc83f8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -36,7 +36,7 @@ hpke = { version = "0.14.0", default-features = false, features = ["alloc", "cha image = "0.25.10" keyring-core = "1.0.0" rustix = "1.1.4" -servo = { version = "0.4.0", git = "https://github.com/servo/servo.git", rev = "a87625150758fe91a29e7f6553ff2f798b87027e" } +servo = { version = "0.4.0", git = "https://github.com/ZacharyZhang-NY/servo.git", rev = "8f6850ceb0bd92aea4127d8078ebb2c0485e7f39" } sha2 = "0.10.9" semver = "1.0.28" serde = { version = "1.0.228", features = ["derive"] } diff --git a/agents.md b/agents.md index d9bba50..b0fb10a 100644 --- a/agents.md +++ b/agents.md @@ -93,6 +93,11 @@ Real and verified: frames from the active render epoch remain presentable while newer input is queued. Clicks, text, and allow-once permission transfers retain strict ordering. Verified by generation, blocked-worker burst, and live-site tests. +- macOS font fallback: CoreText selects a style- and language-compatible system + font before Servo's static fallback list, preserving sans-serif CJK and + Devanagari typography while retaining serif Chinese. Verified against + PingFang SC, Hiragino Sans, Apple SD Gothic Neo, Kohinoor Devanagari, and + Songti SC with real Servo canvas pixels. - Website color scheme: resolved System/Light/Dark state crosses sidecar protocol v4 and reaches `WebView::notify_theme_change`; GPUI appearance events trigger a shell repaint, and first-navigation WebView replacement diff --git a/crates/ely_servo_host/tests/macos_font_fallback.rs b/crates/ely_servo_host/tests/macos_font_fallback.rs new file mode 100644 index 0000000..41106e2 --- /dev/null +++ b/crates/ely_servo_host/tests/macos_font_fallback.rs @@ -0,0 +1,114 @@ +#![cfg(all(feature = "servo-engine", target_os = "macos"))] + +use std::{error::Error, thread, time::Duration}; + +use ely_domain::{ProfileId, TabId, UrlText}; +use ely_servo_host::{ + NavigationRequest, ServoHost, ServoSurfaceSize, SoftwareServoHost, WebViewState, +}; + +const EXPECTED_PASS_COLOR: [u8; 3] = [31, 143, 76]; + +#[test] +fn macos_fallback_preserves_css_family_style_and_language() -> Result<(), Box> { + let mut host = SoftwareServoHost::new(ServoSurfaceSize::new(320, 240))?; + let tab_id = TabId::new(); + let profile_id = ProfileId::new(); + let webview_id = host.create_webview(tab_id.clone(), profile_id)?; + + host.navigate(NavigationRequest { + webview_id: webview_id.clone(), + tab_id, + url: UrlText::parse(font_probe_url())?, + })?; + + for _ in 0..5_000 { + host.tick(); + let snapshot = host.snapshot(&webview_id)?; + if snapshot.has_pending_frame() { + host.paint(&webview_id)?; + } + + let snapshot = host.snapshot(&webview_id)?; + if snapshot.state() == &WebViewState::Complete + && host + .last_rendered_frame() + .is_ok_and(|frame| center_pixel_rgb(&frame) == EXPECTED_PASS_COLOR) + { + return Ok(()); + } + thread::sleep(Duration::from_millis(2)); + } + + let actual = host.last_rendered_frame().map(|frame| center_pixel_rgb(&frame)); + let title = host.snapshot(&webview_id)?.title().map(str::to_owned); + Err(format!( + "macOS font fallback probe failed with center pixel {actual:?} and title {title:?}" + ) + .into()) +} + +fn font_probe_url() -> String { + let html = r#" +starting"#; + format!("data:text/html,{}", percent_encode(html)) +} + +fn percent_encode(value: &str) -> String { + value + .bytes() + .map(|byte| match byte { + b'A'..=b'Z' | b'a'..=b'z' | b'0'..=b'9' | b'-' | b'_' | b'.' | b'~' => { + (byte as char).to_string() + } + _ => format!("%{byte:02X}"), + }) + .collect() +} + +fn center_pixel_rgb(frame: &ely_servo_host::RenderedFrame) -> [u8; 3] { + let index = (((frame.height() / 2) * frame.width() + frame.width() / 2) * 4) as usize; + let rgba = &frame.rgba_bytes()[index..index + 4]; + [rgba[0], rgba[1], rgba[2]] +} diff --git a/docs/servo-embedding-architecture.md b/docs/servo-embedding-architecture.md index 8043ce3..9a7a709 100644 --- a/docs/servo-embedding-architecture.md +++ b/docs/servo-embedding-architecture.md @@ -109,8 +109,10 @@ The integration gates prove these invariants with real Servo networking: ## Upstream Servo Route -ELY pins Servo upstream commit `a87625150758fe91a29e7f6553ff2f798b87027e`, workspace version -`0.4.0`, in `Cargo.toml` and `Cargo.lock`. +ELY pins fork commit `8f6850ceb0bd92aea4127d8078ebb2c0485e7f39`, based on Servo upstream +commit `a87625150758fe91a29e7f6553ff2f798b87027e`, workspace version `0.4.0`, in +`Cargo.toml` and `Cargo.lock`. The fork moves macOS CoreText fallback ahead of Servo's static +fallback-family list so the first CSS font preserves its serif or sans-serif cascade and language. Servo's rendering lifecycle remains authoritative inside each sidecar: @@ -129,6 +131,8 @@ Relevant upstream evidence at the pinned revision: - `ports/servoshell/window.rs` repaints with `webview.paint()` and presents the context. - `ports/servoshell/running_app_state.rs` maps `notify_new_frame_ready` to repaint scheduling. - `components/paint/paint.rs` owns one WebRender painter per rendering context. +- `components/fonts/font.rs` asks CoreText for a style- and language-compatible macOS fallback + before consulting the cross-platform fallback-family list. ## Ownership