diff --git a/Cargo.lock b/Cargo.lock index 8048e5524a0..55f3358c26a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1171,7 +1171,7 @@ dependencies = [ [[package]] name = "cssparser" version = "0.30.0" -source = "git+https://github.com/servo/rust-cssparser?rev=d3670a89bae26ba3a8db4758eb7976616113987d#d3670a89bae26ba3a8db4758eb7976616113987d" +source = "git+https://github.com/servo/rust-cssparser?rev=b196a164dcbb317016d4aa6c58c13147e6045ebb#b196a164dcbb317016d4aa6c58c13147e6045ebb" dependencies = [ "cssparser-macros", "dtoa-short", @@ -1187,7 +1187,7 @@ dependencies = [ [[package]] name = "cssparser-macros" version = "0.6.0" -source = "git+https://github.com/servo/rust-cssparser?rev=d3670a89bae26ba3a8db4758eb7976616113987d#d3670a89bae26ba3a8db4758eb7976616113987d" +source = "git+https://github.com/servo/rust-cssparser?rev=b196a164dcbb317016d4aa6c58c13147e6045ebb#b196a164dcbb317016d4aa6c58c13147e6045ebb" dependencies = [ "quote", "syn 1.0.103", diff --git a/Cargo.toml b/Cargo.toml index 5b0b61fef6f..a77d898c1e4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,7 +27,7 @@ compositing_traits = { path = "components/shared/compositing" } content-security-policy = { version = "0.5", features = ["serde"] } cookie = "0.12" crossbeam-channel = "0.5" -cssparser = { version = "0.30", git = "https://github.com/servo/rust-cssparser", rev = "d3670a89bae26ba3a8db4758eb7976616113987d" } +cssparser = { version = "0.30", git = "https://github.com/servo/rust-cssparser", rev = "b196a164dcbb317016d4aa6c58c13147e6045ebb" } darling = { version = "0.14", default-features = false } data-url = "0.1.0" devtools_traits = { path = "components/shared/devtools" } diff --git a/components/script/canvas_state.rs b/components/script/canvas_state.rs index 353ab15bb18..c46b82deb35 100644 --- a/components/script/canvas_state.rs +++ b/components/script/canvas_state.rs @@ -12,7 +12,7 @@ use canvas_traits::canvas::{ FillRule, LineCapStyle, LineJoinStyle, LinearGradientStyle, RadialGradientStyle, RepetitionStyle, TextAlign, TextBaseline, }; -use cssparser::{AbsoluteColor, Color as CSSColor, Parser, ParserInput, RGBA}; +use cssparser::{Color as CSSColor, Parser, ParserInput, RGBA}; use euclid::default::{Point2D, Rect, Size2D, Transform2D}; use euclid::vec2; use ipc_channel::ipc::{self, IpcSender, IpcSharedMemory}; @@ -302,7 +302,7 @@ impl CanvasState { let color = CSSColor::parse(&mut parser); if parser.is_exhausted() { match color { - Ok(CSSColor::Absolute(AbsoluteColor::Rgba(rgba))) => Ok(rgba), + Ok(CSSColor::Rgba(rgba)) => Ok(rgba), Ok(CSSColor::CurrentColor) => { // TODO: https://github.com/whatwg/html/issues/1099 // Reconsider how to calculate currentColor in a display:none canvas @@ -1706,7 +1706,7 @@ pub fn parse_color(string: &str) -> Result { let mut input = ParserInput::new(string); let mut parser = Parser::new(&mut input); match CSSColor::parse(&mut parser) { - Ok(CSSColor::Absolute(AbsoluteColor::Rgba(rgba))) => { + Ok(CSSColor::Rgba(rgba)) => { if parser.is_exhausted() { Ok(rgba) } else { diff --git a/components/script/dom/canvasgradient.rs b/components/script/dom/canvasgradient.rs index 10dd7d60cd7..5c54e7cac27 100644 --- a/components/script/dom/canvasgradient.rs +++ b/components/script/dom/canvasgradient.rs @@ -5,7 +5,7 @@ use canvas_traits::canvas::{ CanvasGradientStop, FillOrStrokeStyle, LinearGradientStyle, RadialGradientStyle, }; -use cssparser::{AbsoluteColor, Color as CSSColor, Parser, ParserInput, RGBA}; +use cssparser::{Color as CSSColor, Parser, ParserInput, RGBA}; use dom_struct::dom_struct; use crate::dom::bindings::cell::DomRefCell; @@ -58,7 +58,7 @@ impl CanvasGradientMethods for CanvasGradient { let color = CSSColor::parse(&mut parser); let color = if parser.is_exhausted() { match color { - Ok(CSSColor::Absolute(AbsoluteColor::Rgba(rgba))) => rgba, + Ok(CSSColor::Rgba(rgba)) => rgba, Ok(CSSColor::CurrentColor) => RGBA::new(0, 0, 0, 1.0), _ => return Err(Error::Syntax), } diff --git a/components/style/attr.rs b/components/style/attr.rs index 19beb4f436d..4924cbf13ce 100644 --- a/components/style/attr.rs +++ b/components/style/attr.rs @@ -15,7 +15,7 @@ use crate::values::specified::Length; use crate::values::AtomString; use crate::{Atom, LocalName, Namespace, Prefix}; use app_units::Au; -use cssparser::{self, AbsoluteColor, Color, RGBA}; +use cssparser::{self, Color, RGBA}; use euclid::num::Zero; use num_traits::ToPrimitive; use selectors::attr::AttrSelectorOperation; @@ -419,7 +419,7 @@ pub fn parse_legacy_color(mut input: &str) -> Result { } // Step 5. - if let Ok(Color::Absolute(AbsoluteColor::Rgba(rgba))) = cssparser::parse_color_keyword(input) { + if let Ok(Color::Rgba(rgba)) = cssparser::parse_color_keyword(input) { return Ok(rgba); }