Merge pull request #100 from vvvv/revert-97-BoundsPerformance

Revert "Performance Improvement"

Source/Basic Shapes/SvgCircle.cs

@@ -78,10 +78,10 @@ namespace Svg
         /// <summary>
         /// Gets the bounds of the circle.
         /// </summary>
-        /// <returns>The rectangular bounds of the circle.</returns>
-        public override RectangleF CalculateBounds()
+        /// <value>The rectangular bounds of the circle.</value>
+        public override RectangleF Bounds
         {
-            return this.Path(null).GetBounds();
+            get { return this.Path(null).GetBounds(); }
         }
 
         /// <summary>

Source/Basic Shapes/SvgEllipse.cs

@@ -92,10 +92,10 @@ namespace Svg
         /// <summary>
         /// Gets the bounds of the element.
         /// </summary>
-        /// <returns>The bounds.</returns>
-        public override RectangleF CalculateBounds()
+        /// <value>The bounds.</value>
+        public override RectangleF Bounds
         {
-            return this.Path(null).GetBounds();
+            get { return this.Path(null).GetBounds(); }
         }
 
         /// <summary>

Source/Basic Shapes/SvgImage.cs

@@ -76,21 +76,21 @@ namespace Svg
 		{
 			get { return this.Attributes.GetAttribute<Uri>("href"); }
 			set { this.Attributes["href"] = value; }
-		}
-
-
-
-        /// <summary>
-        /// Gets the bounds of the element.
-        /// </summary>
-        /// <returns>The bounds.</returns>
-        public override RectangleF CalculateBounds()
-        {
-            return new RectangleF(this.Location.ToDeviceValue(null, this),
-                new SizeF(this.Width.ToDeviceValue(null, UnitRenderingType.Horizontal, this),
-                    this.Height.ToDeviceValue(null, UnitRenderingType.Vertical, this)));
-        }
-
+		}
+
+
+
+        /// <summary>
+        /// Gets the bounds of the element.
+        /// </summary>
+        /// <value>The bounds.</value>
+        public override RectangleF Bounds
+        {
+			get { return new RectangleF(this.Location.ToDeviceValue(null, this), 
+                                        new SizeF(this.Width.ToDeviceValue(null, UnitRenderingType.Horizontal, this), 
+                                                  this.Height.ToDeviceValue(null, UnitRenderingType.Vertical, this))); }
+        }
+
         /// <summary>
         /// Gets the <see cref="GraphicsPath"/> for this element.
         /// </summary>

Source/Basic Shapes/SvgLine.cs

@@ -171,9 +171,9 @@ namespace Svg
             return result;
         }
 
-        public override RectangleF CalculateBounds()
+        public override System.Drawing.RectangleF Bounds
         {
-            return this.Path(null).GetBounds();
+            get { return this.Path(null).GetBounds(); }
         }
 
 		public override SvgElement DeepCopy()

Source/Basic Shapes/SvgPolygon.cs

@@ -130,9 +130,9 @@ namespace Svg
             return result;
         }
 
-        public override RectangleF CalculateBounds()
+        public override RectangleF Bounds
         {
-            return this.Path(null).GetBounds();
+            get { return this.Path(null).GetBounds(); }
         }
 
 

Source/Basic Shapes/SvgRectangle.cs

@@ -165,10 +165,10 @@ namespace Svg
         /// <summary>
         /// Gets the bounds of the element.
         /// </summary>
-        /// <returns>The bounds.</returns>
-        public override RectangleF CalculateBounds()
+        /// <value>The bounds.</value>
+        public override RectangleF Bounds
         {
-            return Path(null).GetBounds();
+            get { return Path(null).GetBounds(); }
         }
 
         /// <summary>

Source/Basic Shapes/SvgVisualElement.cs

@@ -19,11 +19,27 @@ namespace Svg
         /// </summary>
         public abstract GraphicsPath Path(ISvgRenderer renderer);
 
+        PointF ISvgBoundable.Location
+        {
+            get
+            {
+                return Bounds.Location;
+            }
+        }
+
+        SizeF ISvgBoundable.Size
+        {
+            get
+            {
+                return Bounds.Size;
+            }
+        }
+
         /// <summary>
         /// Gets the bounds of the element.
         /// </summary>
-        /// <returns>The bounds.</returns>
-        public abstract RectangleF CalculateBounds();
+        /// <value>The bounds.</value>
+        public abstract RectangleF Bounds { get; }
 
         /// <summary>
         /// Gets the associated <see cref="SvgClipPath"/> if one has been specified.

Source/DataTypes/SvgUnit.cs

@@ -149,7 +149,7 @@ namespace Svg
                         break;
                     }
 
