Replaced some Dictionaries and Hashtables with Hashsets (#4177)

ThomasGoulet73 · web-flow · commit 52dbcf79e487 · 2021-03-26T20:01:13.000-07:00
Co-authored-by: Thomas Goulet &lt;thomas.goulet@mmbs.ca&gt;
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontCache/FontResourceCache.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontCache/FontResourceCache.cs
@@ -28,10 +28,10 @@ internal static class FontResourceCache
         private static void ConstructFontResourceCache(Assembly entryAssembly, Dictionary<string, List<string>> folderResourceMap)
         {
             // For entryAssembly build a set of mapping from paths to entries that describe each resource.
-            Dictionary<string, string> contentFiles = ContentFileHelper.GetContentFiles(entryAssembly);
+            HashSet<string> contentFiles = ContentFileHelper.GetContentFiles(entryAssembly);
             if (contentFiles != null)
             {
-                foreach (string contentFile in contentFiles.Keys)
+                foreach (string contentFile in contentFiles)
                 {
                     AddResourceToFolderMap(folderResourceMap, contentFile);
                 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Resources/ContentFileHelper.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Resources/ContentFileHelper.cs
@@ -28,7 +28,7 @@ internal static bool IsContentFile(string partName)
 
             if (_contentFiles != null && _contentFiles.Count > 0)
             {                
-                if (_contentFiles.ContainsKey(partName))
+                if (_contentFiles.Contains(partName))
                 {
                     return true;
                 }
@@ -40,9 +40,9 @@ internal static bool IsContentFile(string partName)
         //
         // Get a list of Content Files for a given Assembly.
         //
-        static internal Dictionary<string, string> GetContentFiles(Assembly asm)
+        static internal HashSet<string> GetContentFiles(Assembly asm)
         {
-            Dictionary<string, string> contentFiles = null;
+            HashSet<string> contentFiles = null;
 
             Attribute[] assemblyAttributes;
 
@@ -53,7 +53,7 @@ static internal Dictionary<string, string> GetContentFiles(Assembly asm)
                 {
                     // If we have no entry assembly return an empty list because
                     // we can't have any content files.
-                    return new Dictionary<string, string>();
+                    return new HashSet<string>();
                 }
             }
 
@@ -63,20 +63,20 @@ static internal Dictionary<string, string> GetContentFiles(Assembly asm)
 
             if (assemblyAttributes != null && assemblyAttributes.Length > 0)
             {
-                contentFiles = new Dictionary<string, string>(assemblyAttributes.Length, StringComparer.OrdinalIgnoreCase);
+                contentFiles = new HashSet<string>(assemblyAttributes.Length, StringComparer.OrdinalIgnoreCase);
 
                 for (int i=0; i<assemblyAttributes.Length; i++)
                 {
                     AssemblyAssociatedContentFileAttribute aacf;
 
                     aacf = (AssemblyAssociatedContentFileAttribute) assemblyAttributes[i];
-                    contentFiles.Add(aacf.RelativeContentFilePath, null);
+                    contentFiles.Add(aacf.RelativeContentFilePath);
                 }
             }
 
             return contentFiles;
         }
 
-        private static Dictionary<string, string> _contentFiles;
+        private static HashSet<string> _contentFiles;
     }
 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Automation/Peers/AutomationPeer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Automation/Peers/AutomationPeer.cs
@@ -1761,7 +1761,7 @@ internal void UpdateChildrenInternal(int invalidateLimit)
         {
             List<AutomationPeer> oldChildren = _children;
             List<AutomationPeer> addedChildren = null;
-            Hashtable ht = null;
+            HashSet<AutomationPeer> hs = null;
 
             _childrenValid = false;
             EnsureChildren();
@@ -1770,14 +1770,13 @@ internal void UpdateChildrenInternal(int invalidateLimit)
             if (!EventMap.HasRegisteredEvent(AutomationEvents.StructureChanged))
                 return;
 
-            //store old children in a hashtable
+            //store old children in a hashset
             if(oldChildren != null)
             {
-                ht =  new Hashtable();
+                hs = new HashSet<AutomationPeer>();
                 for(int count = oldChildren.Count, i = 0; i < count; i++)
                 {
-                    if(!ht.Contains(oldChildren[i]))
-                        ht.Add(oldChildren[i], null);
+                    hs.Add(oldChildren[i]);
                 }
             }
 
@@ -1790,9 +1789,9 @@ internal void UpdateChildrenInternal(int invalidateLimit)
                 for(int count = _children.Count, i = 0; i < count; i++)
                 {
                     AutomationPeer child = _children[i];
-                    if(ht != null && ht.ContainsKey(child))
+                    if(hs != null && hs.Contains(child))
                     {
-                        ht.Remove(child); //same child, nothing to notify
+                        hs.Remove(child); //same child, nothing to notify
                     }
                     else
                     {
@@ -1808,9 +1807,9 @@ internal void UpdateChildrenInternal(int invalidateLimit)
                 }
             }
 
-            //now the ht only has "removed" children. If the count does not yet
+            //now the hs only has "removed" children. If the count does not yet
             //calls for "bulk" notification, use per-child notification, otherwise use "bulk"
-            int removedCount = (ht == null ? 0 : ht.Count);
+            int removedCount = (hs == null ? 0 : hs.Count);
 
             if(removedCount + addedCount > invalidateLimit) //bilk invalidation
             {
@@ -1842,11 +1841,9 @@ internal void UpdateChildrenInternal(int invalidateLimit)
                     IRawElementProviderSimple provider = ProviderFromPeerNoDelegation(this);
                     if (provider != null)
                     {
-                        //ht contains removed children by now
-                        foreach (object key in ht.Keys)
+                        //hs contains removed children by now
+                        foreach (AutomationPeer removedChild in hs)
                         {
-                            AutomationPeer removedChild = (AutomationPeer)key;
-
                             int[] rid = removedChild.GetRuntimeId();
 
                             AutomationInteropProvider.RaiseStructureChangedEvent(
@@ -1857,7 +1854,7 @@ internal void UpdateChildrenInternal(int invalidateLimit)
                 }
                 if (addedCount > 0)
                 {
-                    //ht contains removed children by now
+                    //hs contains removed children by now
                     foreach (AutomationPeer addedChild in addedChildren)
                     {
                         //for children added, provider is the child itself
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/MediaContext.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/MediaContext.cs
@@ -223,7 +223,7 @@ internal MediaContext(Dispatcher dispatcher)
             _contextGuid = Guid.NewGuid();
 
             // Create a dictionary in which we manage the CompositionTargets.
-            _registeredICompositionTargets = new Dictionary<ICompositionTarget, object>();
+            _registeredICompositionTargets = new HashSet<ICompositionTarget>();
 
             _renderModeMessage = new DispatcherOperationCallback(InvalidateRenderMode);
 
@@ -367,7 +367,7 @@ private object InvalidateRenderMode(object dontCare)
         {
             Debug.Assert(CheckAccess());
             
-            foreach (ICompositionTarget target in _registeredICompositionTargets.Keys)
+            foreach (ICompositionTarget target in _registeredICompositionTargets)
             {
                 HwndTarget hwndTarget = target as HwndTarget;
 
@@ -1441,7 +1441,7 @@ public virtual void Dispose()
 
                 // First make a copy of the dictionarys contents, because ICompositionTarget.Dispose modifies this collection.
                 ICompositionTarget[] registeredVTs = new ICompositionTarget[_registeredICompositionTargets.Count];
-                _registeredICompositionTargets.Keys.CopyTo(registeredVTs, 0);
+                _registeredICompositionTargets.CopyTo(registeredVTs, 0);
 
                 // Iterate through the ICompositionTargets and dispose them. Be careful, ICompositionTarget.Dispose
                 // removes the ICompositionTargets from the Dictionary. This is why we don't iterate the Dictionary directly.
@@ -1519,7 +1519,7 @@ private void RegisterICompositionTargetInternal(ICompositionTarget iv)
                 iv.AddRefOnChannel(channelSet.Channel, channelSet.OutOfBandChannel);
             }
 
-            _registeredICompositionTargets.Add(iv, null); // We use the dictionary just as a set.  
+            _registeredICompositionTargets.Add(iv);
         }
 
         /// <summary>
@@ -2067,7 +2067,7 @@ private void Render(ICompositionTarget resizedCompositionTarget)
                 // ----------------------------------------------------------------
                 // 1) Render each registered ICompositionTarget to finish up the batch.
 
-                foreach (ICompositionTarget registeredTarget in _registeredICompositionTargets.Keys)
+                foreach (ICompositionTarget registeredTarget in _registeredICompositionTargets)
                 {
                     DUCE.ChannelSet channelSet;
                     channelSet.Channel = _channelManager.Channel;
@@ -2727,7 +2727,7 @@ internal DUCE.ChannelSet GetChannels()
         /// <summary>
         /// Set of ICompositionTargets that are currently registered with the MediaSystem;
         /// </summary>
-        private Dictionary<ICompositionTarget, object> _registeredICompositionTargets;
+        private HashSet<ICompositionTarget> _registeredICompositionTargets;
 
         /// <summary>
         /// This are the the permissions the Context has to access Visual APIs.
diff --git a/src/Microsoft.DotNet.Wpf/src/System.Windows.Controls.Ribbon/Microsoft/Windows/Controls/Ribbon/Primitives/RibbonMenuItemsPanel.cs b/src/Microsoft.DotNet.Wpf/src/System.Windows.Controls.Ribbon/Microsoft/Windows/Controls/Ribbon/Primitives/RibbonMenuItemsPanel.cs
@@ -219,7 +219,7 @@ protected override Size ArrangeOverride(Size finalSize)
 
             // Divide remainingHeight equally among starLayoutProviders
             remainingHeight = finalSize.Height - totalDesiredHeight;
-            Dictionary<UIElement, object> starLayoutTargets = GetStarLayoutProviderTargets();
+            HashSet<UIElement> starLayoutTargets = GetStarLayoutProviderTargets();
             if (DoubleUtil.GreaterThan(remainingHeight, 0.0) && starLayoutTargets.Count > 0)
             {
                 surplusHeight = remainingHeight / starLayoutTargets.Count;
@@ -230,7 +230,7 @@ protected override Size ArrangeOverride(Size finalSize)
             for (int i = 0; i < children.Count; i++)
             {
                 UIElement child = children[i];
-                if (starLayoutTargets.ContainsKey(child))
+                if (starLayoutTargets.Contains(child))
                 {
                     // if the child is a StarLayoutProvider, give it the surplusHeight.
                     double availableHeight = child.DesiredSize.Height + surplusHeight;
@@ -266,16 +266,16 @@ internal void BringIndexIntoViewInternal(int index)
             base.BringIndexIntoView(index);
         }
 
-        private Dictionary<UIElement, object> GetStarLayoutProviderTargets()
+        private HashSet<UIElement> GetStarLayoutProviderTargets()
         {
-            Dictionary<UIElement, object> targets = new Dictionary<UIElement, object>();
+            HashSet<UIElement> targets = new HashSet<UIElement>();
 
             foreach (IProvideStarLayoutInfoBase starProvider in _registeredStarLayoutProviders)
             {
                 UIElement starLayoutTarget = starProvider.TargetElement;
                 if (starLayoutTarget != null)
                 {
-                    targets.Add(starLayoutTarget, null);
+                    targets.Add(starLayoutTarget);
                 }
             }
 
diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/Context/ObjectWriterContext.cs b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/Context/ObjectWriterContext.cs
@@ -258,17 +258,16 @@ public override string FindNamespaceByPrefix(string prefix)
         public override IEnumerable<NamespaceDeclaration> GetNamespacePrefixes()
         {
             ObjectWriterFrame frame = _stack.CurrentFrame;
-            Dictionary<string, string> keys = new Dictionary<string, string>();
+            HashSet<string> keys = new HashSet<string>();
 
             while (frame.Depth > 0)
             {
                 if (frame._namespaces != null)
                 {
                     foreach (NamespaceDeclaration namespaceDeclaration in frame.GetNamespacePrefixes())
                     {
-                        if (!keys.ContainsKey(namespaceDeclaration.Prefix))
+                        if (keys.Add(namespaceDeclaration.Prefix))
                         {
-                            keys.Add(namespaceDeclaration.Prefix, null);
                             yield return namespaceDeclaration;
                         }
                     }
diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/Context/XamlParserContext.cs b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/Context/XamlParserContext.cs
@@ -78,16 +78,15 @@ public override string FindNamespaceByPrefix(String prefix)
         public override IEnumerable<NamespaceDeclaration> GetNamespacePrefixes()
         {
             XamlParserFrame frame = _stack.CurrentFrame;
-            Dictionary<string, string> keys = new Dictionary<string, string>();
+            HashSet<string> keys = new HashSet<string>();
             while (frame.Depth > 0)
             {
                 if (frame._namespaces != null)
                 {
                     foreach (NamespaceDeclaration namespaceDeclaration in frame.GetNamespacePrefixes())
                     {
-                        if (!keys.ContainsKey(namespaceDeclaration.Prefix))
+                        if (keys.Add(namespaceDeclaration.Prefix))
                         {
-                            keys.Add(namespaceDeclaration.Prefix, null);
                             yield return namespaceDeclaration;
                         }
                     }
@@ -99,9 +98,8 @@ public override IEnumerable<NamespaceDeclaration> GetNamespacePrefixes()
             {
                 foreach (KeyValuePair<string, string> kvp in _prescopeNamespaces)
                 {
-                    if (!keys.ContainsKey(kvp.Key))
+                    if (keys.Add(kvp.Key))
                     {
-                        keys.Add(kvp.Key, null);
                         yield return new NamespaceDeclaration(kvp.Value, kvp.Key);
                     }
                 }
diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/MS/Impl/XmlNsInfo.cs b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System/Xaml/MS/Impl/XmlNsInfo.cs
@@ -436,7 +436,7 @@ public NamespaceComparer(XmlNsInfo nsInfo, Assembly assembly)
                 // Calculate the subsume count upfront, since this also serves as our cycle detection
                 _subsumeCount = new Dictionary<string,int>(nsInfo.OldToNewNs.Count);
 
-                Dictionary<string, object> visited = new Dictionary<string, object>();
+                HashSet<string> visited = new HashSet<string>();
 
                 // for every XmlnsCompatAttribute
                 foreach (string newNs in nsInfo.OldToNewNs.Values)
@@ -447,11 +447,10 @@ public NamespaceComparer(XmlNsInfo nsInfo, Assembly assembly)
                     string ns = newNs;
                     do
                     {
-                        if (visited.ContainsKey(ns))
+                        if (!visited.Add(ns))
                         {
                             throw new XamlSchemaException(SR.Get(SRID.XmlnsCompatCycle, assembly.FullName, ns));
                         }
-                        visited.Add(ns, null);
                         IncrementSubsumeCount(ns);
                         ns = GetNewNs(ns);
                     }

Original file line number	Diff line number	Diff line change
`@@ -28,10 +28,10 @@ internal static class FontResourceCache`
`28`	`28`	`private static void ConstructFontResourceCache(Assembly entryAssembly, Dictionary<string, List<string>> folderResourceMap)`
`29`	`29`	`{`
`30`	`30`	`// For entryAssembly build a set of mapping from paths to entries that describe each resource.`
`31`		`- Dictionary<string, string> contentFiles = ContentFileHelper.GetContentFiles(entryAssembly);`
	`31`	`+ HashSet<string> contentFiles = ContentFileHelper.GetContentFiles(entryAssembly);`
`32`	`32`	`if (contentFiles != null)`
`33`	`33`	`{`
`34`		`- foreach (string contentFile in contentFiles.Keys)`
	`34`	`+ foreach (string contentFile in contentFiles)`
`35`	`35`	`{`
`36`	`36`	`AddResourceToFolderMap(folderResourceMap, contentFile);`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ internal static bool IsContentFile(string partName)`
`28`	`28`
`29`	`29`	`if (_contentFiles != null && _contentFiles.Count > 0)`
`30`	`30`	`{`
`31`		`- if (_contentFiles.ContainsKey(partName))`
	`31`	`+ if (_contentFiles.Contains(partName))`
`32`	`32`	`{`
`33`	`33`	`return true;`
`34`	`34`	`}`
`@@ -40,9 +40,9 @@ internal static bool IsContentFile(string partName)`
`40`	`40`	`//`
`41`	`41`	`// Get a list of Content Files for a given Assembly.`
`42`	`42`	`//`
`43`		`- static internal Dictionary<string, string> GetContentFiles(Assembly asm)`
	`43`	`+ static internal HashSet<string> GetContentFiles(Assembly asm)`
`44`	`44`	`{`
`45`		`- Dictionary<string, string> contentFiles = null;`
	`45`	`+ HashSet<string> contentFiles = null;`
`46`	`46`
`47`	`47`	`Attribute[] assemblyAttributes;`
`48`	`48`
`@@ -53,7 +53,7 @@ static internal Dictionary<string, string> GetContentFiles(Assembly asm)`
`53`	`53`	`{`
`54`	`54`	`// If we have no entry assembly return an empty list because`
`55`	`55`	`// we can't have any content files.`
`56`		`- return new Dictionary<string, string>();`
	`56`	`+ return new HashSet<string>();`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`
`@@ -63,20 +63,20 @@ static internal Dictionary<string, string> GetContentFiles(Assembly asm)`
`63`	`63`
`64`	`64`	`if (assemblyAttributes != null && assemblyAttributes.Length > 0)`
`65`	`65`	`{`
`66`		`- contentFiles = new Dictionary<string, string>(assemblyAttributes.Length, StringComparer.OrdinalIgnoreCase);`
	`66`	`+ contentFiles = new HashSet<string>(assemblyAttributes.Length, StringComparer.OrdinalIgnoreCase);`
`67`	`67`
`68`	`68`	`for (int i=0; i<assemblyAttributes.Length; i++)`
`69`	`69`	`{`
`70`	`70`	`AssemblyAssociatedContentFileAttribute aacf;`
`71`	`71`
`72`	`72`	`aacf = (AssemblyAssociatedContentFileAttribute) assemblyAttributes[i];`
`73`		`- contentFiles.Add(aacf.RelativeContentFilePath, null);`
	`73`	`+ contentFiles.Add(aacf.RelativeContentFilePath);`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`return contentFiles;`
`78`	`78`	`}`
`79`	`79`
`80`		`- private static Dictionary<string, string> _contentFiles;`
	`80`	`+ private static HashSet<string> _contentFiles;`
`81`	`81`	`}`
`82`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1761,7 +1761,7 @@ internal void UpdateChildrenInternal(int invalidateLimit)`
`1761`	`1761`	`{`
`1762`	`1762`	`List<AutomationPeer> oldChildren = _children;`
`1763`	`1763`	`List<AutomationPeer> addedChildren = null;`
`1764`		`- Hashtable ht = null;`
	`1764`	`+ HashSet<AutomationPeer> hs = null;`
`1765`	`1765`
`1766`	`1766`	`_childrenValid = false;`
`1767`	`1767`	`EnsureChildren();`
`@@ -1770,14 +1770,13 @@ internal void UpdateChildrenInternal(int invalidateLimit)`
`1770`	`1770`	`if (!EventMap.HasRegisteredEvent(AutomationEvents.StructureChanged))`
`1771`	`1771`	`return;`
`1772`	`1772`
`1773`		`- //store old children in a hashtable`
	`1773`	`+ //store old children in a hashset`
`1774`	`1774`	`if(oldChildren != null)`
`1775`	`1775`	`{`
`1776`		`- ht = new Hashtable();`
	`1776`	`+ hs = new HashSet<AutomationPeer>();`
`1777`	`1777`	`for(int count = oldChildren.Count, i = 0; i < count; i++)`
`1778`	`1778`	`{`
`1779`		`- if(!ht.Contains(oldChildren[i]))`
`1780`		`- ht.Add(oldChildren[i], null);`
	`1779`	`+ hs.Add(oldChildren[i]);`
`1781`	`1780`	`}`
`1782`	`1781`	`}`
`1783`	`1782`
`@@ -1790,9 +1789,9 @@ internal void UpdateChildrenInternal(int invalidateLimit)`
`1790`	`1789`	`for(int count = _children.Count, i = 0; i < count; i++)`
`1791`	`1790`	`{`
`1792`	`1791`	`AutomationPeer child = _children[i];`
`1793`		`- if(ht != null && ht.ContainsKey(child))`
	`1792`	`+ if(hs != null && hs.Contains(child))`
`1794`	`1793`	`{`
`1795`		`- ht.Remove(child); //same child, nothing to notify`
	`1794`	`+ hs.Remove(child); //same child, nothing to notify`
`1796`	`1795`	`}`
`1797`	`1796`	`else`
`1798`	`1797`	`{`
`@@ -1808,9 +1807,9 @@ internal void UpdateChildrenInternal(int invalidateLimit)`
`1808`	`1807`	`}`
`1809`	`1808`	`}`
`1810`	`1809`
`1811`		`- //now the ht only has "removed" children. If the count does not yet`
	`1810`	`+ //now the hs only has "removed" children. If the count does not yet`
`1812`	`1811`	`//calls for "bulk" notification, use per-child notification, otherwise use "bulk"`
`1813`		`- int removedCount = (ht == null ? 0 : ht.Count);`
	`1812`	`+ int removedCount = (hs == null ? 0 : hs.Count);`
`1814`	`1813`
`1815`	`1814`	`if(removedCount + addedCount > invalidateLimit) //bilk invalidation`
`1816`	`1815`	`{`
`@@ -1842,11 +1841,9 @@ internal void UpdateChildrenInternal(int invalidateLimit)`
`1842`	`1841`	`IRawElementProviderSimple provider = ProviderFromPeerNoDelegation(this);`
`1843`	`1842`	`if (provider != null)`
`1844`	`1843`	`{`
`1845`		`- //ht contains removed children by now`
`1846`		`- foreach (object key in ht.Keys)`
	`1844`	`+ //hs contains removed children by now`
	`1845`	`+ foreach (AutomationPeer removedChild in hs)`
`1847`	`1846`	`{`
`1848`		`- AutomationPeer removedChild = (AutomationPeer)key;`
`1849`		`-`
`1850`	`1847`	`int[] rid = removedChild.GetRuntimeId();`
`1851`	`1848`
`1852`	`1849`	`AutomationInteropProvider.RaiseStructureChangedEvent(`
`@@ -1857,7 +1854,7 @@ internal void UpdateChildrenInternal(int invalidateLimit)`
`1857`	`1854`	`}`
`1858`	`1855`	`if (addedCount > 0)`
`1859`	`1856`	`{`
`1860`		`- //ht contains removed children by now`
	`1857`	`+ //hs contains removed children by now`
`1861`	`1858`	`foreach (AutomationPeer addedChild in addedChildren)`
`1862`	`1859`	`{`
`1863`	`1860`	`//for children added, provider is the child itself`
Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,7 @@ protected override Size ArrangeOverride(Size finalSize)`
`219`	`219`
`220`	`220`	`// Divide remainingHeight equally among starLayoutProviders`
`221`	`221`	`remainingHeight = finalSize.Height - totalDesiredHeight;`
`222`		`- Dictionary<UIElement, object> starLayoutTargets = GetStarLayoutProviderTargets();`
	`222`	`+ HashSet<UIElement> starLayoutTargets = GetStarLayoutProviderTargets();`
`223`	`223`	`if (DoubleUtil.GreaterThan(remainingHeight, 0.0) && starLayoutTargets.Count > 0)`
`224`	`224`	`{`
`225`	`225`	`surplusHeight = remainingHeight / starLayoutTargets.Count;`
`@@ -230,7 +230,7 @@ protected override Size ArrangeOverride(Size finalSize)`
`230`	`230`	`for (int i = 0; i < children.Count; i++)`
`231`	`231`	`{`
`232`	`232`	`UIElement child = children[i];`
`233`		`- if (starLayoutTargets.ContainsKey(child))`
	`233`	`+ if (starLayoutTargets.Contains(child))`
`234`	`234`	`{`
`235`	`235`	`// if the child is a StarLayoutProvider, give it the surplusHeight.`
`236`	`236`	`double availableHeight = child.DesiredSize.Height + surplusHeight;`
`@@ -266,16 +266,16 @@ internal void BringIndexIntoViewInternal(int index)`
`266`	`266`	`base.BringIndexIntoView(index);`
`267`	`267`	`}`
`268`	`268`
`269`		`- private Dictionary<UIElement, object> GetStarLayoutProviderTargets()`
	`269`	`+ private HashSet<UIElement> GetStarLayoutProviderTargets()`
`270`	`270`	`{`
`271`		`- Dictionary<UIElement, object> targets = new Dictionary<UIElement, object>();`
	`271`	`+ HashSet<UIElement> targets = new HashSet<UIElement>();`
`272`	`272`
`273`	`273`	`foreach (IProvideStarLayoutInfoBase starProvider in _registeredStarLayoutProviders)`
`274`	`274`	`{`
`275`	`275`	`UIElement starLayoutTarget = starProvider.TargetElement;`
`276`	`276`	`if (starLayoutTarget != null)`
`277`	`277`	`{`
`278`		`- targets.Add(starLayoutTarget, null);`
	`278`	`+ targets.Add(starLayoutTarget);`
`279`	`279`	`}`
`280`	`280`	`}`
`281`	`281`
Original file line number	Diff line number	Diff line change
`@@ -258,17 +258,16 @@ public override string FindNamespaceByPrefix(string prefix)`
`258`	`258`	`public override IEnumerable<NamespaceDeclaration> GetNamespacePrefixes()`
`259`	`259`	`{`
`260`	`260`	`ObjectWriterFrame frame = _stack.CurrentFrame;`
`261`		`- Dictionary<string, string> keys = new Dictionary<string, string>();`
	`261`	`+ HashSet<string> keys = new HashSet<string>();`
`262`	`262`
`263`	`263`	`while (frame.Depth > 0)`
`264`	`264`	`{`
`265`	`265`	`if (frame._namespaces != null)`
`266`	`266`	`{`
`267`	`267`	`foreach (NamespaceDeclaration namespaceDeclaration in frame.GetNamespacePrefixes())`
`268`	`268`	`{`
`269`		`- if (!keys.ContainsKey(namespaceDeclaration.Prefix))`
	`269`	`+ if (keys.Add(namespaceDeclaration.Prefix))`
`270`	`270`	`{`
`271`		`- keys.Add(namespaceDeclaration.Prefix, null);`
`272`	`271`	`yield return namespaceDeclaration;`
`273`	`272`	`}`
`274`	`273`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,16 +78,15 @@ public override string FindNamespaceByPrefix(String prefix)`
`78`	`78`	`public override IEnumerable<NamespaceDeclaration> GetNamespacePrefixes()`
`79`	`79`	`{`
`80`	`80`	`XamlParserFrame frame = _stack.CurrentFrame;`
`81`		`- Dictionary<string, string> keys = new Dictionary<string, string>();`
	`81`	`+ HashSet<string> keys = new HashSet<string>();`
`82`	`82`	`while (frame.Depth > 0)`
`83`	`83`	`{`
`84`	`84`	`if (frame._namespaces != null)`
`85`	`85`	`{`
`86`	`86`	`foreach (NamespaceDeclaration namespaceDeclaration in frame.GetNamespacePrefixes())`
`87`	`87`	`{`
`88`		`- if (!keys.ContainsKey(namespaceDeclaration.Prefix))`
	`88`	`+ if (keys.Add(namespaceDeclaration.Prefix))`
`89`	`89`	`{`
`90`		`- keys.Add(namespaceDeclaration.Prefix, null);`
`91`	`90`	`yield return namespaceDeclaration;`
`92`	`91`	`}`
`93`	`92`	`}`
`@@ -99,9 +98,8 @@ public override IEnumerable<NamespaceDeclaration> GetNamespacePrefixes()`
`99`	`98`	`{`
`100`	`99`	`foreach (KeyValuePair<string, string> kvp in _prescopeNamespaces)`
`101`	`100`	`{`
`102`		`- if (!keys.ContainsKey(kvp.Key))`
	`101`	`+ if (keys.Add(kvp.Key))`
`103`	`102`	`{`
`104`		`- keys.Add(kvp.Key, null);`
`105`	`103`	`yield return new NamespaceDeclaration(kvp.Value, kvp.Key);`
`106`	`104`	`}`
`107`	`105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -436,7 +436,7 @@ public NamespaceComparer(XmlNsInfo nsInfo, Assembly assembly)`
`436`	`436`	`// Calculate the subsume count upfront, since this also serves as our cycle detection`
`437`	`437`	`_subsumeCount = new Dictionary<string,int>(nsInfo.OldToNewNs.Count);`
`438`	`438`
`439`		`- Dictionary<string, object> visited = new Dictionary<string, object>();`
	`439`	`+ HashSet<string> visited = new HashSet<string>();`
`440`	`440`
`441`	`441`	`// for every XmlnsCompatAttribute`
`442`	`442`	`foreach (string newNs in nsInfo.OldToNewNs.Values)`
`@@ -447,11 +447,10 @@ public NamespaceComparer(XmlNsInfo nsInfo, Assembly assembly)`
`447`	`447`	`string ns = newNs;`
`448`	`448`	`do`
`449`	`449`	`{`
`450`		`- if (visited.ContainsKey(ns))`
	`450`	`+ if (!visited.Add(ns))`
`451`	`451`	`{`
`452`	`452`	`throw new XamlSchemaException(SR.Get(SRID.XmlnsCompatCycle, assembly.FullName, ns));`
`453`	`453`	`}`
`454`		`- visited.Add(ns, null);`
`455`	`454`	`IncrementSubsumeCount(ns);`
`456`	`455`	`ns = GetNewNs(ns);`
`457`	`456`	`}`