Upgrade cssparser to version 0.36 (#262)

* Upgrade cssparser to version 0.36

Signed-off-by: Oriol Brufau <[email protected]>

* Bug 1996318 - Add display-p3-linear color-space to css color(). r=firefox-style-system-reviewers,dshin,supply-chain-reviewers

It's display-p3 without gamma encoding. cssparser change will obviously
go upstream.

Differential Revision: https://phabricator.services.mozilla.com/D270012

---------

Signed-off-by: Oriol Brufau <[email protected]>
Co-authored-by: Emilio Cobos Álvarez <[email protected]>

Author: Loirooriol

malloc_size_of/Cargo.toml

@@ -15,7 +15,7 @@ servo = ["string_cache"]
 
 [dependencies]
 app_units = "0.7"
-cssparser = "0.35"
+cssparser = "0.36"
 euclid = "0.22"
 selectors = { workspace = true }
 servo_arc = { workspace = true }

selectors/Cargo.toml

@@ -21,7 +21,7 @@ to_shmem = ["dep:to_shmem", "dep:to_shmem_derive"]
 
 [dependencies]
 bitflags = "2"
-cssparser = "0.35"
+cssparser = "0.36"
 derive_more = { version = "2", features = ["add", "add_assign"] }
 rustc-hash = "2.1.1"
 log = "0.4"

style/Cargo.toml

@@ -58,7 +58,7 @@ arrayvec = "0.7"
 atomic_refcell = "0.1"
 bitflags = "2"
 byteorder = "1.0"
-cssparser = "0.35"
+cssparser = "0.36"
 derive_more = { version = "2", features = ["add", "add_assign", "deref", "deref_mut", "from"] }
 dom = { workspace = true }
 new_debug_unreachable = "1.0"

style/color/convert.rs

@@ -487,6 +487,28 @@ impl ColorSpaceConversion for DisplayP3 {
     }
 }
 
+/// The Display-P3-linear color space. This is basically display-p3 without gamma encoding.
+pub struct DisplayP3Linear;
+impl ColorSpaceConversion for DisplayP3Linear {
+    const WHITE_POINT: WhitePoint = DisplayP3::WHITE_POINT;
+
+    fn to_linear_light(from: &ColorComponents) -> ColorComponents {
+        *from
+    }
+
+    fn to_xyz(from: &ColorComponents) -> ColorComponents {
+        DisplayP3::to_xyz(from)
+    }
+
+    fn from_xyz(from: &ColorComponents) -> ColorComponents {
+        DisplayP3::from_xyz(from)
+    }
+
+    fn to_gamma_encoded(from: &ColorComponents) -> ColorComponents {
+        *from
+    }
+}
+
 /// The a98-rgb color space.
 /// https://drafts.csswg.org/css-color-4/#predefined-a98-rgb
 pub struct A98Rgb;

style/color/mod.rs