-                    System.Drawing.SizeF size = boundable.CalculateBounds().Size;
+                    System.Drawing.SizeF size = boundable.Bounds.Size;
 
                     switch (renderType)
                     {
@@ -157,13 +157,13 @@ namespace Svg
                             _deviceValue = (size.Width / 100) * value;
                             break;
                         case UnitRenderingType.HorizontalOffset:
-                            _deviceValue = (size.Width / 100) * value + boundable.CalculateBounds().Location.X;
+                            _deviceValue = (size.Width / 100) * value + boundable.Location.X;
                             break;
                         case UnitRenderingType.Vertical:
                             _deviceValue = (size.Height / 100) * value;
                             break;
                         case UnitRenderingType.VerticalOffset:
-                            _deviceValue = (size.Height / 100) * value + boundable.CalculateBounds().Location.Y;
+                            _deviceValue = (size.Height / 100) * value + boundable.Location.Y;
                             break;
                         default:
                             _deviceValue = (float)(Math.Sqrt(Math.Pow(size.Width, 2) + Math.Pow(size.Height, 2)) / Math.Sqrt(2) * value / 100.0);

Source/Document Structure/SvgFragment.cs

@@ -15,9 +15,28 @@ namespace Svg
         /// </summary>
         public static readonly Uri Namespace = new Uri("http://www.w3.org/2000/svg");
 
-        RectangleF ISvgBoundable.CalculateBounds()
+        PointF ISvgBoundable.Location
         {
-            return new RectangleF(PointF.Empty, GetDimensions());
+            get
+            {
+                return PointF.Empty;
+            }
+        }
+
+        SizeF ISvgBoundable.Size
+        {
+            get
+            {
+                return GetDimensions();
+            }
+        }
+
+        RectangleF ISvgBoundable.Bounds
+        {
+            get
+            {
+                return new RectangleF(((ISvgBoundable)this).Location, ((ISvgBoundable)this).Size);
+            }
         }
 
         private SvgUnit _x;
@@ -166,29 +185,32 @@ namespace Svg
                     break;
             }
         }
-
+        
         /// <summary>
         /// Gets the <see cref="GraphicsPath"/> for this element.
         /// </summary>
         /// <value></value>
-        public GraphicsPath CreatePath()
+        public GraphicsPath Path
         {
-            var path = new GraphicsPath();
-
-            AddPaths(this, path);
+            get 
+            { 
+                var path = new GraphicsPath();
 
-            return path;
+                AddPaths(this, path);
+  
+                return path;
+            }
         }
-
+        
         /// <summary>
         /// Gets the bounds of the svg element.
         /// </summary>
-        /// <returns>The bounds.</returns>
-        public RectangleF CalculateBounds()
-        {
-            using (var path = CreatePath())
+        /// <value>The bounds.</value>
+        public RectangleF Bounds 
+        { 
+            get
             {
-                return path.GetBounds();
+                return this.Path.GetBounds();
             }
         }
 
@@ -220,7 +242,7 @@ namespace Svg
                 }
                 else
                 {
-                    bounds = this.CalculateBounds(); //do just one call to the expensive bounds calculation method
+                    bounds = this.Bounds; //do just one call to the recursive bounds property
                 }
             }
 

Source/Document Structure/SvgGroup.cs

@@ -21,32 +21,35 @@ namespace Svg
         /// <summary>
         /// Gets the bounds of the element.
         /// </summary>
