Add readonly to members in Rect

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/BoundsDrawingContextWalker.cs

@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -565,7 +565,7 @@ private void AddBounds(ref Rect bounds)
             // So, we need to transform the Rect to world to bound it
             if (!_transform.IsIdentity)
             {
-                MatrixUtil.TransformRect(ref bounds, ref _transform);
+                Rect.TransformRect(ref bounds, ref _transform);
             }
 
             AddTransformedBounds(ref bounds);

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/MatrixTransform.cs

@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -104,7 +104,7 @@ internal override string ConvertToString(string format, IFormatProvider provider
         internal override void TransformRect(ref Rect rect)
         {
             Matrix matrix = Matrix;
-            MatrixUtil.TransformRect(ref rect, ref matrix);
+            Rect.TransformRect(ref rect, ref matrix);
         }
 
         internal override void MultiplyValueByMatrix(ref Matrix result, ref Matrix matrixToMultiplyBy)

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Transform.cs

@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -66,7 +66,7 @@ private static Transform MakeIdentityTransform()
         internal virtual void TransformRect(ref Rect rect)
         {
             Matrix matrix = Value;
-            MatrixUtil.TransformRect(ref rect, ref matrix);
+            Rect.TransformRect(ref rect, ref matrix);
         }
 
         /// <summary>

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Visual.cs

@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -577,7 +577,7 @@ private Rect CalculateSubgraphBoundsOuterSpace(bool renderBounds)
             if ((transform != null) && (!transform.IsIdentity))
             {
                 Matrix m = transform.Value;
-                MatrixUtil.TransformRect(ref bboxSubgraph, ref m);
+                Rect.TransformRect(ref bboxSubgraph, ref m);
             }
 
             // Apply Offset.
@@ -1109,7 +1109,7 @@ internal void PrecomputeRecursive(out Rect bboxSubgraph)
                     if ((transform != null) && (!transform.IsIdentity))
                     {
                         Matrix m = transform.Value;
-                        MatrixUtil.TransformRect(ref bboxSubgraph, ref m);
+                        Rect.TransformRect(ref bboxSubgraph, ref m);
                     }
 
                     if (!bboxSubgraph.IsEmpty)

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/Viewport3DVisual.cs

@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -577,7 +577,7 @@ internal override Rect CalculateSubgraphBoundsInnerSpace(bool renderBounds)
             Matrix3D viewProjMatrix = camera.GetViewMatrix() * camera.GetProjectionMatrix(aspectRatio);
             Rect projectedBounds2D = MILUtilities.ProjectBounds(ref viewProjMatrix, ref _bboxChildrenSubgraph3D);
             Matrix homoToLocal = M3DUtil.GetHomogeneousToViewportTransform(viewport);
-            MatrixUtil.TransformRect(ref projectedBounds2D, ref homoToLocal);
+            Rect.TransformRect(ref projectedBounds2D, ref homoToLocal);
 
             return projectedBounds2D;
         }

src/Microsoft.DotNet.Wpf/src/Shared/MS/Internal/MatrixUtil.cs

@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -22,78 +22,6 @@ internal enum MatrixTypes
 
     internal static class MatrixUtil
     {
-        /// <summary>
-        /// TransformRect - Internal helper for perf
-        /// </summary>
-        /// <param name="rect"> The Rect to transform. </param>
-        /// <param name="matrix"> The Matrix with which to transform the Rect. </param>
-        internal static void TransformRect(ref Rect rect, ref Matrix matrix)
-        {
-            if (rect.IsEmpty)
-            {
-                return;
-            }
-
-            MatrixTypes matrixType = matrix._type;
-
-            // If the matrix is identity, don't worry.
-            if (matrixType == MatrixTypes.TRANSFORM_IS_IDENTITY)
-            {
-                return;
-            }
-
-            // Scaling
-            if (0 != (matrixType & MatrixTypes.TRANSFORM_IS_SCALING))
-            {
-                rect._x *= matrix._m11;
-                rect._y *= matrix._m22;
-                rect._width *= matrix._m11;
-                rect._height *= matrix._m22;
-
-                // Ensure the width is always positive.  For example, if there was a reflection about the
-                // y axis followed by a translation into the visual area, the width could be negative.
-                if (rect._width < 0.0)
-                {
-                    rect._x += rect._width;
-                    rect._width = -rect._width;
-                }
-
-                // Ensure the height is always positive.  For example, if there was a reflection about the
-                // x axis followed by a translation into the visual area, the height could be negative.
-                if (rect._height < 0.0)
-                {
-                    rect._y += rect._height;
-                    rect._height = -rect._height;
-                }
-            }
-
-            // Translation
-            if (0 != (matrixType & MatrixTypes.TRANSFORM_IS_TRANSLATION))
-            {
-                // X
-                rect._x += matrix._offsetX;
-
-                // Y
-                rect._y += matrix._offsetY;
-            }
-
-            if (matrixType == MatrixTypes.TRANSFORM_IS_UNKNOWN)
-            {
-                // Al Bunny implementation.
-                Point point0 = matrix.Transform(rect.TopLeft);
-                Point point1 = matrix.Transform(rect.TopRight);
-                Point point2 = matrix.Transform(rect.BottomRight);
-                Point point3 = matrix.Transform(rect.BottomLeft);
-
-                // Width and height is always positive here.
-                rect._x = Math.Min(Math.Min(point0.X, point1.X), Math.Min(point2.X, point3.X));
-                rect._y = Math.Min(Math.Min(point0.Y, point1.Y), Math.Min(point2.Y, point3.Y));
-
-                rect._width = Math.Max(Math.Max(point0.X, point1.X), Math.Max(point2.X, point3.X)) - rect._x;
-                rect._height = Math.Max(Math.Max(point0.Y, point1.Y), Math.Max(point2.Y, point3.Y)) - rect._y;
-            }
-        }
-
         /// <summary>
         /// Multiplies two transformations, where the behavior is matrix1 *= matrix2.
         /// This code exists so that we can efficient combine matrices without copying