Use generics for background-size property

components/layout/display_list_builder.rs

@@ -48,7 +48,7 @@ use std::default::Default;
 use std::mem;
 use std::sync::Arc;
 use style::computed_values::{background_attachment, background_clip, background_origin};
-use style::computed_values::{background_repeat, background_size, border_style, cursor};
+use style::computed_values::{background_repeat, border_style, cursor};
 use style::computed_values::{image_rendering, overflow_x, pointer_events, position, visibility};
 use style::computed_values::filter::Filter;
 use style::computed_values::text_shadow::TextShadow;
@@ -61,6 +61,7 @@ use style::values::{Either, RGBA};
 use style::values::computed::{Gradient, GradientItem, LengthOrPercentage};
 use style::values::computed::{LengthOrPercentageOrAuto, NumberOrPercentage, Position};
 use style::values::computed::image::{EndingShape, LineDirection};
+use style::values::generics::background::BackgroundSize;
 use style::values::generics::image::{Circle, Ellipse, EndingShape as GenericEndingShape};
 use style::values::generics::image::{GradientItem as GenericGradientItem, GradientKind};
 use style::values::generics::image::{Image, ShapeExtent};
@@ -917,43 +918,29 @@ impl FragmentDisplayListBuilding for Fragment {
                                          Au::from_px(image.height as i32));
         let background_size = get_cyclic(&style.get_background().background_size.0, index).clone();
         match (background_size, image_aspect_ratio < bounds_aspect_ratio) {
-            (background_size::single_value::T::Contain, false) |
+            (BackgroundSize::Contain, false) | (BackgroundSize::Cover, true) => {
-            (background_size::single_value::T::Cover, true) => {
                 Size2D::new(bounds.size.width,
                             Au::from_f64_px(bounds.size.width.to_f64_px() / image_aspect_ratio))
             }
 
-            (background_size::single_value::T::Contain, true) |
+            (BackgroundSize::Contain, true) | (BackgroundSize::Cover, false) => {
-            (background_size::single_value::T::Cover, false) => {
                 Size2D::new(Au::from_f64_px(bounds.size.height.to_f64_px() * image_aspect_ratio),
                             bounds.size.height)
             }
 
-            (background_size::single_value::T::Explicit(background_size::single_value
+            (BackgroundSize::Explicit { width, height: LengthOrPercentageOrAuto::Auto }, _) => {
-                                                                       ::ExplicitSize {
-                width,
-                height: LengthOrPercentageOrAuto::Auto,
-            }), _) => {
                 let width = MaybeAuto::from_style(width, bounds.size.width)
                                       .specified_or_default(intrinsic_size.width);
                 Size2D::new(width, Au::from_f64_px(width.to_f64_px() / image_aspect_ratio))
             }
 
-            (background_size::single_value::T::Explicit(background_size::single_value
+            (BackgroundSize::Explicit { width: LengthOrPercentageOrAuto::Auto, height }, _) => {
-                                                                       ::ExplicitSize {
-                width: LengthOrPercentageOrAuto::Auto,
-                height
-            }), _) => {
                 let height = MaybeAuto::from_style(height, bounds.size.height)
                                        .specified_or_default(intrinsic_size.height);
                 Size2D::new(Au::from_f64_px(height.to_f64_px() * image_aspect_ratio), height)
             }
 
-            (background_size::single_value::T::Explicit(background_size::single_value
+            (BackgroundSize::Explicit { width, height }, _) => {
-                                                                       ::ExplicitSize {
-                width,
-                height
-            }), _) => {
                 Size2D::new(MaybeAuto::from_style(width, bounds.size.width)
                                  .specified_or_default(intrinsic_size.width),
                        MaybeAuto::from_style(height, bounds.size.height)

components/style/properties/gecko.mako.rs

@@ -2951,29 +2951,37 @@ fn static_assert() {
         use gecko_bindings::structs::nsStyleImageLayers_Size_Dimension;
         use gecko_bindings::structs::nsStyleImageLayers_Size_DimensionType;
         use gecko_bindings::structs::{nsStyleCoord_CalcValue, nsStyleImageLayers_Size};
-        use properties::longhands::background_size::single_value::computed_value::T;
+        use values::generics::background::BackgroundSize;
 
         let mut width = nsStyleCoord_CalcValue::new();
         let mut height = nsStyleCoord_CalcValue::new();
 
         let (w_type, h_type) = match servo {
-            T::Explicit(size) => {
+            BackgroundSize::Explicit { width: explicit_width, height: explicit_height } => {
                 let mut w_type = nsStyleImageLayers_Size_DimensionType::eAuto;
                 let mut h_type = nsStyleImageLayers_Size_DimensionType::eAuto;
-                if let Some(w) = size.width.to_calc_value() {
+                if let Some(w) = explicit_width.to_calc_value() {
                     width = w;
                     w_type = nsStyleImageLayers_Size_DimensionType::eLengthPercentage;
                 }
-                if let Some(h) = size.height.to_calc_value() {
+                if let Some(h) = explicit_height.to_calc_value() {
                     height = h;
                     h_type = nsStyleImageLayers_Size_DimensionType::eLengthPercentage;
                 }
                 (w_type, h_type)
             }
-            T::Cover => (nsStyleImageLayers_Size_DimensionType::eCover,
+            BackgroundSize::Cover => {
-                         nsStyleImageLayers_Size_DimensionType::eCover),
+                (
-            T::Contain => (nsStyleImageLayers_Size_DimensionType::eContain,
+                    nsStyleImageLayers_Size_DimensionType::eCover,
-                         nsStyleImageLayers_Size_DimensionType::eContain),
+                    nsStyleImageLayers_Size_DimensionType::eCover,
+                )
+            },
+            BackgroundSize::Contain => {
+                (
+                    nsStyleImageLayers_Size_DimensionType::eContain,
+                    nsStyleImageLayers_Size_DimensionType::eContain,
+                )
+            },
         };
 
         nsStyleImageLayers_Size {
@@ -2987,8 +2995,8 @@ fn static_assert() {
     pub fn clone_${shorthand}_size(&self) -> longhands::background_size::computed_value::T {
         use gecko_bindings::structs::nsStyleCoord_CalcValue as CalcValue;
         use gecko_bindings::structs::nsStyleImageLayers_Size_DimensionType as DimensionType;
-        use properties::longhands::background_size::single_value::computed_value::{ExplicitSize, T};
         use values::computed::LengthOrPercentageOrAuto;
+        use values::generics::background::BackgroundSize;
 
         fn to_servo(value: CalcValue, ty: u8) -> LengthOrPercentageOrAuto {
             if ty == DimensionType::eAuto as u8 {
@@ -3003,17 +3011,16 @@ fn static_assert() {
             self.gecko.${image_layers_field}.mLayers.iter().map(|ref layer| {
                 if DimensionType::eCover as u8 == layer.mSize.mWidthType {
                     debug_assert!(layer.mSize.mHeightType == DimensionType::eCover as u8);
-                    return T::Cover
+                    return BackgroundSize::Cover
                 }
                 if DimensionType::eContain as u8 == layer.mSize.mWidthType {
                     debug_assert!(layer.mSize.mHeightType == DimensionType::eContain as u8);
-                    return T::Contain
+                    return BackgroundSize::Contain
                 }
-
+                BackgroundSize::Explicit {
-                T::Explicit(ExplicitSize {
                     width: to_servo(layer.mSize.mWidth._base, layer.mSize.mWidthType),
                     height: to_servo(layer.mSize.mHeight._base, layer.mSize.mHeightType),
-                })
+                }
             }).collect()
         )
     }

components/style/properties/longhand/background.mako.rs

@@ -160,188 +160,13 @@ ${helpers.single_keyword("background-origin",
                          spec="https://drafts.csswg.org/css-backgrounds/#the-background-origin",
                          animation_value_type="none")}
 
-<%helpers:vector_longhand name="background-size" animation_value_type="ComputedValue" extra_prefixes="webkit"
+${helpers.predefined_type("background-size", "BackgroundSize",
-                          spec="https://drafts.csswg.org/css-backgrounds/#the-background-size">
+    initial_value="computed::LengthOrPercentageOrAuto::Auto.into()",
-    use std::fmt;
+    initial_specified_value="specified::LengthOrPercentageOrAuto::Auto.into()",
-    use style_traits::ToCss;
+    spec="https://drafts.csswg.org/css-backgrounds/#the-background-size",
-
+    vector=True,
-    #[allow(missing_docs)]
+    animation_value_type="ComputedValue",
-    pub mod computed_value {
+    extra_prefixes="webkit")}
-        use values::computed::LengthOrPercentageOrAuto;
-        use properties::animated_properties::{Animatable, RepeatableListAnimatable};
-
-        #[derive(PartialEq, Clone, Debug)]
-        #[cfg_attr(feature = "servo", derive(HeapSizeOf))]
-        pub struct ExplicitSize {
-            pub width: LengthOrPercentageOrAuto,
-            pub height: LengthOrPercentageOrAuto,
-        }
-
-        #[derive(PartialEq, Clone, Debug)]
-        #[cfg_attr(feature = "servo", derive(HeapSizeOf))]
-        pub enum T {
-            Explicit(ExplicitSize),
-            Cover,
-            Contain,
-        }
-
-        impl RepeatableListAnimatable for T {}
-
-        impl Animatable for T {
-            fn add_weighted(&self, other: &Self, self_portion: f64, other_portion: f64)
-                -> Result<Self, ()> {
-                use properties::longhands::background_size::single_value::computed_value::ExplicitSize;
-                match (self, other) {
-                    (&T::Explicit(ref me), &T::Explicit(ref other)) => {
-                        Ok(T::Explicit(ExplicitSize {
-                            width: try!(me.width.add_weighted(&other.width,
-                                                              self_portion, other_portion)),
-                            height: try!(me.height.add_weighted(&other.height,
-                                                                self_portion, other_portion)),
-                        }))
-                    }
-                    _ => Err(()),
-                }
-            }
-
-            #[inline]
-            fn compute_distance(&self, other: &Self) -> Result<f64, ()> {
-                self.compute_squared_distance(other).map(|sd| sd.sqrt())
-            }
-
-            #[inline]
-            fn compute_squared_distance(&self, other: &Self) -> Result<f64, ()> {
-                match (self, other) {
-                    (&T::Explicit(ref me), &T::Explicit(ref other)) => {
-                        Ok(try!(me.width.compute_squared_distance(&other.width)) +
-                           try!(me.height.compute_squared_distance(&other.height)))
-                    },
-                    _ => Err(())
-                }
-            }
-        }
-    }
-
-    impl ToCss for computed_value::T {
-        fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
-            match *self {
-                computed_value::T::Explicit(ref size) => size.to_css(dest),
-                computed_value::T::Cover => dest.write_str("cover"),
-                computed_value::T::Contain => dest.write_str("contain"),
-            }
-        }
-    }
-
-    #[derive(Clone, Debug, HasViewportPercentage, PartialEq)]
-    #[cfg_attr(feature = "servo", derive(HeapSizeOf))]
-    #[allow(missing_docs)]
-    pub struct ExplicitSize {
-        pub width: specified::LengthOrPercentageOrAuto,
-        pub height: specified::LengthOrPercentageOrAuto,
-    }
-
-    impl ToCss for ExplicitSize {
-        fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
-            try!(self.width.to_css(dest));
-            try!(dest.write_str(" "));
-            self.height.to_css(dest)
-        }
-    }
-
-    impl ToCss for computed_value::ExplicitSize {
-        fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
-            try!(self.width.to_css(dest));
-            try!(dest.write_str(" "));
-            self.height.to_css(dest)
-        }
-    }
-
-    #[derive(Clone, Debug, HasViewportPercentage, PartialEq)]
-    #[cfg_attr(feature = "servo", derive(HeapSizeOf))]
-    pub enum SpecifiedValue {
-        Explicit(ExplicitSize),
-        Cover,
-        Contain,
-    }
-
-    impl ToCss for SpecifiedValue {
-        fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
-            match *self {
-                SpecifiedValue::Explicit(ref size) => size.to_css(dest),
-                SpecifiedValue::Cover => dest.write_str("cover"),
-                SpecifiedValue::Contain => dest.write_str("contain"),
-            }
-        }
-    }
-
-    impl ToComputedValue for SpecifiedValue {
-        type ComputedValue = computed_value::T;
-
-        #[inline]
-        fn to_computed_value(&self, context: &Context) -> computed_value::T {
-            match *self {
-                SpecifiedValue::Explicit(ref size) => {
-                    computed_value::T::Explicit(computed_value::ExplicitSize {
-                        width: size.width.to_computed_value(context),
-                        height: size.height.to_computed_value(context),
-                    })
-                }
-                SpecifiedValue::Cover => computed_value::T::Cover,
-                SpecifiedValue::Contain => computed_value::T::Contain,
-            }
-        }
-        #[inline]
-        fn from_computed_value(computed: &computed_value::T) -> Self {
-            match *computed {
-                computed_value::T::Explicit(ref size) => {
-                    SpecifiedValue::Explicit(ExplicitSize {
-                        width: ToComputedValue::from_computed_value(&size.width),
-                        height: ToComputedValue::from_computed_value(&size.height),
-                    })
-                }
-                computed_value::T::Cover => SpecifiedValue::Cover,
-                computed_value::T::Contain => SpecifiedValue::Contain,
-            }
-        }
-    }
-
-    #[inline]
-    pub fn get_initial_value() -> computed_value::T {
-        computed_value::T::Explicit(computed_value::ExplicitSize {
-            width: computed::LengthOrPercentageOrAuto::Auto,
-            height: computed::LengthOrPercentageOrAuto::Auto,
-        })
-    }
-    #[inline]
-    pub fn get_initial_specified_value() -> SpecifiedValue {
-        SpecifiedValue::Explicit(ExplicitSize {
-            width: specified::LengthOrPercentageOrAuto::Auto,
-            height: specified::LengthOrPercentageOrAuto::Auto,
-        })
-    }
-
-    pub fn parse(context: &ParserContext, input: &mut Parser) -> Result<SpecifiedValue,()> {
-        if input.try(|input| input.expect_ident_matching("cover")).is_ok() {
-            return Ok(SpecifiedValue::Cover);
-        }
-
-        if input.try(|input| input.expect_ident_matching("contain")).is_ok() {
-            return Ok(SpecifiedValue::Contain);
-        }
-
-        let width =
-            try!(specified::LengthOrPercentageOrAuto::parse_non_negative(context, input));
-
-        let height = input.try(|input| {
-            specified::LengthOrPercentageOrAuto::parse_non_negative(context, input)
-        }).unwrap_or(specified::LengthOrPercentageOrAuto::Auto);
-
-        Ok(SpecifiedValue::Explicit(ExplicitSize {
-            width: width,
-            height: height,
-        }))
-    }
-</%helpers:vector_longhand>
 
 // https://drafts.fxtf.org/compositing/#background-blend-mode
 ${helpers.single_keyword("background-blend-mode",

components/style/values/computed/background.rs

@@ -0,0 +1,52 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+//! Computed types for CSS values related to backgrounds.
+
+use properties::animated_properties::{Animatable, RepeatableListAnimatable};
+use values::computed::length::LengthOrPercentageOrAuto;
+use values::generics::background::BackgroundSize as GenericBackgroundSize;
+
+/// A computed value for the `background-size` property.
+pub type BackgroundSize = GenericBackgroundSize<LengthOrPercentageOrAuto>;
+
+impl RepeatableListAnimatable for BackgroundSize {}
+
+impl Animatable for BackgroundSize {
+    fn add_weighted(&self, other: &Self, self_portion: f64, other_portion: f64) -> Result<Self, ()> {
+        match (self, other) {
+            (
+                &GenericBackgroundSize::Explicit { width: self_width, height: self_height },
+                &GenericBackgroundSize::Explicit { width: other_width, height: other_height },
+            ) => {
+                Ok(GenericBackgroundSize::Explicit {
+                    width: self_width.add_weighted(&other_width, self_portion, other_portion)?,
+                    height: self_height.add_weighted(&other_height, self_portion, other_portion)?,
+                })
+            }
+            _ => Err(()),
+        }
+    }
+
+    #[inline]
+    fn compute_distance(&self, other: &Self) -> Result<f64, ()> {
+        self.compute_squared_distance(other).map(|sd| sd.sqrt())
+    }
+
+    #[inline]
+    fn compute_squared_distance(&self, other: &Self) -> Result<f64, ()> {
+        match (self, other) {
+            (
+                &GenericBackgroundSize::Explicit { width: self_width, height: self_height },
+                &GenericBackgroundSize::Explicit { width: other_width, height: other_height },
+            ) => {
+                Ok(
+                    self_width.compute_squared_distance(&other_width)? +
+                    self_height.compute_squared_distance(&other_height)?
+                )
+            }
+            _ => Err(()),
+        }
+    }
+}

components/style/values/computed/mod.rs

@@ -24,6 +24,7 @@ use super::specified;
 
 pub use app_units::Au;
 pub use cssparser::Color as CSSColor;
+pub use self::background::BackgroundSize;
 pub use self::border::{BorderImageSlice, BorderImageWidth, BorderImageWidthSide};
 pub use self::image::{Gradient, GradientItem, ImageLayer, LineDirection, Image, ImageRect};
 pub use self::rect::LengthOrNumberRect;
@@ -38,6 +39,7 @@ pub use self::length::{LengthOrPercentageOrAutoOrContent, LengthOrPercentageOrNo
 pub use self::length::{MaxLength, MozLength};
 pub use self::position::Position;
 
+pub mod background;
 pub mod basic_shape;
 pub mod border;
 pub mod image;

components/style/values/generics/background.rs

@@ -0,0 +1,52 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+//! Generic types for CSS values related to backgrounds.
+
+use std::fmt;
+use style_traits::ToCss;
+
+/// A generic value for the `background-size` property.
+#[derive(Clone, Copy, Debug, HasViewportPercentage, PartialEq, ToComputedValue)]
+#[cfg_attr(feature = "servo", derive(HeapSizeOf))]
+pub enum BackgroundSize<LengthOrPercentageOrAuto> {
+    /// `<width> <height>`
+    Explicit {
+        /// Explicit width.
+        width: LengthOrPercentageOrAuto,
+        /// Explicit height.
+        height: LengthOrPercentageOrAuto
+    },
+    /// `cover`
+    Cover,
+    /// `contain`
+    Contain,
+}
+
+impl<L> From<L> for BackgroundSize<L>
+    where L: Clone,
+{
+    #[inline]
+    fn from(value: L) -> Self {
+        BackgroundSize::Explicit { width: value.clone(), height: value }
+    }
+}
+
+impl<L> ToCss for BackgroundSize<L>
+    where L: ToCss
+{
+    fn to_css<W>(&self, dest: &mut W) -> fmt::Result
+        where W: fmt::Write
+    {
+        match *self {
+            BackgroundSize::Explicit { ref width, ref height } => {
+                width.to_css(dest)?;
+                dest.write_str(" ")?;
+                height.to_css(dest)
+            },
+            BackgroundSize::Cover => dest.write_str("cover"),
+            BackgroundSize::Contain => dest.write_str("contain"),
+        }
+    }
+}

components/style/values/generics/mod.rs

@@ -15,6 +15,7 @@ use super::CustomIdent;
 
 pub use self::basic_shape::serialize_radius_values;
 
+pub mod background;
 pub mod basic_shape;
 pub mod border;
 pub mod grid;

components/style/values/specified/background.rs

@@ -0,0 +1,29 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+//! Specified types for CSS values related to backgrounds.
+
+use cssparser::Parser;
+use parser::{Parse, ParserContext};
+use values::generics::background::BackgroundSize as GenericBackgroundSize;
+use values::specified::length::LengthOrPercentageOrAuto;
+
+/// A specified value for the `background-size` property.
+pub type BackgroundSize = GenericBackgroundSize<LengthOrPercentageOrAuto>;
+
+impl Parse for BackgroundSize {
+    fn parse(context: &ParserContext, input: &mut Parser) -> Result<Self, ()> {
+        if let Ok(width) = input.try(|i| LengthOrPercentageOrAuto::parse_non_negative(context, i)) {
+            let height = input
+                .try(|i| LengthOrPercentageOrAuto::parse_non_negative(context, i))
+                .unwrap_or(LengthOrPercentageOrAuto::Auto);
+            return Ok(GenericBackgroundSize::Explicit { width: width, height: height });
+        }
+        match_ignore_ascii_case! { &input.expect_ident()?,
+            "cover" => Ok(GenericBackgroundSize::Cover),
+            "contain" => Ok(GenericBackgroundSize::Contain),
+            _ => Err(()),
+        }
+    }
+}

components/style/values/specified/mod.rs

@@ -30,9 +30,10 @@ use values::specified::calc::CalcNode;
 
 #[cfg(feature = "gecko")]
 pub use self::align::{AlignItems, AlignJustifyContent, AlignJustifySelf, JustifyItems};
-pub use self::rect::LengthOrNumberRect;
+pub use self::background::BackgroundSize;
 pub use self::border::{BorderImageSlice, BorderImageWidth, BorderImageWidthSide};
 pub use self::color::Color;
+pub use self::rect::LengthOrNumberRect;
 pub use super::generics::grid::GridLine;
 pub use self::image::{ColorStop, EndingShape as GradientEndingShape, Gradient};
 pub use self::image::{GradientItem, GradientKind, Image, ImageRect, ImageLayer};
@@ -45,6 +46,7 @@ pub use self::position::{Position, PositionComponent};
 
 #[cfg(feature = "gecko")]
 pub mod align;
+pub mod background;
 pub mod basic_shape;
 pub mod border;
 pub mod calc;

tests/unit/style/properties/serialization.rs

@@ -806,6 +806,7 @@ mod shorthand_serialization {
         use style::properties::longhands::mask_repeat as repeat;
         use style::properties::longhands::mask_size as size;
         use style::values::Either;
+        use style::values::generics::background::BackgroundSize;
         use style::values::generics::image::Image;
         use super::*;
 
@@ -852,13 +853,12 @@ mod shorthand_serialization {
                 )
             );
 
-            let size = single_vec_variant_value!(size,
+            let size = single_vec_variant_value!(
-                size::single_value::SpecifiedValue::Explicit(
+                size,
-                    size::single_value::ExplicitSize {
+                BackgroundSize::Explicit {
                     width: LengthOrPercentageOrAuto::Length(NoCalcLength::from_px(70f32)),
-                        height: LengthOrPercentageOrAuto::Length(NoCalcLength::from_px(50f32))
+                    height: LengthOrPercentageOrAuto::Length(NoCalcLength::from_px(50f32)),
                 }
-                )
             );
 
             let repeat = single_vec_keyword_value!(repeat, RepeatX);
@@ -903,13 +903,12 @@ mod shorthand_serialization {
                 PositionComponent::Length(LengthOrPercentage::Length(NoCalcLength::from_px(4f32)))
             );
 
-            let size = single_vec_variant_value!(size,
+            let size = single_vec_variant_value!(
-                size::single_value::SpecifiedValue::Explicit(
+                size,
-                    size::single_value::ExplicitSize {
+                BackgroundSize::Explicit {
                     width: LengthOrPercentageOrAuto::Length(NoCalcLength::from_px(70f32)),
-                        height: LengthOrPercentageOrAuto::Length(NoCalcLength::from_px(50f32))
+                    height: LengthOrPercentageOrAuto::Length(NoCalcLength::from_px(50f32)),
                 }
-                )
             );
 
             let repeat = single_vec_keyword_value!(repeat, RepeatX);