-        /// <returns>The bounds.</returns>
-        public override RectangleF CalculateBounds()
+        /// <value>The bounds.</value>
+        public override System.Drawing.RectangleF Bounds
         {
-            var r = new RectangleF();
-            foreach (var c in this.Children)
-            {
-                if (c is SvgVisualElement)
+            get 
+            { 
+                var r = new RectangleF();
+                foreach(var c in this.Children)
                 {
-                    // First it should check if rectangle is empty or it will return the wrong Bounds.
-                    // This is because when the Rectangle is Empty, the Union method adds as if the first values where X=0, Y=0
-                    if (r.IsEmpty)
+                    if (c is SvgVisualElement)
                     {
-                        r = ((SvgVisualElement) c).CalculateBounds();
-                    }
-                    else
-                    {
-                        var childBounds = ((SvgVisualElement) c).CalculateBounds();
-                        if (!childBounds.IsEmpty)
+                        // First it should check if rectangle is empty or it will return the wrong Bounds.
+                        // This is because when the Rectangle is Empty, the Union method adds as if the first values where X=0, Y=0
+                        if (r.IsEmpty)
+                        {
+                            r = ((SvgVisualElement)c).Bounds;
+                        }
+                        else
                         {
-                            r = RectangleF.Union(r, childBounds);
+                            var childBounds = ((SvgVisualElement)c).Bounds;
+                            if (!childBounds.IsEmpty)
+                            {
+                                r = RectangleF.Union(r, childBounds);
+                            }
                         }
                     }
                 }
+                
+                return r;
             }
-
-            return r;
         }
 
         protected override bool Renderable { get { return false; } }

Source/Document Structure/SvgSwitch.cs

@@ -25,32 +25,35 @@ namespace Svg
         /// <summary>
         /// Gets the bounds of the element.
         /// </summary>
-        /// <returns>The bounds.</returns>
-        public override RectangleF CalculateBounds()
+        /// <value>The bounds.</value>
+        public override System.Drawing.RectangleF Bounds
         {
-            var r = new RectangleF();
-            foreach (var c in this.Children)
+            get
             {
-                if (c is SvgVisualElement)
+                var r = new RectangleF();
+                foreach (var c in this.Children)
                 {
-                    // First it should check if rectangle is empty or it will return the wrong Bounds.
-                    // This is because when the Rectangle is Empty, the Union method adds as if the first values where X=0, Y=0
-                    if (r.IsEmpty)
+                    if (c is SvgVisualElement)
                     {
-                        r = ((SvgVisualElement) c).CalculateBounds();
-                    }
-                    else
-                    {
-                        var childBounds = ((SvgVisualElement) c).CalculateBounds();
-                        if (!childBounds.IsEmpty)
+                        // First it should check if rectangle is empty or it will return the wrong Bounds.
+                        // This is because when the Rectangle is Empty, the Union method adds as if the first values where X=0, Y=0
+                        if (r.IsEmpty)
+                        {
+                            r = ((SvgVisualElement)c).Bounds;
+                        }
+                        else
                         {
-                            r = RectangleF.Union(r, childBounds);
+                            var childBounds = ((SvgVisualElement)c).Bounds;
+                            if (!childBounds.IsEmpty)
+                            {
+                                r = RectangleF.Union(r, childBounds);
+                            }
                         }
                     }
                 }
-            }
 
-            return r;
+                return r;
+            }
         }
 
         /// <summary>

Source/Document Structure/SvgSymbol.cs

@@ -48,31 +48,34 @@ namespace Svg.Document_Structure
         /// Gets the bounds of the element.
         /// </summary>
         /// <value>The bounds.</value>
-        public override System.Drawing.RectangleF CalculateBounds()
+        public override System.Drawing.RectangleF Bounds
         {
-            var r = new RectangleF();
-            foreach (var c in this.Children)
+            get
             {
-                if (c is SvgVisualElement)
+                var r = new RectangleF();
+                foreach (var c in this.Children)
                 {
-                    // First it should check if rectangle is empty or it will return the wrong Bounds.
-                    // This is because when the Rectangle is Empty, the Union method adds as if the first values where X=0, Y=0
-                    if (r.IsEmpty)
+                    if (c is SvgVisualElement)
                     {
-                        r = ((SvgVisualElement)c).CalculateBounds();
-                    }
-                    else
-                    {
-                        var childBounds = ((SvgVisualElement)c).CalculateBounds();
-                        if (!childBounds.IsEmpty)
+                        // First it should check if rectangle is empty or it will return the wrong Bounds.
+                        // This is because when the Rectangle is Empty, the Union method adds as if the first values where X=0, Y=0
+                        if (r.IsEmpty)
+                        {
+                            r = ((SvgVisualElement)c).Bounds;
+                        }
+                        else
                         {
-                            r = RectangleF.Union(r, childBounds);
+                            var childBounds = ((SvgVisualElement)c).Bounds;
+                            if (!childBounds.IsEmpty)
+                            {
+                                r = RectangleF.Union(r, childBounds);
+                            }
                         }
                     }
                 }
-            }
 
-            return r;
+                return r;
+            }
         }
 
         protected override bool Renderable { get { return false; } }

Source/Document Structure/SvgUse.cs

 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.Text;
 using System.Web;
 using System.Xml;
@@ -62,9 +61,9 @@ namespace Svg
             return (element != null) ? element.Path(renderer) : null;
         }
 
-        public override RectangleF CalculateBounds()
+        public override System.Drawing.RectangleF Bounds
         {
-            return new System.Drawing.RectangleF();
+            get { return new System.Drawing.RectangleF(); }
         }
 
         protected override bool Renderable { get { return false; } }

Source/Extensibility/SvgForeignObject.cs

@@ -25,32 +25,35 @@ namespace Svg
         /// <summary>
         /// Gets the bounds of the element.
         /// </summary>
