diff --git a/components/style/properties/longhand/pointing.mako.rs b/components/style/properties/longhand/pointing.mako.rs index 121e5193b4c..0965640482e 100644 --- a/components/style/properties/longhand/pointing.mako.rs +++ b/components/style/properties/longhand/pointing.mako.rs @@ -9,12 +9,9 @@ <%helpers:longhand name="cursor" boxed="${product == 'gecko'}" animation_value_type="discrete" spec="https://drafts.csswg.org/css-ui/#cursor"> pub use self::computed_value::T as SpecifiedValue; - use values::computed::ComputedValueAsSpecified; #[cfg(feature = "gecko")] use values::specified::url::SpecifiedUrl; - impl ComputedValueAsSpecified for SpecifiedValue {} - pub mod computed_value { #[cfg(feature = "gecko")] use std::fmt; @@ -25,7 +22,7 @@ use values::specified::url::SpecifiedUrl; #[cfg_attr(feature = "servo", derive(HeapSizeOf))] - #[derive(Clone, Copy, Debug, PartialEq, ToCss)] + #[derive(Clone, Copy, Debug, PartialEq, ToComputedValue, ToCss)] pub enum Keyword { Auto, Cursor(Cursor), @@ -35,14 +32,14 @@ pub type T = Keyword; #[cfg(feature = "gecko")] - #[derive(Clone, Debug, PartialEq)] + #[derive(Clone, Debug, PartialEq, ToComputedValue)] pub struct Image { pub url: SpecifiedUrl, pub hotspot: Option<(f32, f32)>, } #[cfg(feature = "gecko")] - #[derive(Clone, Debug, PartialEq)] + #[derive(Clone, Debug, PartialEq, ToComputedValue)] pub struct T { pub images: Vec, pub keyword: Keyword, diff --git a/components/style/values/computed/mod.rs b/components/style/values/computed/mod.rs index 46191a30400..339417ff2e7 100644 --- a/components/style/values/computed/mod.rs +++ b/components/style/values/computed/mod.rs @@ -19,6 +19,7 @@ use std::fmt; #[cfg(feature = "servo")] use std::sync::Arc; use style_traits::ToCss; +use style_traits::cursor::Cursor; use super::{CSSFloat, CSSInteger}; use super::generics::{GreaterThanOrEqualToOne, NonNegative}; use super::generics::grid::{GridLine as GenericGridLine, TrackBreadth as GenericTrackBreadth}; @@ -340,6 +341,7 @@ trivial_to_computed_value!(u8); trivial_to_computed_value!(u16); trivial_to_computed_value!(Atom); trivial_to_computed_value!(BorderStyle); +trivial_to_computed_value!(Cursor); trivial_to_computed_value!(Namespace); trivial_to_computed_value!(String);