Replace double/float IsNaN + IsInfinity checks with optimized IsFinite

src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/AnimatedTypeHelpers.cs

@@ -632,12 +632,7 @@ internal static bool IsValidAnimationValueDecimal(Decimal value)
 
         internal static bool IsValidAnimationValueDouble(Double value)
         {
-            if (IsInvalidDouble(value))
-            {
-                return false;
-            }
-
-            return true;
+            return double.IsFinite(value);
         }
 
         internal static bool IsValidAnimationValueInt16(Int16 value)
@@ -662,95 +657,53 @@ internal static bool IsValidAnimationValueMatrix(Matrix value)
 
         internal static bool IsValidAnimationValuePoint(Point value)
         {
-            if (IsInvalidDouble(value.X) || IsInvalidDouble(value.Y))
-            {
-                return false;
-            }
-
-            return true;
+            return double.IsFinite(value.X) && double.IsFinite(value.Y);
         }
 
         internal static bool IsValidAnimationValuePoint3D(Point3D value)
         {
-            if (IsInvalidDouble(value.X) || IsInvalidDouble(value.Y) || IsInvalidDouble(value.Z))
-            {
-                return false;
-            }
-
-            return true;
+            return double.IsFinite(value.X) && double.IsFinite(value.Y) && double.IsFinite(value.Z);
         }
 
         internal static bool IsValidAnimationValueQuaternion(Quaternion value)
         {
-            if (   IsInvalidDouble(value.X) || IsInvalidDouble(value.Y)
-                || IsInvalidDouble(value.Z) || IsInvalidDouble(value.W))
-            {
-                return false;
-            }
-
-            return true;
+            return double.IsFinite(value.X) && double.IsFinite(value.Y) && double.IsFinite(value.Z) && double.IsFinite(value.W);
         }
 
         internal static bool IsValidAnimationValueRect(Rect value)
         {
-            if (   IsInvalidDouble(value.Location.X) || IsInvalidDouble(value.Location.Y)
-                || IsInvalidDouble(value.Size.Width) || IsInvalidDouble(value.Size.Height)
-                || value.IsEmpty)
-            {
-                return false;
-            }
-
-            return true;
+            return double.IsFinite(value.Location.X) && double.IsFinite(value.Location.Y) &&
+                   double.IsFinite(value.Size.Width) && double.IsFinite(value.Size.Height) && !value.IsEmpty;
         }
 
         internal static bool IsValidAnimationValueRotation3D(Rotation3D value)
         {
             return IsValidAnimationValueQuaternion(value.InternalQuaternion);
         }
 
-        internal static bool IsValidAnimationValueSingle(Single value)
+        internal static bool IsValidAnimationValueSingle(float value)
         {
-            if (IsInvalidDouble(value))
-            {
-                return false;
-            }
-
-            return true;
+            return float.IsFinite(value);
         }
 
         internal static bool IsValidAnimationValueSize(Size value)
         {
-            if (IsInvalidDouble(value.Width) || IsInvalidDouble(value.Height))
-            {
-                return false;
-            }
-
-            return true;
+            return double.IsFinite(value.Width) && double.IsFinite(value.Height);
         }
 
-        internal static bool IsValidAnimationValueString(String value)
+        internal static bool IsValidAnimationValueString(string value)
         {
             return true;
         }
 
-        internal static bool IsValidAnimationValueVector(System.Windows.Vector value)
+        internal static bool IsValidAnimationValueVector(Vector value)
         {
-            if (IsInvalidDouble(value.X) || IsInvalidDouble(value.Y))
-            {
-                return false;
-            }
-
-            return true;
+            return double.IsFinite(value.X) && double.IsFinite(value.Y);
         }
 
         internal static bool IsValidAnimationValueVector3D(Vector3D value)
         {
-            if (IsInvalidDouble(value.X) || IsInvalidDouble(value.Y) || IsInvalidDouble(value.Z))
-            {
-                return false;
-            }
-
-            return true;
+            return double.IsFinite(value.X) && double.IsFinite(value.Y) && double.IsFinite(value.Z);
         }
 
         #endregion
