diff options
| author | Oriol Brufau <obrufau@igalia.com> | 2024-04-29 12:40:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-29 10:40:44 +0000 |
| commit | d490fdf83c84871ecf92f6ba9ca4216e41e0a977 (patch) | |
| tree | 618b25534ece883913cf09fb8c4fb037651c7a16 /Cargo.toml | |
| parent | a1f8c19355f7e0e673511c24feeae60d47f19c1c (diff) | |
| download | servo-d490fdf83c84871ecf92f6ba9ca4216e41e0a977.tar.gz servo-d490fdf83c84871ecf92f6ba9ca4216e41e0a977.zip | |
Turn white-space into a shorthand (#32146)
Bumps Stylo to servo/stylo#37
`white-space` is split into `white-space-collapse` and `text-wrap-mode`:
| white-space | white-space-collapse | text-wrap-mode |
| ----------- | -------------------- | -------------- |
| normal | collapse | wrap |
| nowrap | collapse | nowrap |
| pre-wrap | preserve | wrap |
| pre | preserve | nowrap |
| pre-line | preserve-breaks | wrap |
| - | preserve-breaks | nowrap |
Note this introduces a combination that wasn't previously possible,
but I think the existing logic can handle it well enough.
The old `allow_wrap()` is replaced by checking whether `text-wrap-mode`
is set to `wrap`.
The old `preserve_newlines()` is replaced by checking whether
`white-space-collapse` is *not* set to `collapse`.
The old `preserve_spaces()` is replaced by checking whether
`white-space-collapse` is set to `preserve`.
Diffstat (limited to 'Cargo.toml')
| -rw-r--r-- | Cargo.toml | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Cargo.toml b/Cargo.toml index db5f20fd35b..f4e35a47637 100644 --- a/Cargo.toml +++ b/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 = "6faedad67ac2e320b51ac72a165b0ceb52caf918", features = ["servo"] } +malloc_size_of = { git = "https://github.com/servo/stylo", branch = "2024-04-16", 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.12", 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 = "6faedad67ac2e320b51ac72a165b0ceb52caf918" } +selectors = { git = "https://github.com/servo/stylo", branch = "2024-04-16" } serde = "1.0.198" 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 = "6faedad67ac2e320b51ac72a165b0ceb52caf918" } -servo_atoms = { git = "https://github.com/servo/stylo", rev = "6faedad67ac2e320b51ac72a165b0ceb52caf918" } -size_of_test = { git = "https://github.com/servo/stylo", rev = "6faedad67ac2e320b51ac72a165b0ceb52caf918" } +servo_arc = { git = "https://github.com/servo/stylo", branch = "2024-04-16" } +servo_atoms = { git = "https://github.com/servo/stylo", branch = "2024-04-16" } +size_of_test = { git = "https://github.com/servo/stylo", branch = "2024-04-16" } 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 = "6faedad67ac2e320b51ac72a165b0ceb52caf918", features = ["servo"] } -style_config = { git = "https://github.com/servo/stylo", rev = "6faedad67ac2e320b51ac72a165b0ceb52caf918" } -style_traits = { git = "https://github.com/servo/stylo", rev = "6faedad67ac2e320b51ac72a165b0ceb52caf918", features = ["servo"] } +style = { git = "https://github.com/servo/stylo", branch = "2024-04-16", features = ["servo"] } +style_config = { git = "https://github.com/servo/stylo", branch = "2024-04-16" } +style_traits = { git = "https://github.com/servo/stylo", branch = "2024-04-16", features = ["servo"] } # NOTE: the sm-angle feature only 2024-03-01rms! 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 = "6faedad67ac2e320b51ac72a165b0ceb52caf918" } +to_shmem = { git = "https://github.com/servo/stylo", branch = "2024-04-16" } tokio = "1" tokio-rustls = "0.24" tungstenite = "0.20" |