Initial Interfaces added

The-Nutty · The-Nutty · commit b56645cf2151 · 2020-04-02T14:16:53.000+01:00
diff --git a/src/AngleSharp.Css/DefaultRenderDevice.cs b/src/AngleSharp.Css/DefaultRenderDevice.cs
@@ -90,5 +90,10 @@ public Int32 ViewPortWidth
             get;
             set;
         } = 0;
+
+        //todo
+        public int RenderWidth { get; set; }
+        public int RenderHeight { get; set; }
+        public double FontSize { get; set; }
     }
 }
diff --git a/src/AngleSharp.Css/Extensions/CssValueExtensions.cs b/src/AngleSharp.Css/Extensions/CssValueExtensions.cs
@@ -41,19 +41,19 @@ public static Double AsDouble(this ICssValue value)
         /// </summary>
         /// <param name="value">The value to convert.</param>
         /// <returns>The resulting number.</returns>
-        public static Double AsPx(this ICssValue value)
+        public static Double AsPx(this ICssValue value, IRenderDimensions renderDimensions)
         {
             if (value is Length length && length.Type != Length.Unit.None)
             {
-                return length.ToPixel();
+                return length.ToPixel(renderDimensions);
             }
             else if (value is ICssMultipleValue multiple && multiple.Count == 1)
             {
-                return multiple[0].AsPx();
+                return multiple[0].AsPx(renderDimensions);
             }
             else if (value is ICssSpecialValue special && special.Value != null)
             {
-                return special.Value.AsPx();
+                return special.Value.AsPx(renderDimensions);
             }
 
             return 0.0;
@@ -202,19 +202,19 @@ public static String AsUrl(this ICssValue value)
         /// </summary>
         /// <param name="value">The value to convert.</param>
         /// <returns>The resulting matrix.</returns>
-        public static TransformMatrix AsMatrix(this ICssValue value)
+        public static TransformMatrix AsMatrix(this ICssValue value, IRenderDimensions dimensions)
         {
             if (value is ICssTransformFunctionValue res)
             {
-                return res.ComputeMatrix();
+                return res.ComputeMatrix(dimensions);
             }
             else if (value is ICssMultipleValue multiple && multiple.Count == 1)
             {
-                return multiple[0].AsMatrix();
+                return multiple[0].AsMatrix(dimensions);
             }
             else if (value is ICssSpecialValue special && special.Value != null)
             {
-                return special.Value.AsMatrix();
+                return special.Value.AsMatrix(dimensions);
             }
 
             return null;
diff --git a/src/AngleSharp.Css/FeatureValidators/DeviceHeightFeatureValidator.cs b/src/AngleSharp.Css/FeatureValidators/DeviceHeightFeatureValidator.cs
@@ -13,7 +13,7 @@ public Boolean Validate(IMediaFeature feature, IRenderDevice device)
 
             if (length != null)
             {
-                var desired = length.AsPx();
+                var desired = length.AsPx(device);
                 var available = (Double)device.DeviceHeight;
 
                 if (feature.IsMaximum)
diff --git a/src/AngleSharp.Css/FeatureValidators/DeviceWidthFeatureValidator.cs b/src/AngleSharp.Css/FeatureValidators/DeviceWidthFeatureValidator.cs
@@ -13,7 +13,7 @@ public Boolean Validate(IMediaFeature feature, IRenderDevice device)
 
             if (length != null)
             {
-                var desired = length.AsPx();
+                var desired = length.AsPx(device);
                 var available = (Double)device.DeviceWidth;
 
                 if (feature.IsMaximum)
diff --git a/src/AngleSharp.Css/FeatureValidators/HeightFeatureValidator.cs b/src/AngleSharp.Css/FeatureValidators/HeightFeatureValidator.cs
@@ -13,7 +13,7 @@ public Boolean Validate(IMediaFeature feature, IRenderDevice device)
 
             if (length != null)
             {
-                var desired = length.AsPx();
+                var desired = length.AsPx(device);
                 var available = (Double)device.ViewPortHeight;
 
                 if (feature.IsMaximum)
diff --git a/src/AngleSharp.Css/FeatureValidators/WidthFeatureValidator.cs b/src/AngleSharp.Css/FeatureValidators/WidthFeatureValidator.cs
@@ -13,7 +13,7 @@ public Boolean Validate(IMediaFeature feature, IRenderDevice device)
 
             if (length != null)
             {
-                var desired = length.AsPx();
+                var desired = length.AsPx(device);
                 var available = (Double)device.ViewPortWidth;
 
                 if (feature.IsMaximum)
diff --git a/src/AngleSharp.Css/IRenderDevice.cs b/src/AngleSharp.Css/IRenderDevice.cs
@@ -5,7 +5,7 @@ namespace AngleSharp.Css
     /// <summary>
     /// Represents the renderers setting.
     /// </summary>
-    public interface IRenderDevice
+    public interface IRenderDevice : IRenderDimensions
     {
         /// <summary>
         /// Gets the width of the viewport in pixels.
diff --git a/src/AngleSharp.Css/IRenderDimensions.cs b/src/AngleSharp.Css/IRenderDimensions.cs
@@ -0,0 +1,11 @@
+using System;
+
+namespace AngleSharp.Css
+{
+    public interface IRenderDimensions
+    {
+        Int32 RenderWidth { get; set; }
+        Int32 RenderHeight { get; set; }
+        double FontSize { get; set; }
+    }
+}
diff --git a/src/AngleSharp.Css/Values/Functions/CssMatrixValue.cs b/src/AngleSharp.Css/Values/Functions/CssMatrixValue.cs
@@ -70,7 +70,7 @@ public ICssValue[] Arguments
         /// Returns the stored matrix.
         /// </summary>
         /// <returns>The current transformation.</returns>
-        public TransformMatrix ComputeMatrix()
+        public TransformMatrix ComputeMatrix(IRenderDimensions dimensions)
         {
             var values = _values;
 
diff --git a/src/AngleSharp.Css/Values/Functions/CssPerspectiveValue.cs b/src/AngleSharp.Css/Values/Functions/CssPerspectiveValue.cs
@@ -54,10 +54,10 @@ internal CssPerspectiveValue(ICssValue distance)
         /// Computes the matrix for the given transformation.
         /// </summary>
         /// <returns>The transformation matrix representation.</returns>
-        public TransformMatrix ComputeMatrix()
+        public TransformMatrix ComputeMatrix(IRenderDimensions renderDimensions)
         {
             var distance = _distance as Length? ?? Length.Zero;
-            return new TransformMatrix(1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 0.0, -1.0 / distance.ToPixel());
+            return new TransformMatrix(1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 0.0, -1.0 / distance.ToPixel(renderDimensions));
         }
 
         #endregion
diff --git a/src/AngleSharp.Css/Values/Functions/CssRotateValue.cs b/src/AngleSharp.Css/Values/Functions/CssRotateValue.cs
@@ -126,7 +126,7 @@ public String CssText
         /// Computes the matrix for the given transformation.
         /// </summary>
         /// <returns>The transformation matrix representation.</returns>
-        public TransformMatrix ComputeMatrix()
+        public TransformMatrix ComputeMatrix(IRenderDimensions renderDimensions)
         {
             var norm = 1.0 / Math.Sqrt(_x * _x + _y * _y + _z * _z);
             var alpha = _angle as Angle ? ?? Values.Angle.Zero;
diff --git a/src/AngleSharp.Css/Values/Functions/CssScaleValue.cs b/src/AngleSharp.Css/Values/Functions/CssScaleValue.cs
@@ -136,7 +136,7 @@ public String CssText
         /// Computes the matrix for the given transformation.
         /// </summary>
         /// <returns>The transformation matrix representation.</returns>
-        public TransformMatrix ComputeMatrix() =>
+        public TransformMatrix ComputeMatrix(IRenderDimensions renderDimensions) =>
             new TransformMatrix(_sx, 0f, 0f, 0f, _sy, 0f, 0f, 0f, _sz, 0f, 0f, 0f, 0f, 0f, 0f);
 
         #endregion
diff --git a/src/AngleSharp.Css/Values/Functions/CssSkewValue.cs b/src/AngleSharp.Css/Values/Functions/CssSkewValue.cs
@@ -104,7 +104,7 @@ public String CssText
         /// Computes the matrix for the given transformation.
         /// </summary>
         /// <returns>The transformation matrix representation.</returns>
-        public TransformMatrix ComputeMatrix()
+        public TransformMatrix ComputeMatrix(IRenderDimensions renderDimensions)
         {
             var a = Math.Tan((_alpha as Angle ? ?? Angle.Zero).ToRadian());
             var b = Math.Tan((_beta as Angle? ?? Angle.Zero).ToRadian());
diff --git a/src/AngleSharp.Css/Values/Functions/CssTranslateValue.cs b/src/AngleSharp.Css/Values/Functions/CssTranslateValue.cs
@@ -103,14 +103,14 @@ public String Name
         /// Computes the matrix for the given transformation.
         /// </summary>
         /// <returns>The transformation matrix representation.</returns>
-        public TransformMatrix ComputeMatrix()
+        public TransformMatrix ComputeMatrix(IRenderDimensions renderDimensions)
         {
             var x = _x as Length? ?? Length.Zero;
             var y = _y as Length? ?? Length.Zero;
             var z = _z as Length? ?? Length.Zero;
-            var dx = x.ToPixel();
-            var dy = y.ToPixel();
-            var dz = z.ToPixel();
+            var dx = x.ToPixel(renderDimensions);
+            var dy = y.ToPixel(renderDimensions);
+            var dz = z.ToPixel(renderDimensions);
             return new TransformMatrix(1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0, dx, dy, dz, 0.0, 0.0, 0.0);
         }
 
diff --git a/src/AngleSharp.Css/Values/ICssTransformFunctionValue.cs b/src/AngleSharp.Css/Values/ICssTransformFunctionValue.cs
@@ -9,6 +9,6 @@ public interface ICssTransformFunctionValue : ICssFunctionValue
         /// Computes the matrix for the given transformation.
         /// </summary>
         /// <returns>The transformation matrix representation.</returns>
-        TransformMatrix ComputeMatrix();
+        TransformMatrix ComputeMatrix(IRenderDimensions renderDimensions);
     }
 }
diff --git a/src/AngleSharp.Css/Values/Primitives/Length.cs b/src/AngleSharp.Css/Values/Primitives/Length.cs
@@ -203,7 +203,7 @@ public Int32 CompareTo(Length other)
                 }
                 else if (IsAbsolute && other.IsAbsolute)
                 {
-                    return ToPixel().CompareTo(other.ToPixel());
+                    return ToPixel(null).CompareTo(other.ToPixel(null));
                 }
             }
 
@@ -273,7 +273,7 @@ public static Unit GetUnit(String s)
         /// current unit is relative, then an exception will be thrown.
         /// </summary>
         /// <returns>The number of pixels represented by the current length.</returns>
-        public Double ToPixel()
+        public Double ToPixel(IRenderDimensions dimensions)
         {
             switch (_unit)
             {
@@ -289,6 +289,7 @@ public Double ToPixel()
                     return _value * 50.0 * 96.0 / 127.0;
                 case Unit.Px: // 1 px = 1/96 in
                     return _value;
+                //todo implement other units and handle if dimensions is null
                 default:
                     throw new InvalidOperationException("A relative unit cannot be converted.");
             }
@@ -300,9 +301,9 @@ public Double ToPixel()
         /// </summary>
         /// <param name="unit">The unit to convert to.</param>
         /// <returns>The value in the given unit of the current length.</returns>
-        public Double To(Unit unit)
+        public Double To(Unit unit, IRenderDimensions dimensions)
         {
-            var value = ToPixel();
+            var value = ToPixel(dimensions);
 
             switch (unit)
             {
@@ -318,6 +319,7 @@ public Double To(Unit unit)
                     return value * 127.0 / (50.0 * 96.0);
                 case Unit.Px: // 1 px = 1/96 in
                     return value;
+                //todo implement other units and handle if dimensions is null
                 default:
                     throw new InvalidOperationException("An absolute unit cannot be converted to a relative one.");
             }

Original file line number	Diff line number	Diff line change
`@@ -90,5 +90,10 @@ public Int32 ViewPortWidth`
`90`	`90`	`get;`
`91`	`91`	`set;`
`92`	`92`	`} = 0;`
	`93`	`+`
	`94`	`+ //todo`
	`95`	`+ public int RenderWidth { get; set; }`
	`96`	`+ public int RenderHeight { get; set; }`
	`97`	`+ public double FontSize { get; set; }`
`93`	`98`	`}`
`94`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,19 +41,19 @@ public static Double AsDouble(this ICssValue value)`
`41`	`41`	`/// </summary>`
`42`	`42`	`/// <param name="value">The value to convert.</param>`
`43`	`43`	`/// <returns>The resulting number.</returns>`
`44`		`- public static Double AsPx(this ICssValue value)`
	`44`	`+ public static Double AsPx(this ICssValue value, IRenderDimensions renderDimensions)`
`45`	`45`	`{`
`46`	`46`	`if (value is Length length && length.Type != Length.Unit.None)`
`47`	`47`	`{`
`48`		`- return length.ToPixel();`
	`48`	`+ return length.ToPixel(renderDimensions);`
`49`	`49`	`}`
`50`	`50`	`else if (value is ICssMultipleValue multiple && multiple.Count == 1)`
`51`	`51`	`{`
`52`		`- return multiple[0].AsPx();`
	`52`	`+ return multiple[0].AsPx(renderDimensions);`
`53`	`53`	`}`
`54`	`54`	`else if (value is ICssSpecialValue special && special.Value != null)`
`55`	`55`	`{`
`56`		`- return special.Value.AsPx();`
	`56`	`+ return special.Value.AsPx(renderDimensions);`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`return 0.0;`
`@@ -202,19 +202,19 @@ public static String AsUrl(this ICssValue value)`
`202`	`202`	`/// </summary>`
`203`	`203`	`/// <param name="value">The value to convert.</param>`
`204`	`204`	`/// <returns>The resulting matrix.</returns>`
`205`		`- public static TransformMatrix AsMatrix(this ICssValue value)`
	`205`	`+ public static TransformMatrix AsMatrix(this ICssValue value, IRenderDimensions dimensions)`
`206`	`206`	`{`
`207`	`207`	`if (value is ICssTransformFunctionValue res)`
`208`	`208`	`{`
`209`		`- return res.ComputeMatrix();`
	`209`	`+ return res.ComputeMatrix(dimensions);`
`210`	`210`	`}`
`211`	`211`	`else if (value is ICssMultipleValue multiple && multiple.Count == 1)`
`212`	`212`	`{`
`213`		`- return multiple[0].AsMatrix();`
	`213`	`+ return multiple[0].AsMatrix(dimensions);`
`214`	`214`	`}`
`215`	`215`	`else if (value is ICssSpecialValue special && special.Value != null)`
`216`	`216`	`{`
`217`		`- return special.Value.AsMatrix();`
	`217`	`+ return special.Value.AsMatrix(dimensions);`
`218`	`218`	`}`
`219`	`219`
`220`	`220`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public Boolean Validate(IMediaFeature feature, IRenderDevice device)`
`13`	`13`
`14`	`14`	`if (length != null)`
`15`	`15`	`{`
`16`		`- var desired = length.AsPx();`
	`16`	`+ var desired = length.AsPx(device);`
`17`	`17`	`var available = (Double)device.DeviceHeight;`
`18`	`18`
`19`	`19`	`if (feature.IsMaximum)`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ namespace AngleSharp.Css`
`5`	`5`	`/// <summary>`
`6`	`6`	`/// Represents the renderers setting.`
`7`	`7`	`/// </summary>`
`8`		`- public interface IRenderDevice`
	`8`	`+ public interface IRenderDevice : IRenderDimensions`
`9`	`9`	`{`
`10`	`10`	`/// <summary>`
`11`	`11`	`/// Gets the width of the viewport in pixels.`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public ICssValue[] Arguments`
`70`	`70`	`/// Returns the stored matrix.`
`71`	`71`	`/// </summary>`
`72`	`72`	`/// <returns>The current transformation.</returns>`
`73`		`- public TransformMatrix ComputeMatrix()`
	`73`	`+ public TransformMatrix ComputeMatrix(IRenderDimensions dimensions)`
`74`	`74`	`{`
`75`	`75`	`var values = _values;`
`76`	`76`
Original file line number	Diff line number	Diff line change
`@@ -54,10 +54,10 @@ internal CssPerspectiveValue(ICssValue distance)`
`54`	`54`	`/// Computes the matrix for the given transformation.`
`55`	`55`	`/// </summary>`
`56`	`56`	`/// <returns>The transformation matrix representation.</returns>`
`57`		`- public TransformMatrix ComputeMatrix()`
	`57`	`+ public TransformMatrix ComputeMatrix(IRenderDimensions renderDimensions)`
`58`	`58`	`{`
`59`	`59`	`var distance = _distance as Length? ?? Length.Zero;`
`60`		`- return new TransformMatrix(1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 0.0, -1.0 / distance.ToPixel());`
	`60`	`+ return new TransformMatrix(1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 0.0, -1.0 / distance.ToPixel(renderDimensions));`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`#endregion`