@@ -103,6 +103,9 @@ pub enum ColorSpace {
     /// A color specified with the color(..) function and the "display-p3"
     /// color space, e.g. "color(display-p3 0.84 0.19 0.72)".
     DisplayP3,
+    /// A color specified with the color(..) function and the "display-p3-linear"
+    /// color space.
+    DisplayP3Linear,
     /// A color specified with the color(..) function and the "a98-rgb" color
     /// space, e.g. "color(a98-rgb 0.44091 0.49971 0.37408)".
     A98Rgb,
@@ -143,6 +146,7 @@ impl ColorSpace {
             Self::Srgb
             | Self::SrgbLinear
             | Self::DisplayP3
+            | Self::DisplayP3Linear
             | Self::A98Rgb
             | Self::ProphotoRgb
             | Self::Rec2020
@@ -506,6 +510,7 @@ impl AbsoluteColor {
             },
             ColorSpace::SrgbLinear
             | ColorSpace::DisplayP3
+            | ColorSpace::DisplayP3Linear
             | ColorSpace::A98Rgb
             | ColorSpace::ProphotoRgb
             | ColorSpace::Rec2020 => match channel_keyword {
@@ -576,6 +581,7 @@ impl AbsoluteColor {
                     Hwb => convert::to_xyz::<convert::Hwb>(&components),
                     SrgbLinear => convert::to_xyz::<convert::SrgbLinear>(&components),
                     DisplayP3 => convert::to_xyz::<convert::DisplayP3>(&components),
+                    DisplayP3Linear => convert::to_xyz::<convert::DisplayP3Linear>(&components),
                     A98Rgb => convert::to_xyz::<convert::A98Rgb>(&components),
                     ProphotoRgb => convert::to_xyz::<convert::ProphotoRgb>(&components),
                     Rec2020 => convert::to_xyz::<convert::Rec2020>(&components),
@@ -593,6 +599,9 @@ impl AbsoluteColor {
                     Hwb => convert::from_xyz::<convert::Hwb>(&xyz, white_point),
                     SrgbLinear => convert::from_xyz::<convert::SrgbLinear>(&xyz, white_point),
                     DisplayP3 => convert::from_xyz::<convert::DisplayP3>(&xyz, white_point),
+                    DisplayP3Linear => {
+                        convert::from_xyz::<convert::DisplayP3Linear>(&xyz, white_point)
+                    },
                     A98Rgb => convert::from_xyz::<convert::A98Rgb>(&xyz, white_point),
                     ProphotoRgb => convert::from_xyz::<convert::ProphotoRgb>(&xyz, white_point),
                     Rec2020 => convert::from_xyz::<convert::Rec2020>(&xyz, white_point),
@@ -630,6 +639,7 @@ impl From<PredefinedColorSpace> for ColorSpace {
             PredefinedColorSpace::Srgb => ColorSpace::Srgb,
             PredefinedColorSpace::SrgbLinear => ColorSpace::SrgbLinear,
             PredefinedColorSpace::DisplayP3 => ColorSpace::DisplayP3,
+            PredefinedColorSpace::DisplayP3Linear => ColorSpace::DisplayP3Linear,
             PredefinedColorSpace::A98Rgb => ColorSpace::A98Rgb,
             PredefinedColorSpace::ProphotoRgb => ColorSpace::ProphotoRgb,
             PredefinedColorSpace::Rec2020 => ColorSpace::Rec2020,

style/color/to_css.rs

@@ -128,14 +128,20 @@ impl ToCss for AbsoluteColor {
                     },
                     ColorSpace::SrgbLinear
                     | ColorSpace::DisplayP3
+                    | ColorSpace::DisplayP3Linear
                     | ColorSpace::A98Rgb
                     | ColorSpace::ProphotoRgb
                     | ColorSpace::Rec2020
                     | ColorSpace::XyzD50
                     | ColorSpace::XyzD65 => {
                         // These color spaces are allowed.
                     },
-                    _ => {
+                    ColorSpace::Hsl
+                    | ColorSpace::Hwb
+                    | ColorSpace::Lab
+                    | ColorSpace::Oklab
+                    | ColorSpace::Lch
+                    | ColorSpace::Oklch => {
                         unreachable!("other color spaces do not support color() syntax")
                     },
                 };
@@ -269,6 +275,7 @@ impl AbsoluteColor {
             },
             ColorSpace::SrgbLinear
             | ColorSpace::DisplayP3
+            | ColorSpace::DisplayP3Linear
             | ColorSpace::A98Rgb
             | ColorSpace::ProphotoRgb
             | ColorSpace::Rec2020

style/properties/mod.rs

@@ -745,10 +745,10 @@ fn parse_non_custom_property_declaration_value_into<'i>(
     };
 
     input.reset(&start);
-    input.look_for_var_or_env_functions();
+    input.look_for_arbitrary_substitution_functions(&["var", "env"]);
     let err = match parse_entirely_into(declarations, input) {
         Ok(()) => {
-            input.seen_var_or_env_functions();
+            input.seen_arbitrary_substitution_functions();
             return Ok(());
         },
         Err(e) => e,
@@ -770,7 +770,7 @@ fn parse_non_custom_property_declaration_value_into<'i>(
         }
         at_start = false;
     }
-    if !input.seen_var_or_env_functions() || invalid {
+    if !input.seen_arbitrary_substitution_functions() || invalid {
         return Err(err);
     }
     input.reset(start);

style_traits/Cargo.toml

@@ -20,7 +20,7 @@ gecko = []
 [dependencies]
 app_units = "0.7"
 bitflags = "2"
-cssparser = "0.35"
+cssparser = "0.36"
 euclid = "0.22"
 malloc_size_of = { workspace = true}
 malloc_size_of_derive = "0.1"

to_shmem/Cargo.toml

@@ -23,7 +23,7 @@ string_cache = ["dep:string_cache"]
 thin-vec = ["dep:thin-vec"]
 
 [dependencies]
-cssparser = { version = "0.35", optional = true }
+cssparser = { version = "0.36", optional = true }
 servo_arc = { workspace = true, optional = true }
 smallbitvec = { version = "2.3.0", optional = true }
 smallvec = { version = "1.13", optional = true }