Enable min-content, max-content, fit-content and stretch (#79)

For the sizing properties.

Signed-off-by: Oriol Brufau <[email protected]>
Co-authored-by: Martin Robinson <[email protected]>

Author: Loirooriol

style/values/computed/length.rs

@@ -181,8 +181,21 @@ impl MaxSize {
     #[inline]
     pub fn to_used_value(&self, percentage_basis: Au) -> Option<Au> {
         match *self {
-            GenericMaxSize::None => None,
-            GenericMaxSize::LengthPercentage(ref lp) => Some(lp.to_used_value(percentage_basis)),
+            Self::None | Self::MinContent | Self::MaxContent | Self::FitContent | Self::Stretch => {
+                None
+            },
+            Self::LengthPercentage(ref lp) => Some(lp.to_used_value(percentage_basis)),
+        }
+    }
+
+    /// Convert the computed value into used value if there is enough information.
+    #[inline]
+    pub fn maybe_to_used_value(&self, percentage_basis: Option<Au>) -> Option<Au> {
+        match *self {
+            Self::None | Self::MinContent | Self::MaxContent | Self::FitContent | Self::Stretch => {
+                None
+            },
+            Self::LengthPercentage(ref lp) => lp.maybe_to_used_value(percentage_basis),
         }
     }
 }
@@ -193,8 +206,22 @@ impl Size {
     #[cfg(feature = "servo")]
     pub fn to_used_value(&self, percentage_basis: Au) -> Option<Au> {
         match *self {
-            GenericSize::Auto => None,
-            GenericSize::LengthPercentage(ref lp) => Some(lp.to_used_value(percentage_basis)),
+            Self::Auto | Self::MinContent | Self::MaxContent | Self::FitContent | Self::Stretch => {
+                None
+            },
+            Self::LengthPercentage(ref lp) => Some(lp.to_used_value(percentage_basis)),
+        }
+    }
+
+    /// Convert the computed value into used value if there is enough information.
+    #[inline]
+    #[cfg(feature = "servo")]
+    pub fn maybe_to_used_value(&self, percentage_basis: Option<Au>) -> Option<Au> {
+        match *self {
+            Self::Auto | Self::MinContent | Self::MaxContent | Self::FitContent | Self::Stretch => {
+                None
+            },
+            Self::LengthPercentage(ref lp) => lp.maybe_to_used_value(percentage_basis),
         }
     }
 
@@ -204,14 +231,9 @@ impl Size {
         match *self {
             Self::Auto => false,
             Self::LengthPercentage(ref lp) => lp.is_definitely_zero(),
+            Self::MinContent | Self::MaxContent | Self::FitContent | Self::Stretch => false,
             #[cfg(feature = "gecko")]
-            Self::MinContent |
-            Self::MaxContent |
-            Self::FitContent |
-            Self::MozAvailable |
-            Self::WebkitFillAvailable |
-            Self::Stretch |
-            Self::FitContentFunction(_) => false,
+            Self::MozAvailable | Self::WebkitFillAvailable | Self::FitContentFunction(_) => false,
         }
     }
 }

style/values/generics/length.rs

@@ -150,13 +150,10 @@ impl<LengthPercentage: Parse> Parse for LengthPercentageOrAuto<LengthPercentage>
 pub enum GenericSize<LengthPercent> {
     LengthPercentage(LengthPercent),
     Auto,
-    #[cfg(feature = "gecko")]
     #[animation(error)]
     MaxContent,
-    #[cfg(feature = "gecko")]
     #[animation(error)]
     MinContent,
-    #[cfg(feature = "gecko")]
     #[animation(error)]
     FitContent,
     #[cfg(feature = "gecko")]
@@ -165,7 +162,6 @@ pub enum GenericSize<LengthPercent> {
     #[cfg(feature = "gecko")]
     #[animation(error)]
     WebkitFillAvailable,
-    #[cfg(feature = "gecko")]
     #[animation(error)]
     Stretch,
     #[cfg(feature = "gecko")]
@@ -212,13 +208,10 @@ impl<LengthPercentage> Size<LengthPercentage> {
 pub enum GenericMaxSize<LengthPercent> {
     LengthPercentage(LengthPercent),
     None,
-    #[cfg(feature = "gecko")]
     #[animation(error)]
     MaxContent,
-    #[cfg(feature = "gecko")]
     #[animation(error)]
     MinContent,
-    #[cfg(feature = "gecko")]
     #[animation(error)]
     FitContent,
     #[cfg(feature = "gecko")]
@@ -227,7 +220,6 @@ pub enum GenericMaxSize<LengthPercent> {
     #[cfg(feature = "gecko")]
     #[animation(error)]
     WebkitFillAvailable,
-    #[cfg(feature = "gecko")]
     #[animation(error)]
     Stretch,
     #[cfg(feature = "gecko")]

style/values/specified/length.rs

@@ -1950,17 +1950,13 @@ macro_rules! parse_size_non_length {
     ($size:ident, $input:expr, $auto_or_none:expr => $auto_or_none_ident:ident) => {{
         let size = $input.try_parse(|input| {
             Ok(try_match_ident_ignore_ascii_case! { input,
-                #[cfg(feature = "gecko")]
                 "min-content" | "-moz-min-content" => $size::MinContent,
-                #[cfg(feature = "gecko")]
                 "max-content" | "-moz-max-content" => $size::MaxContent,
-                #[cfg(feature = "gecko")]
                 "fit-content" | "-moz-fit-content" => $size::FitContent,
                 #[cfg(feature = "gecko")]
                 "-moz-available" => $size::MozAvailable,
                 #[cfg(feature = "gecko")]
                 "-webkit-fill-available" if is_webkit_fill_available_keyword_enabled() => $size::WebkitFillAvailable,
-                #[cfg(feature = "gecko")]
                 "stretch" if is_stretch_enabled() => $size::Stretch,
                 $auto_or_none => $size::$auto_or_none_ident,
             })
@@ -1975,7 +1971,6 @@ macro_rules! parse_size_non_length {
 fn is_webkit_fill_available_keyword_enabled() -> bool {
     static_prefs::pref!("layout.css.webkit-fill-available.enabled")
 }
-#[cfg(feature = "gecko")]
 fn is_stretch_enabled() -> bool {
     static_prefs::pref!("layout.css.stretch-size-keyword.enabled")
 }