From a90a5cba08fdf6c0ceb95101c275108a152a3aed Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 12 Jun 2024 07:35:37 +0200
Subject: Merging upstream version 127.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 servo/components/style_traits/Cargo.toml              | 3 ++-
 servo/components/style_traits/lib.rs                  | 1 +
 servo/components/style_traits/specified_value_info.rs | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'servo/components/style_traits')

diff --git a/servo/components/style_traits/Cargo.toml b/servo/components/style_traits/Cargo.toml
index 81d6e2bdf4..dd1147dd07 100644
--- a/servo/components/style_traits/Cargo.toml
+++ b/servo/components/style_traits/Cargo.toml
@@ -16,7 +16,7 @@ gecko = ["nsstring"]
 [dependencies]
 app_units = "0.7"
 bitflags = "2"
-cssparser = "0.33"
+cssparser = "0.34"
 euclid = "0.22"
 lazy_static = "1"
 malloc_size_of = { path = "../malloc_size_of" }
@@ -27,6 +27,7 @@ serde = "1.0"
 servo_arc = { path = "../servo_arc" }
 servo_atoms = { path = "../atoms", optional = true }
 servo_url = { path = "../url", optional = true }
+thin-vec = "0.2"
 to_shmem = { path = "../to_shmem" }
 to_shmem_derive = { path = "../to_shmem_derive" }
 webrender_api = { git = "https://github.com/servo/webrender", optional = true }
diff --git a/servo/components/style_traits/lib.rs b/servo/components/style_traits/lib.rs
index 9bb2b3c655..713165b000 100644
--- a/servo/components/style_traits/lib.rs
+++ b/servo/components/style_traits/lib.rs
@@ -29,6 +29,7 @@ extern crate servo_arc;
 extern crate servo_atoms;
 #[cfg(feature = "servo")]
 extern crate servo_url;
+extern crate thin_vec;
 extern crate to_shmem;
 #[macro_use]
 extern crate to_shmem_derive;
diff --git a/servo/components/style_traits/specified_value_info.rs b/servo/components/style_traits/specified_value_info.rs
index 1dd368d36e..6e6c06ce95 100644
--- a/servo/components/style_traits/specified_value_info.rs
+++ b/servo/components/style_traits/specified_value_info.rs
@@ -9,6 +9,7 @@ use crate::owned_slice::OwnedSlice;
 use servo_arc::Arc;
 use std::ops::Range;
 use std::sync::Arc as StdArc;
+use thin_vec::ThinVec;
 
 /// Type of value that a property supports. This is used by Gecko's
 /// devtools to make sense about value it parses, and types listed
@@ -119,6 +120,7 @@ macro_rules! impl_generic_specified_value_info {
 impl_generic_specified_value_info!(Option<T>);
 impl_generic_specified_value_info!(OwnedSlice<T>);
 impl_generic_specified_value_info!(Vec<T>);
+impl_generic_specified_value_info!(ThinVec<T>);
 impl_generic_specified_value_info!(Arc<T>);
 impl_generic_specified_value_info!(StdArc<T>);
 impl_generic_specified_value_info!(ArcSlice<T>);
-- 
cgit v1.2.3