From 45f37dfd1eb7f8af1392447a9b0ad77da82fc964 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Fri, 6 Jul 2018 15:11:44 -0500
Subject: [PATCH] Remove cleanup since it was slowing down ControlCatalog.

---
 src/Avalonia.Base/Utilities/DeferredSetter.cs | 12 ------------
 src/Avalonia.Base/Utilities/SingleOrQueue.cs  |  5 +----
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/src/Avalonia.Base/Utilities/DeferredSetter.cs b/src/Avalonia.Base/Utilities/DeferredSetter.cs
index 15c85338c7..ae6f599005 100644
--- a/src/Avalonia.Base/Utilities/DeferredSetter.cs
+++ b/src/Avalonia.Base/Utilities/DeferredSetter.cs
@@ -45,8 +45,6 @@ namespace Avalonia.Utilities
                     return pendingValues ?? (pendingValues = new SingleOrQueue<TSetRecord>());
                 }
             }
-
-            public bool IsSimpleSet => pendingValues?.HasTail != true;
         }
 
         private Dictionary<AvaloniaProperty, SettingStatus> _setRecords;
@@ -118,14 +116,6 @@ namespace Avalonia.Utilities
             return GetOrCreateStatus(property).PendingValues.Dequeue();
         }
 
-        private void CleanupSetStatus(AvaloniaProperty property)
-        {
-            if (SetRecords.TryGetValue(property, out var status) && status.IsSimpleSet)
-            {
-                SetRecords.Remove(property);
-            }
-        }
-
         public delegate bool SetterDelegate<TValue>(TSetRecord record, ref TValue backing, Action<Action> notifyCallback);
 
         /// <summary>
@@ -169,8 +159,6 @@ namespace Avalonia.Utilities
                     });
                 }
 
-                CleanupSetStatus(property);
-
                 return updated;
             }
             else if(!object.Equals(value, backing))
diff --git a/src/Avalonia.Base/Utilities/SingleOrQueue.cs b/src/Avalonia.Base/Utilities/SingleOrQueue.cs
index 04c1279148..4a66b72a56 100644
--- a/src/Avalonia.Base/Utilities/SingleOrQueue.cs
+++ b/src/Avalonia.Base/Utilities/SingleOrQueue.cs
@@ -15,10 +15,7 @@ namespace Avalonia.Utilities
 
         private Queue<T> Tail => _tail ?? (_tail = new Queue<T>());
 
-        /// <summary>
-        /// True if this queue has at some point had more than one element.
-        /// </summary>
-        public bool HasTail => _tail != null;
+        private bool HasTail => _tail != null;
 
         public bool Empty { get; private set; } = true;