convert FromNameKey to be a readonly struct instead of a class

Author: h3xds1nz

src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/DependencyProperty.cs

@@ -257,7 +257,7 @@ private static void RegisterParameterValidation(string name, Type propertyType,
 
         private static DependencyProperty RegisterCommon(string name, Type propertyType, Type ownerType, PropertyMetadata defaultMetadata, ValidateValueCallback validateValueCallback)
         {
-            FromNameKey key = new FromNameKey(name, ownerType);
+            FromNameKey key = new(name, ownerType);
             lock (Synchronized)
             {
                 if (PropertyFromName.ContainsKey(key))
@@ -761,7 +761,7 @@ public DependencyProperty AddOwner(Type ownerType, PropertyMetadata typeMetadata
 
             // Map owner type to this property
             // Build key
-            FromNameKey key = new FromNameKey(Name, ownerType);
+            FromNameKey key = new(Name, ownerType);
 
             lock (Synchronized)
             {
@@ -776,13 +776,11 @@ public DependencyProperty AddOwner(Type ownerType, PropertyMetadata typeMetadata
                 OverrideMetadata(ownerType, typeMetadata);
             }
 
-
             lock (Synchronized)
             {
                 PropertyFromName[key] = this;
             }
 
-
             return this;
         }
 
@@ -979,19 +977,20 @@ internal static DependencyProperty FromName(string name, Type ownerType)
             ArgumentNullException.ThrowIfNull(name);
             ArgumentNullException.ThrowIfNull(ownerType);
 
-            FromNameKey key = new FromNameKey(name, ownerType);
+            FromNameKey key;
 
             while ((dp == null) && (ownerType != null))
             {
                 // Ensure static constructor of type has run
                 MS.Internal.WindowsBase.SecurityHelper.RunClassConstructor(ownerType);
 
                 // Locate property
-                key.UpdateNameKey(ownerType);
+                key = new FromNameKey(name, ownerType);
 
                 lock (Synchronized)
                 {
-                    dp = PropertyFromName[key];
+                    if (PropertyFromName.TryGetValue(key, out dp))
+                        return dp;
                 }
 
                 ownerType = ownerType.BaseType;
@@ -1033,7 +1032,7 @@ internal static bool IsValidType(object value, Type propertyType)
             return true;
         }
 
-        private class FromNameKey
+        private readonly struct FromNameKey : IEquatable<FromNameKey>
         {
             public FromNameKey(string name, Type ownerType)
             {
@@ -1043,39 +1042,25 @@ public FromNameKey(string name, Type ownerType)
                 _hashCode = _name.GetHashCode() ^ _ownerType.GetHashCode();
             }
 
-            public void UpdateNameKey(Type ownerType)
-            {
-                _ownerType = ownerType;
-
-                _hashCode = _name.GetHashCode() ^ _ownerType.GetHashCode();
-            }
-
             public override int GetHashCode()
             {
                 return _hashCode;
             }
 
             public override bool Equals(object o)
             {
-                if ((o != null) && (o is FromNameKey))
-                {
-                    return Equals((FromNameKey)o);
-                }
-                else
-                {
-                    return false;
-                }
+                return o is FromNameKey key && Equals(key);
             }
 
             public bool Equals(FromNameKey key)
             {
-                return (_name.Equals(key._name) && (_ownerType == key._ownerType));
+                return _name.Equals(key._name) && _ownerType == key._ownerType;
             }
 
-            private string _name;
-            private Type _ownerType;
+            private readonly string _name;
+            private readonly Type _ownerType;
 
-            private int _hashCode;
+            private readonly int _hashCode;
         }