Optimized border parsing

Author: FlorianRappl

src/AngleSharp.Css.Tests/Declarations/CssBorderProperty.cs

@@ -249,7 +249,7 @@ public void CssBorderStyleWavyIllegal()
         {
             var snippet = "border-style: wavy";
             var property = ParseDeclaration(snippet);
-            Assert.IsNull(property);
+            Assert.IsFalse(property.HasValue);
         }
 
         [Test]
@@ -437,7 +437,7 @@ public void CssBorderWidthZerosIllegal()
         {
             var snippet = "border-width: 0 0 0 0 0";
             var property = ParseDeclaration(snippet);
-            Assert.IsNull(property);
+            Assert.IsFalse(property.HasValue);
         }
 
         [Test]

src/AngleSharp.Css.Tests/Styling/CssSheet.cs

@@ -573,7 +573,7 @@ public void CssFontWithSlashAndContent()
         public void CssBackgroundWebkitGradientIsInvalid()
         {
             var background = ParseDeclaration("background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #FFA84C), color-stop(100%, #FF7B0D))");
-            Assert.IsNull(background);
+            Assert.IsFalse(background.HasValue);
         }
 
         [Test]

src/AngleSharp.Css.Tests/Styling/HtmlCssIntegration.cs

@@ -431,7 +431,7 @@ public void RemovingPropertiesShouldNotYieldEmptyStyle_Issue14()
         [Test]
         public void RecombinationWorksWithBorder_Issue16()
         {
-            var expected = "<button style=\"pointer-events: auto; border-width: 1px; border-style: solid; border-color: rgba(0, 0, 0, 1)\"></button>";
+            var expected = "<button style=\"pointer-events: auto; border: 1px solid rgba(0, 0, 0, 1)\"></button>";
             var document = ParseDocument("");
             var element = document.CreateElement("button");
             element.GetStyle().SetPointerEvents("auto");

src/AngleSharp.Css/Declarations/BorderBottomColorDeclaration.cs

@@ -10,6 +10,7 @@ static class BorderBottomColorDeclaration
 
         public static String[] Shorthands = new[]
         {
+            PropertyNames.Border,
             PropertyNames.BorderColor,
             PropertyNames.BorderBottom,
         };

src/AngleSharp.Css/Declarations/BorderBottomStyleDeclaration.cs

@@ -10,6 +10,7 @@ static class BorderBottomStyleDeclaration
 
         public static String[] Shorthands = new[]
         {
+            PropertyNames.Border,
             PropertyNames.BorderStyle,
             PropertyNames.BorderBottom,
         };

src/AngleSharp.Css/Declarations/BorderBottomWidthDeclaration.cs

@@ -10,6 +10,7 @@ static class BorderBottomWidthDeclaration
 
         public static String[] Shorthands = new[]
         {
+            PropertyNames.Border,
             PropertyNames.BorderWidth,
             PropertyNames.BorderBottom,
         };

src/AngleSharp.Css/Declarations/BorderColorDeclaration.cs

@@ -1,11 +1,7 @@
 namespace AngleSharp.Css.Declarations
 {
-    using AngleSharp.Css.Converters;
     using AngleSharp.Css.Dom;
-    using AngleSharp.Css.Values;
-    using AngleSharp.Text;
     using System;
-    using System.Linq;
     using static ValueConverters;
 
     static class BorderColorDeclaration
@@ -17,7 +13,7 @@ static class BorderColorDeclaration
             PropertyNames.Border,
         };
 
-        public static IValueConverter Converter = new BorderColorAggregator();
+        public static IValueConverter Converter = AggregatePeriodic(CurrentColorConverter);
 
         public static ICssValue InitialValue = null;
 
@@ -30,32 +26,5 @@ static class BorderColorDeclaration
             PropertyNames.BorderBottomColor,
             PropertyNames.BorderLeftColor,
         };
-
-        sealed class BorderColorAggregator : IValueAggregator, IValueConverter
-        {
-            private static readonly IValueConverter converter = CurrentColorConverter.Periodic();
-
-            public ICssValue Convert(StringSource source) => converter.Convert(source);
-
-            public ICssValue Merge(ICssValue[] values)
-            {
-                if (values[0] != null)
-                {
-                    return new CssPeriodicValue(values);
-                }
-
-                return null;
-            }
-
-            public ICssValue[] Split(ICssValue value)
-            {
-                if (value is CssPeriodicValue periodic)
-                {
-                    return periodic.ToArray();
-                }
-
-                return null;
-            }
-        }
     }
 }

src/AngleSharp.Css/Declarations/BorderDeclaration.cs

@@ -41,15 +41,7 @@ sealed class BorderAggregator : IValueAggregator, IValueConverter
 
             public ICssValue Convert(StringSource source) => converter.Convert(source);
 
-            public ICssValue Merge(ICssValue[] values)
-            {
-                if (values.Length == 3)
-                {
-                    return new CssTupleValue(values);
-                }
-
-                return null;
-            }
+            public ICssValue Merge(ICssValue[] values) => new CssTupleValue(values);
 
             public ICssValue[] Split(ICssValue value)
             {

src/AngleSharp.Css/Declarations/BorderLeftColorDeclaration.cs

@@ -10,6 +10,7 @@ static class BorderLeftColorDeclaration
 
         public static String[] Shorthands = new[]
         {
+            PropertyNames.Border,
             PropertyNames.BorderColor,
             PropertyNames.BorderLeft,
         };

src/AngleSharp.Css/Declarations/BorderLeftStyleDeclaration.cs

@@ -10,6 +10,7 @@ static class BorderLeftStyleDeclaration
 
         public static String[] Shorthands = new[]
         {
+            PropertyNames.Border,
             PropertyNames.BorderStyle,
             PropertyNames.BorderLeft,
         };