Handle border-image

Author: devongovett

src/lib.rs

@@ -119,7 +119,7 @@ mod tests {
       }
     "#, indoc! {r#"
       .foo {
-        border: 2.0px solid #f00;
+        border: 2px solid #f00;
       }"#
     });
 
@@ -296,4 +296,42 @@ mod tests {
       }"#
     });
   }
+
+  #[test]
+  pub fn test_border_image() {
+    test(r#"
+      .foo {
+        border-image: url(test.png) 60;
+      }
+    "#, indoc! {r#"
+      .foo {
+        border-image: url(test.png) 60;
+      }"#
+    });
+
+    test(r#"
+      .foo {
+        border-image: url(test.png) 60;
+        border-image-source: url(foo.png);
+      }
+    "#, indoc! {r#"
+      .foo {
+        border-image: url(foo.png) 60;
+      }"#
+    });
+
+    test(r#"
+      .foo {
+        border-image-source: url(foo.png);
+        border-image-slice: 10 40 10 40 fill;
+        border-image-width: 10px;
+        border-image-outset: 0;
+        border-image-repeat: round round;
+      }
+    "#, indoc! {r#"
+      .foo {
+        border-image: url(foo.png) 10 40 fill / 10px round;
+      }"#
+    });
+  }
 }

src/properties/mod.rs

@@ -2,7 +2,7 @@ mod custom;
 
 use cssparser::*;
 use custom::*;
-use crate::values::{image::*, length::*, border::*, rect::*, color::*};
+use crate::values::{image::*, length::*, border::*, border_image::*, rect::*, color::*};
 use super::values::traits::Parse;
 
 #[derive(Debug, Clone)]
@@ -85,12 +85,18 @@ pub enum Property {
   // BorderEndEndRadius
   // BorderRadius
 
-  // BorderImageSource
-  // BorderImageOutset
-  // BorderImageRepeat
-  // BorderImageWidth
-  // BorderImageSlice
-  // BorderImage
+  /// https://www.w3.org/TR/css-backgrounds-3/#border-image-source
+  BorderImageSource(Image),
+  /// https://www.w3.org/TR/css-backgrounds-3/#border-image-outset
+  BorderImageOutset(Rect<LengthOrNumber>),
+  /// https://www.w3.org/TR/css-backgrounds-3/#border-image-repeat
+  BorderImageRepeat(BorderImageRepeat),
+  /// https://www.w3.org/TR/css-backgrounds-3/#border-image-width
+  BorderImageWidth(Rect<BorderImageSideWidth>),
+  /// https://www.w3.org/TR/css-backgrounds-3/#border-image-slice
+  BorderImageSlice(BorderImageSlice),
+  /// https://www.w3.org/TR/css-backgrounds-3/#border-image
+  BorderImage(BorderImage),
 
   BorderColor(Rect<CssColor>),
   BorderStyle(Rect<BorderStyle>),
@@ -208,6 +214,12 @@ impl Property {
       "border-inline" => property!(BorderInline, Border),
       "border-inline-start" => property!(BorderInlineStart, Border),
       "border-inline-end" => property!(BorderInlineEnd, Border),
+      "border-image-source" => property!(BorderImageSource, Image),
+      "border-image-outset" => property!(BorderImageOutset, Rect),
+      "border-image-repeat" => property!(BorderImageRepeat, BorderImageRepeat),
+      "border-image-width" => property!(BorderImageWidth, Rect),
+      "border-image-slice" => property!(BorderImageSlice, BorderImageSlice),
+      "border-image" => property!(BorderImage, BorderImage),
       _ => {}
     }
 
@@ -308,6 +320,12 @@ impl Property {
       BorderInline(val) => property!("border-inline", val),
       BorderInlineStart(val) => property!("border-inline-start", val),
       BorderInlineEnd(val) => property!("border-inline-end", val),
+      BorderImageSource(val) => property!("border-image-source", val),
+      BorderImageOutset(val) => property!("border-image-outset", val),
+      BorderImageRepeat(val) => property!("border-image-repeat", val),
+      BorderImageWidth(val) => property!("border-image-width", val),
+      BorderImageSlice(val) => property!("border-image-slice", val),
+      BorderImage(val) => property!("border-image", val),
       Custom(custom) => {
         dest.write_str(custom.name.as_ref())?;
         dest.write_str(": ")?;

src/values/border.rs

@@ -4,6 +4,9 @@ use super::traits::Parse;
 use super::color::CssColor;
 use crate::properties::Property;
 use super::rect::Rect;
+#[macro_use]
+use super::macros::*;
+use super::border_image::*;
 
 #[derive(Debug, Clone, PartialEq)]
 pub enum BorderSideWidth {
@@ -44,40 +47,6 @@ impl ToCss for BorderSideWidth {
   }
 }
 
-macro_rules! enum_property {
-  ($name: ident, $( $x: ident ),+) => {
-    #[derive(Debug, Clone, PartialEq)]
-    pub enum $name {
-      $(
-        $x,
-      )+
-    }
-
-    impl Parse for $name {
-      fn parse<'i, 't>(input: &mut Parser<'i, 't>) -> Result<Self, ParseError<'i, ()>> {
-        let ident = input.expect_ident()?;
-        match &ident[..] {
-          $(
-            s if s.eq_ignore_ascii_case(stringify!($x)) => Ok($name::$x),
-          )+
-          _ => return Err(input.new_error(BasicParseErrorKind::QualifiedRuleInvalid))
-        }
-      }
-    }
-
-    impl ToCss for $name {
-      fn to_css<W>(&self, dest: &mut W) -> std::fmt::Result where W: std::fmt::Write {
-        use $name::*;
-        match self {
-          $(
-            $x => dest.write_str(&stringify!($x).to_lowercase()),
-          )+
-        }
-      }
-    }
-  };
-}
-
 enum_property!(BorderStyle,
   Hidden,
   None,
@@ -224,7 +193,8 @@ pub struct BorderHandler {
   border_inline_start: BorderShorthand,
   border_inline_end: BorderShorthand,
   category: BorderCategory,
-  decls: Vec<Property>
+  decls: Vec<Property>,
+  border_image_handler: BorderImageHandler
 }
 
 impl BorderHandler {
@@ -333,14 +303,15 @@ impl BorderHandler {
         self.border_block_end.reset();
         self.border_inline_start.reset();
         self.border_inline_end.reset();
+
+        // Setting the `border` property resets `border-image`.
+        self.border_image_handler.reset();
       }
       _ => {
-        return false
+        return self.border_image_handler.handle_property(property)
       }
     }
 
-    println!("{:?}", self);
-
     true
   }
 
@@ -549,6 +520,7 @@ impl BorderHandler {
 
   pub fn finalize(&mut self) -> Vec<Property> {
     self.flush();
+    self.decls.extend(self.border_image_handler.finalize());
     std::mem::take(&mut self.decls)
   }
 }