-        /// <returns>The bounds.</returns>
-        public override RectangleF CalculateBounds()
+        /// <value>The bounds.</value>
+        public override System.Drawing.RectangleF Bounds
         {
-            var r = new RectangleF();
-            foreach (var c in this.Children)
+            get
             {
-                if (c is SvgVisualElement)
+                var r = new RectangleF();
+                foreach (var c in this.Children)
                 {
-                    // First it should check if rectangle is empty or it will return the wrong Bounds.
-                    // This is because when the Rectangle is Empty, the Union method adds as if the first values where X=0, Y=0
-                    if (r.IsEmpty)
+                    if (c is SvgVisualElement)
                     {
-                        r = ((SvgVisualElement) c).CalculateBounds();
-                    }
-                    else
-                    {
-                        var childBounds = ((SvgVisualElement) c).CalculateBounds();
-                        if (!childBounds.IsEmpty)
+                        // First it should check if rectangle is empty or it will return the wrong Bounds.
+                        // This is because when the Rectangle is Empty, the Union method adds as if the first values where X=0, Y=0
+                        if (r.IsEmpty)
+                        {
+                            r = ((SvgVisualElement)c).Bounds;
+                        }
+                        else
                         {
-                            r = RectangleF.Union(r, childBounds);
+                            var childBounds = ((SvgVisualElement)c).Bounds;
+                            if (!childBounds.IsEmpty)
+                            {
+                                r = RectangleF.Union(r, childBounds);
+                            }
                         }
                     }
                 }
-            }
 
-            return r;
+                return r;
+            }
         }
 
         protected override bool Renderable { get { return false; } }

Source/Painting/GenericBoundable.cs

@@ -19,9 +19,19 @@ namespace Svg
             _rect = new RectangleF(x, y, width, height);
         }
 
-        public RectangleF CalculateBounds()
+        public System.Drawing.PointF Location
         {
-            return _rect;
+            get { return _rect.Location; }
+        }
+
+        public System.Drawing.SizeF Size
+        {
+            get { return _rect.Size; }
+        }
+
+        public System.Drawing.RectangleF Bounds
+        {
+            get { return _rect; }
         }
     }
 }

Source/Painting/ISvgBoundable.cs

@@ -4,6 +4,19 @@ namespace Svg
 {
     public interface ISvgBoundable
     {
-        RectangleF CalculateBounds();
+        PointF Location
+        {
+            get;
+        }
+
+        SizeF Size
+        {
+            get;
+        }
+
+        RectangleF Bounds
+        {
+            get;
+        } 
     }
 }
\ No newline at end of file

Source/Painting/ImmutableBoundable.cs

-using System.Drawing;
-
-namespace Svg
-{
-    internal sealed class ImmutableBoundable : ISvgBoundable
-    {
-        private readonly RectangleF bounds;
-
-        public ImmutableBoundable(ISvgBoundable boundable)
-        {
-            bounds = boundable.CalculateBounds();
-        }
-
-        public RectangleF CalculateBounds()
-        {
-            return bounds;
-        }
-    }
-}
\ No newline at end of file

Source/Painting/SvgGradientServer.cs

@@ -178,7 +178,7 @@ namespace Svg
             for (int i = 0; i < colourBlends; i++)
             {
                 var currentStop = this.Stops[radial ? this.Stops.Count - 1 - actualStops : actualStops];
-                var boundWidth = renderer.GetBoundable().CalculateBounds().Width;
+                var boundWidth = renderer.GetBoundable().Bounds.Width;
 
                 mergedOpacity = opacity * currentStop.GetOpacity();
                 position =

Source/Painting/SvgLinearGradientServer.cs

@@ -191,7 +191,7 @@ namespace Svg
 
         private LinePoints PointsToMove(ISvgBoundable boundable, PointF specifiedStart, PointF specifiedEnd)
         {
-            var bounds = boundable.CalculateBounds();
+            var bounds = boundable.Bounds;
             if (specifiedStart.X == specifiedEnd.X)
             {
                 return (bounds.Top < specifiedStart.Y && specifiedStart.Y < bounds.Bottom ? LinePoints.Start : LinePoints.None) |
@@ -227,7 +227,7 @@ namespace Svg
                 return new GradientPoints(specifiedStart, specifiedEnd);
             }
 
-            var bounds = boundable.CalculateBounds();
+            var bounds = boundable.Bounds;
             var effectiveStart = specifiedStart;
             var effectiveEnd = specifiedEnd;
             var intersectionPoints = CandidateIntersections(bounds, specifiedStart, specifiedEnd);

Source/Painting/SvgMarker.cs

@@ -95,12 +95,15 @@ namespace Svg
             return null;
         }
 
-        public override RectangleF CalculateBounds()
+        public override System.Drawing.RectangleF Bounds
         {
-            var path = this.Path(null);
-            if (path != null)
-                return path.GetBounds();
-            return new System.Drawing.RectangleF();
+            get
+            {
+                var path = this.Path(null);
+                if (path != null)
+                    return path.GetBounds();
+                return new System.Drawing.RectangleF();
+            }
         }
 
         public override SvgElement DeepCopy()