Derive HasViewportPercentage 🍷

Author: nox

Cargo.lock

@@ -58,6 +58,7 @@ serde_derive = {version = "0.9", optional = true}
 servo_atoms = {path = "../atoms", optional = true}
 servo_config = {path = "../config", optional = true}
 smallvec = "0.3.3"
+style_derive = {path = "../style_derive"}
 style_traits = {path = "../style_traits"}
 servo_url = {path = "../url", optional = true}
 time = "0.1"

components/style/Cargo.toml

@@ -78,6 +78,8 @@ extern crate selectors;
 #[cfg(feature = "servo")] extern crate servo_url;
 extern crate smallvec;
 #[macro_use]
+extern crate style_derive;
+#[macro_use]
 extern crate style_traits;
 extern crate time;
 #[allow(unused_extern_crates)]

components/style/lib.rs

@@ -38,19 +38,6 @@ macro_rules! define_numbered_css_keyword_enum {
     }
 }
 
-/// A macro used to implement HasViewportPercentage trait
-/// for a given type that may never contain viewport units.
-macro_rules! no_viewport_percentage {
-    ($name: ident) => {
-        impl $crate::values::HasViewportPercentage for $name {
-            #[inline]
-            fn has_viewport_percentage(&self) -> bool {
-                false
-            }
-        }
-    };
-}
-
 /// A macro for implementing `ComputedValueAsSpecified`, `Parse`
 /// and `HasViewportPercentage` traits for the enums defined
 /// using `define_css_keyword_enum` macro.

components/style/macros.rs

@@ -81,13 +81,6 @@
             use values::HasViewportPercentage;
             use style_traits::ToCss;
 
-            impl HasViewportPercentage for SpecifiedValue {
-                fn has_viewport_percentage(&self) -> bool {
-                    let &SpecifiedValue(ref vec) = self;
-                    vec.iter().any(|ref x| x.has_viewport_percentage())
-                }
-            }
-
             pub mod single_value {
                 use cssparser::Parser;
                 use parser::{Parse, ParserContext};
@@ -168,7 +161,7 @@
             }
 
             /// The specified value of ${name}.
-            #[derive(Debug, Clone, PartialEq)]
+            #[derive(Clone, Debug, HasViewportPercentage, PartialEq)]
             #[cfg_attr(feature = "servo", derive(HeapSizeOf))]
             pub struct SpecifiedValue(pub Vec<single_value::SpecifiedValue>);
 

components/style/properties/helpers.mako.rs

@@ -236,13 +236,7 @@ ${helpers.single_keyword("background-origin",
         }
     }
 