@@ -839,14 +792,5 @@ internal static Rotation3D GetZeroValueRotation3D(Rotation3D baseValue)
 
         #endregion
 
-        #region Helpers
-
-        private static Boolean IsInvalidDouble(Double value)
-        {
-            return Double.IsInfinity(value)
-                || double.IsNaN(value);
-        }
-
-        #endregion
     }
 }

src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/StylusShape.cs

@@ -38,17 +38,17 @@ internal StylusShape(){}
         ///</summary>
         internal StylusShape(StylusTip tip, double width, double height, double rotation)
         {
-            if (Double.IsNaN(width) || Double.IsInfinity(width) || width < DrawingAttributes.MinWidth || width > DrawingAttributes.MaxWidth)
+            if (!double.IsFinite(width) || width < DrawingAttributes.MinWidth || width > DrawingAttributes.MaxWidth)
             {
                 throw new ArgumentOutOfRangeException(nameof(width));
             }
 
-            if (Double.IsNaN(height) || Double.IsInfinity(height) || height < DrawingAttributes.MinHeight || height > DrawingAttributes.MaxHeight)
+            if (!double.IsFinite(height) || height < DrawingAttributes.MinHeight || height > DrawingAttributes.MaxHeight)
             {
                 throw new ArgumentOutOfRangeException(nameof(height));
             }
 
-            if (Double.IsNaN(rotation) || Double.IsInfinity(rotation))
+            if (!double.IsFinite(rotation))
             {
                 throw new ArgumentOutOfRangeException(nameof(rotation));
             }

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InertiaExpansionBehavior.cs

@@ -49,7 +49,7 @@ public double DesiredDeceleration
             get { return _desiredDeceleration; }
             set
             {
-                if (Double.IsInfinity(value) || Double.IsNaN(value))
+                if (!double.IsFinite(value))
                 {
                     throw new ArgumentOutOfRangeException(nameof(value));
                 }

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InertiaRotationBehavior.cs

@@ -49,7 +49,7 @@ public double DesiredDeceleration
             get { return _desiredDeceleration; }
             set
             {
-                if (Double.IsInfinity(value) || Double.IsNaN(value))
+                if (!double.IsFinite(value))
                 {
                     throw new ArgumentOutOfRangeException(nameof(value));
                 }
@@ -69,7 +69,7 @@ public double DesiredRotation
             get { return _desiredRotation; }
             set
             {
-                if (Double.IsInfinity(value) || Double.IsNaN(value))
+                if (!double.IsFinite(value))
                 {
                     throw new ArgumentOutOfRangeException(nameof(value));
                 }

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/InertiaTranslationBehavior.cs

@@ -49,7 +49,7 @@ public double DesiredDeceleration
             get { return _desiredDeceleration; }
             set
             {
-                if (Double.IsInfinity(value) || Double.IsNaN(value))
+                if (!double.IsFinite(value))
                 {
                     throw new ArgumentOutOfRangeException(nameof(value));
                 }
@@ -69,7 +69,7 @@ public double DesiredDisplacement
             get { return _desiredDisplacement; }
             set
             {
-                if (Double.IsInfinity(value) || Double.IsNaN(value))
+                if (!double.IsFinite(value))
                 {
                     throw new ArgumentOutOfRangeException(nameof(value));
                 }

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Animation/RepeatBehavior.cs

@@ -35,7 +35,7 @@ namespace System.Windows.Media.Animation
         /// <param name="count">The number of iterations specified by this RepeatBehavior.</param>
         public RepeatBehavior(double count)
         {
-            if (double.IsInfinity(count) || double.IsNaN(count) || count < 0.0)
+            if (!double.IsFinite(count) || count < 0.0)
                 throw new ArgumentOutOfRangeException(nameof(count), SR.Format(SR.Timing_RepeatBehaviorInvalidIterationCount, count));
 
             _repeatDuration = TimeSpan.Zero;

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media3D/MeshGeometry3D.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.
 
 //
@@ -404,8 +404,7 @@ ref Point barycentric
                         return;
                     }
 
-                    Debug.Assert(!double.IsInfinity(pz / pw) && !double.IsNaN(pz / pw),
-                        "Expected near/far tests to cull -Inf/+Inf and NaN.");
+                    Debug.Assert(double.IsFinite(pz / pw), "Expected near/far tests to cull -Inf/+Inf and NaN.");
                 }
 
                 double dist = (worldPointHit - rayParams.Origin).Length;
@@ -490,8 +489,7 @@ ref Point barycentric
                         return;
                     }
 
-                    Debug.Assert(!double.IsInfinity(pz / pw) && !double.IsNaN(pz / pw),
-                        "Expected near/far tests to cull -Inf/+Inf and NaN.");
+                    Debug.Assert(double.IsFinite(pz / pw), "Expected near/far tests to cull -Inf/+Inf and NaN.");
                 }
 
                 Point3D a = v0, b = v1, c = v2;

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/UIElement.cs

@@ -1085,9 +1085,7 @@ internal static double RoundLayoutValue(double value, double dpiScale)
             {
                 newValue = Math.Round(value * dpiScale) / dpiScale;
                 // If rounding produces a value unacceptable to layout (NaN, Infinity or MaxValue), use the original value.
-                if (double.IsNaN(newValue) ||
-                    Double.IsInfinity(newValue) ||
-                    DoubleUtil.AreClose(newValue, Double.MaxValue))
+                if (!double.IsFinite(newValue) || DoubleUtil.AreClose(newValue, double.MaxValue))
                 {
                     newValue = value;
                 }
@@ -1388,9 +1386,9 @@ private static void RenderTransform_Changed(DependencyObject d, DependencyProper
 
         private static bool IsRenderTransformOriginValid(object value)
         {
-            Point v = (Point)value;
-            return (    (!double.IsNaN(v.X) && !Double.IsPositiveInfinity(v.X) && !Double.IsNegativeInfinity(v.X))
-                     && (!double.IsNaN(v.Y) && !Double.IsPositiveInfinity(v.Y) && !Double.IsNegativeInfinity(v.Y)));
+            Point origin = (Point)value;
+
+            return double.IsFinite(origin.X) && double.IsFinite(origin.Y);
         }
 
 

src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AnimatedTypeHelpers.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.
 
 
@@ -113,28 +113,10 @@ internal static Thickness ScaleThickness(Thickness value, double factor)
 
         #region IsValidAnimationValue Methods
 
-        private static bool IsValidAnimationValueDouble(Double value)
-        {
-            if (IsInvalidDouble(value))
-            {
-                return false;
-            }
-
-            return true;
-        }
-
         internal static bool IsValidAnimationValueThickness(Thickness value)
         {
             // At least one of the sub-values must be an interpolatable length.
-            if (   IsValidAnimationValueDouble(value.Left)
-                || IsValidAnimationValueDouble(value.Top)
-                || IsValidAnimationValueDouble(value.Right)
-                || IsValidAnimationValueDouble(value.Bottom))
-            {
-                return true;
-            }
-
-            return false;
+            return double.IsFinite(value.Left) || double.IsFinite(value.Top) || double.IsFinite(value.Right) || double.IsFinite(value.Bottom);
         }
 
         #endregion
@@ -157,14 +139,5 @@ internal static Thickness GetZeroValueThickness(Thickness baseValue)
 
         #endregion
 
-        #region Helpers
-
-        private static bool IsInvalidDouble(double value)
-        {
-            return Double.IsInfinity(value)
-                || double.IsNaN(value);
-        }
-
-        #endregion
     }
 }

src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Helper.cs

@@ -540,17 +540,6 @@ internal static Size ArrangeElementWithSingleChild(UIElement element, Size arran
             return arrangeSize;
         }
 
-        /// <summary>
-        /// Helper method used for double parameter validation.  Returns false
-        /// if the value is either Infinity (positive or negative) or NaN.
-        /// </summary>
-        /// <param name="value">The double value to test</param>
-        /// <returns>Whether the value is a valid double.</returns>
-        internal static bool IsDoubleValid(double value)
-        {
-            return !(Double.IsInfinity(value) || Double.IsNaN(value));
-        }
-
         /// <summary>
         /// Checks if the given IProvideValueTarget can receive
         /// a DynamicResource or Binding MarkupExtension.

src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/documents/DocumentGrid.cs

@@ -422,7 +422,7 @@ public void SetScale(double scale)
             {
                 ArgumentOutOfRangeException.ThrowIfLessThanOrEqual(scale, 0.0);
 
-                if (!Helper.IsDoubleValid(scale))
+                if (!double.IsFinite(scale))
                 {
                     throw new ArgumentOutOfRangeException(nameof(scale));
                 }
@@ -798,7 +798,7 @@ public double VerticalPageSpacing
 
             set
             {
-                if (!Helper.IsDoubleValid(value))
+                if (!double.IsFinite(value))
                 {
                     throw new ArgumentOutOfRangeException(nameof(value));
                 }
@@ -820,7 +820,7 @@ public double HorizontalPageSpacing
 
             set
             {
-                if (!Helper.IsDoubleValid(value))
+                if (!double.IsFinite(value))
                 {
                     throw new ArgumentOutOfRangeException(nameof(value));
                 }

src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Automation/Peers/GridSplitterAutomationPeer.cs

@@ -39,10 +39,10 @@ void ITransformProvider.Move(double x, double y)
             if (!IsEnabled())
                 throw new ElementNotEnabledException();
 
-            if (double.IsInfinity(x) || double.IsNaN(x))
+            if (!double.IsFinite(x))
                 throw new ArgumentOutOfRangeException(nameof(x));
 
-            if (double.IsInfinity(y) || double.IsNaN(y))
+            if (!double.IsFinite(y))
                 throw new ArgumentOutOfRangeException(nameof(y));
 
             ((GridSplitter)Owner).KeyboardMoveSplitter(x, y);

src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/Border.cs

@@ -159,7 +159,8 @@ public static readonly DependencyProperty CornerRadiusProperty
         private static bool IsCornerRadiusValid(object value)
         {
             CornerRadius cr = (CornerRadius)value;
-            return (cr.IsValid(false, false, false, false));
+
+            return cr.IsValid();
         }
 
         /// <summary>

src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/DataGridCellsPanel.cs

@@ -2014,7 +2014,7 @@ private double GetViewportWidth()
             if (DoubleUtil.AreClose(availableViewportWidth, 0.0) && parentRowsPresenter != null)
             {
                 Size rowPresenterAvailableSize = parentRowsPresenter.AvailableSize;
-                if (!double.IsNaN(rowPresenterAvailableSize.Width) && !Double.IsInfinity(rowPresenterAvailableSize.Width))
+                if (double.IsFinite(rowPresenterAvailableSize.Width))
                 {
                     availableViewportWidth = rowPresenterAvailableSize.Width;
                 }

src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/DataGridLength.cs

@@ -72,7 +72,7 @@ public DataGridLength(double value, DataGridLengthUnitType type)
         /// </exception>
         public DataGridLength(double value, DataGridLengthUnitType type, double desiredValue, double displayValue)
         {
-            if (double.IsNaN(value) || Double.IsInfinity(value))
+            if (!double.IsFinite(value))
             {
                 throw new ArgumentException(
                     SR.DataGridLength_Infinity,