-    impl HasViewportPercentage for ExplicitSize {
-        fn has_viewport_percentage(&self) -> bool {
-            return self.width.has_viewport_percentage() || self.height.has_viewport_percentage();
-        }
-    }
-
-    #[derive(Clone, PartialEq, Debug)]
+    #[derive(Clone, Debug, HasViewportPercentage, PartialEq)]
     #[cfg_attr(feature = "servo", derive(HeapSizeOf))]
     #[allow(missing_docs)]
     pub struct ExplicitSize {
@@ -266,16 +260,7 @@ ${helpers.single_keyword("background-origin",
         }
     }
 
-    impl HasViewportPercentage for SpecifiedValue {
-        fn has_viewport_percentage(&self) -> bool {
-            match *self {
-                SpecifiedValue::Explicit(ref explicit_size) => explicit_size.has_viewport_percentage(),
-                _ => false
-            }
-        }
-    }
-
-    #[derive(Clone, PartialEq, Debug)]
+    #[derive(Clone, Debug, HasViewportPercentage, PartialEq)]
     #[cfg_attr(feature = "servo", derive(HeapSizeOf))]
     pub enum SpecifiedValue {
         Explicit(ExplicitSize),

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

@@ -208,17 +208,6 @@ ${helpers.predefined_type("border-image-source", "ImageLayer",
     use values::HasViewportPercentage;
     use values::specified::{LengthOrNumber, Number};
 
-    impl HasViewportPercentage for SpecifiedValue {
-        fn has_viewport_percentage(&self) -> bool {
-            let mut viewport_percentage = false;
-            for value in self.0.iter() {
-                let vp = value.has_viewport_percentage();
-                viewport_percentage = vp || viewport_percentage;
-            }
-            viewport_percentage
-        }
-    }
-
     pub mod computed_value {
         use values::computed::LengthOrNumber;
         #[derive(Debug, Clone, PartialEq)]
@@ -227,7 +216,7 @@ ${helpers.predefined_type("border-image-source", "ImageLayer",
                      pub LengthOrNumber, pub LengthOrNumber);
     }
 
-    #[derive(Debug, Clone, PartialEq)]
+    #[derive(Clone, Debug, HasViewportPercentage, PartialEq)]
     #[cfg_attr(feature = "servo", derive(HeapSizeOf))]
     pub struct SpecifiedValue(pub Vec<LengthOrNumber>);
 
@@ -402,20 +391,6 @@ ${helpers.predefined_type("border-image-source", "ImageLayer",
     use values::HasViewportPercentage;
     use values::specified::{LengthOrPercentage, Number};
 
-    impl HasViewportPercentage for SpecifiedValue {
-        fn has_viewport_percentage(&self) -> bool {
-            let mut viewport_percentage = false;
-            for value in self.0.clone() {
-                let vp = match value {
-                    SingleSpecifiedValue::LengthOrPercentage(len) => len.has_viewport_percentage(),
-                    _ => false,
-                };
-                viewport_percentage = vp || viewport_percentage;
-            }
-            viewport_percentage
-        }
-    }
-
     pub mod computed_value {
         use values::computed::{LengthOrPercentage, Number};
         #[derive(Debug, Clone, PartialEq)]
@@ -432,7 +407,7 @@ ${helpers.predefined_type("border-image-source", "ImageLayer",
         }
     }
 
-    #[derive(Debug, Clone, PartialEq)]
+    #[derive(Clone, Debug, HasViewportPercentage, PartialEq)]
     #[cfg_attr(feature = "servo", derive(HeapSizeOf))]
     pub struct SpecifiedValue(pub Vec<SingleSpecifiedValue>);
 
@@ -458,7 +433,7 @@ ${helpers.predefined_type("border-image-source", "ImageLayer",
         }
     }
 
-    #[derive(Debug, Clone, PartialEq)]
+    #[derive(Clone, Debug, HasViewportPercentage, PartialEq)]
     #[cfg_attr(feature = "servo", derive(HeapSizeOf))]
     pub enum SingleSpecifiedValue {
         LengthOrPercentage(LengthOrPercentage),

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

@@ -274,18 +274,9 @@ ${helpers.single_keyword("position", "static absolute relative fixed",
 
     ${helpers.gecko_keyword_conversion(vertical_align.keyword)}
 
-    impl HasViewportPercentage for SpecifiedValue {
-        fn has_viewport_percentage(&self) -> bool {
-            match *self {
-                SpecifiedValue::LengthOrPercentage(ref length) => length.has_viewport_percentage(),
-                _ => false
-            }
-        }
-    }
-
     /// The `vertical-align` value.
     #[allow(non_camel_case_types)]
-    #[derive(Debug, Clone, PartialEq)]
+    #[derive(Clone, Debug, HasViewportPercentage, PartialEq)]
     #[cfg_attr(feature = "servo", derive(HeapSizeOf))]
     pub enum SpecifiedValue {
         % for keyword in vertical_align_keywords:
@@ -1048,15 +1039,6 @@ ${helpers.single_keyword("animation-fill-mode",
     use values::HasViewportPercentage;
     use values::specified::LengthOrPercentage;
 
-    impl HasViewportPercentage for SpecifiedValue {
-        fn has_viewport_percentage(&self) -> bool {
-            match *self {
-                SpecifiedValue::Repeat(ref length) => length.has_viewport_percentage(),
-                _ => false
-            }
-        }
-    }
-
     pub mod computed_value {
         use values::computed::LengthOrPercentage;
 
@@ -1065,7 +1047,7 @@ ${helpers.single_keyword("animation-fill-mode",
         pub struct T(pub Option<LengthOrPercentage>);
     }
 
-    #[derive(Debug, Clone, PartialEq)]
+    #[derive(Clone, Debug, HasViewportPercentage, PartialEq)]
     #[cfg_attr(feature = "servo", derive(HeapSizeOf))]
     pub enum SpecifiedValue {
         None,
@@ -1253,7 +1235,7 @@ ${helpers.predefined_type("scroll-snap-coordinate",
     /// Multiple transform functions compose a transformation.
     ///
     /// Some transformations can be expressed by other more general functions.
-    #[derive(Clone, Debug, PartialEq)]
+    #[derive(Clone, Debug, HasViewportPercentage, PartialEq)]
     #[cfg_attr(feature = "servo", derive(HeapSizeOf))]
     pub enum SpecifiedOperation {
         /// Represents a 2D 2x3 matrix.
@@ -1328,41 +1310,6 @@ ${helpers.predefined_type("scroll-snap-coordinate",
         }
     }
 
-    impl HasViewportPercentage for SpecifiedOperation {
-        fn has_viewport_percentage(&self) -> bool {
-            match *self {
-                SpecifiedOperation::Translate(ref l1, None) |
-                SpecifiedOperation::TranslateX(ref l1) |
-                SpecifiedOperation::TranslateY(ref l1)  => {
-                    l1.has_viewport_percentage()
-                }
-                SpecifiedOperation::TranslateZ(ref l1) => {
-                    l1.has_viewport_percentage()
-                }
-                SpecifiedOperation::Translate(ref l1, Some(ref l2)) => {
-                    l1.has_viewport_percentage() ||
-                    l2.has_viewport_percentage()
-                }
-                SpecifiedOperation::Translate3D(ref l1, ref l2, ref l3) => {
-                    l1.has_viewport_percentage() ||
-                    l2.has_viewport_percentage() ||
-                    l3.has_viewport_percentage()
-                },
-                SpecifiedOperation::Perspective(ref length) => length.has_viewport_percentage(),
-                SpecifiedOperation::PrefixedMatrix{ ref e, ref f, .. } => {
-                    e.has_viewport_percentage() ||
-                    f.has_viewport_percentage()
-                },
-                SpecifiedOperation::PrefixedMatrix3D{ ref m41, ref m42, ref m43, .. } => {
-                    m41.has_viewport_percentage() ||
-                    m42.has_viewport_percentage() ||
-                    m43.has_viewport_percentage()
-                },
-                _ => false
-            }
-        }
-    }
-
     impl ToCss for SpecifiedOperation {
         fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
             use self::SpecifiedOperation::*;
@@ -1422,14 +1369,7 @@ ${helpers.predefined_type("scroll-snap-coordinate",
         }
     }
 
-    impl HasViewportPercentage for SpecifiedValue {
-        fn has_viewport_percentage(&self) -> bool {
-            let &SpecifiedValue(ref specified_ops) = self;
-            specified_ops.iter().any(|ref x| x.has_viewport_percentage())
-        }
-    }
-
-    #[derive(Clone, Debug, PartialEq)]
+    #[derive(Clone, Debug, HasViewportPercentage, PartialEq)]
     #[cfg_attr(feature = "servo", derive(HeapSizeOf))]
     pub struct SpecifiedValue(Vec<SpecifiedOperation>);
 
@@ -2223,15 +2163,7 @@ ${helpers.single_keyword("transform-style",
         }
     }
 
-    impl HasViewportPercentage for SpecifiedValue {
-        fn has_viewport_percentage(&self) -> bool {
-            self.horizontal.has_viewport_percentage() ||
-            self.vertical.has_viewport_percentage() ||
-            self.depth.has_viewport_percentage()
-        }
-    }
-
-    #[derive(Clone, Debug, PartialEq)]
+    #[derive(Clone, Debug, HasViewportPercentage, PartialEq)]
     #[cfg_attr(feature = "servo", derive(HeapSizeOf))]
     pub struct SpecifiedValue {
         horizontal: LengthOrPercentage,

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

@@ -98,13 +98,7 @@ ${helpers.predefined_type("clip",
     use values::specified::{Angle, CSSColor, Length, Shadow};
     use values::specified::url::SpecifiedUrl;
 
-    impl HasViewportPercentage for SpecifiedValue {
-        fn has_viewport_percentage(&self) -> bool {
-            self.0.iter().any(|ref x| x.has_viewport_percentage())
-        }
-    }
-
-    #[derive(Debug, Clone, PartialEq)]
+    #[derive(Clone, Debug, HasViewportPercentage, PartialEq)]
     #[cfg_attr(feature = "servo", derive(HeapSizeOf))]
     pub struct SpecifiedValue(pub Vec<SpecifiedFilter>);