Update WeakReferences to use WinRT.WeakReference.

azchohfi · azchohfi · commit 2c7b325fc740 · 2020-07-15T12:35:23.000-07:00
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/CompositionAnimations/AnimationCollection.cs b/Microsoft.Toolkit.Uwp.UI.Animations/CompositionAnimations/AnimationCollection.cs
@@ -21,7 +21,7 @@ public class AnimationCollection : IList<AnimationBase>
 
         // needed in order to be able to update animations when a animations are added/removed or
         // animation properties change (for example in binding)
-        private WeakReference<UIElement> _parent;
+        private WinRT.WeakReference<UIElement> _parent;
 
         internal UIElement Parent
         {
@@ -31,7 +31,7 @@ internal UIElement Parent
                 return element;
             }
 
-            set => _parent = new WeakReference<UIElement>(value);
+            set => _parent = new WinRT.WeakReference<UIElement>(value);
         }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Utilities/WeakEventListener.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Utilities/WeakEventListener.cs
@@ -22,7 +22,7 @@ internal sealed class WeakEventListener<TInstance, TSource, TEventArgs>
         /// <summary>
         /// WeakReference to the instance listening for the event.
         /// </summary>
-        private WeakReference weakInstance;
+        private WinRT.WeakReference<TInstance> weakInstance;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="WeakEventListener{TInstance, TSource, TEventArgs}"/> class.
@@ -35,7 +35,7 @@ public WeakEventListener(TInstance instance)
                 throw new ArgumentNullException(nameof(instance));
             }
 
-            weakInstance = new WeakReference(instance);
+            weakInstance = new WinRT.WeakReference<TInstance>(instance);
         }
 
         /// <summary>
@@ -55,8 +55,7 @@ public WeakEventListener(TInstance instance)
         /// <param name="eventArgs">Event arguments.</param>
         public void OnEvent(TSource source, TEventArgs eventArgs)
         {
-            TInstance target = (TInstance)weakInstance.Target;
-            if (target != null)
+            if (weakInstance.TryGetTarget(out var target))
             {
                 // Call registered action
                 OnEventAction?.Invoke(target, source, eventArgs);
diff --git a/Microsoft.Toolkit.Uwp.UI.Media/Helpers/Cache/CompositionObjectCache{TKey,TValue}.cs b/Microsoft.Toolkit.Uwp.UI.Media/Helpers/Cache/CompositionObjectCache{TKey,TValue}.cs
@@ -20,7 +20,7 @@ internal sealed class CompositionObjectCache<TKey, TValue>
         /// <summary>
         /// The cache of weak references of type <typeparamref name="TValue"/> to <typeparamref name="TKey"/> instances, to avoid memory leaks
         /// </summary>
-        private readonly ConditionalWeakTable<Compositor, Dictionary<TKey, WeakReference<TValue>>> cache = new ConditionalWeakTable<Compositor, Dictionary<TKey, WeakReference<TValue>>>();
+        private readonly ConditionalWeakTable<Compositor, Dictionary<TKey, WinRT.WeakReference<TValue>>> cache = new ConditionalWeakTable<Compositor, Dictionary<TKey, WinRT.WeakReference<TValue>>>();
 
         /// <summary>
         /// Tries to retrieve a valid instance from the cache, and uses the provided factory if an existing item is not found
@@ -59,11 +59,11 @@ public void AddOrUpdate(Compositor compositor, TKey key, TValue value)
                 {
                     _ = map.Remove(key);
 
-                    map.Add(key, new WeakReference<TValue>(value));
+                    map.Add(key, new WinRT.WeakReference<TValue>(value));
                 }
                 else
                 {
-                    map = new Dictionary<TKey, WeakReference<TValue>> { [key] = new WeakReference<TValue>(value) };
+                    map = new Dictionary<TKey, WinRT.WeakReference<TValue>> { [key] = new WinRT.WeakReference<TValue>(value) };
 
                     this.cache.Add(compositor, map);
                 }
diff --git a/Microsoft.Toolkit.Uwp.UI.Media/Helpers/Cache/CompositionObjectCache{T}.cs b/Microsoft.Toolkit.Uwp.UI.Media/Helpers/Cache/CompositionObjectCache{T}.cs
@@ -18,7 +18,7 @@ internal sealed class CompositionObjectCache<T>
         /// <summary>
         /// The cache of weak references of type <typeparamref name="T"/>, to avoid memory leaks
         /// </summary>
-        private readonly ConditionalWeakTable<Compositor, WeakReference<T>> cache = new ConditionalWeakTable<Compositor, WeakReference<T>>();
+        private readonly ConditionalWeakTable<Compositor, WinRT.WeakReference<T>> cache = new ConditionalWeakTable<Compositor, WinRT.WeakReference<T>>();
 
         /// <summary>
         /// Tries to retrieve a valid <typeparamref name="T"/> instance from the cache, and uses the provided factory if an existing item is not found
@@ -38,7 +38,7 @@ public T GetValue(Compositor compositor, Func<Compositor, T> producer)
 
                 // Create a new instance when needed
                 var fallback = producer(compositor);
-                this.cache.AddOrUpdate(compositor, new WeakReference<T>(fallback));
+                this.cache.AddOrUpdate(compositor, new WinRT.WeakReference<T>(fallback));
 
                 return fallback;
             }
diff --git a/Microsoft.Toolkit.Uwp.UI/Triggers/NetworkConnectionStateTrigger.cs b/Microsoft.Toolkit.Uwp.UI/Triggers/NetworkConnectionStateTrigger.cs
@@ -72,7 +72,7 @@ private class WeakEventListener<TInstance, TSource>
             /// <summary>
             /// WeakReference to the instance listening for the event.
             /// </summary>
-            private WeakReference _weakInstance;
+            private WinRT.WeakReference<TInstance> _weakInstance;
 
             /// <summary>
             /// Gets or sets the method to call when the event fires.
@@ -95,7 +95,7 @@ public WeakEventListener(TInstance instance)
                     throw new ArgumentNullException("instance");
                 }
 
-                _weakInstance = new WeakReference(instance);
+                _weakInstance = new WinRT.WeakReference<TInstance>(instance);
             }
 
             /// <summary>
@@ -104,8 +104,7 @@ public WeakEventListener(TInstance instance)
             /// <param name="source">Event source.</param>
             public void OnEvent(TSource source)
             {
-                TInstance target = (TInstance)_weakInstance.Target;
-                if (target != null)
+                if (_weakInstance.TryGetTarget(out var target))
                 {
                     // Call registered action
                     OnEventAction?.Invoke(target, source);
diff --git a/Microsoft.Toolkit.Uwp/Helpers/WeakEventListener.cs b/Microsoft.Toolkit.Uwp/Helpers/WeakEventListener.cs
@@ -20,7 +20,7 @@ public sealed class WeakEventListener<TInstance, TSource, TEventArgs>
         /// <summary>
         /// WeakReference to the instance listening for the event.
         /// </summary>
-        private readonly WeakReference _weakInstance;
+        private readonly WinRT.WeakReference<TInstance> _weakInstance;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="WeakEventListener{TInstance, TSource, TEventArgs}"/> class.
@@ -33,7 +33,7 @@ public WeakEventListener(TInstance instance)
                 throw new ArgumentNullException(nameof(instance));
             }
 
-            _weakInstance = new WeakReference(instance);
+            _weakInstance = new WinRT.WeakReference<TInstance>(instance);
         }
 
         /// <summary>
@@ -53,8 +53,7 @@ public WeakEventListener(TInstance instance)
         /// <param name="eventArgs">Event arguments.</param>
         public void OnEvent(TSource source, TEventArgs eventArgs)
         {
-            var target = (TInstance)_weakInstance.Target;
-            if (target != null)
+            if (_weakInstance.TryGetTarget(out var target))
             {
                 // Call registered action
                 OnEventAction?.Invoke(target, source, eventArgs);

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public class AnimationCollection : IList<AnimationBase>`
`21`	`21`
`22`	`22`	`// needed in order to be able to update animations when a animations are added/removed or`
`23`	`23`	`// animation properties change (for example in binding)`
`24`		`- private WeakReference<UIElement> _parent;`
	`24`	`+ private WinRT.WeakReference<UIElement> _parent;`
`25`	`25`
`26`	`26`	`internal UIElement Parent`
`27`	`27`	`{`
`@@ -31,7 +31,7 @@ internal UIElement Parent`
`31`	`31`	`return element;`
`32`	`32`	`}`
`33`	`33`
`34`		`- set => _parent = new WeakReference<UIElement>(value);`
	`34`	`+ set => _parent = new WinRT.WeakReference<UIElement>(value);`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ internal sealed class WeakEventListener<TInstance, TSource, TEventArgs>`
`22`	`22`	`/// <summary>`
`23`	`23`	`/// WeakReference to the instance listening for the event.`
`24`	`24`	`/// </summary>`
`25`		`- private WeakReference weakInstance;`
	`25`	`+ private WinRT.WeakReference<TInstance> weakInstance;`
`26`	`26`
`27`	`27`	`/// <summary>`
`28`	`28`	`/// Initializes a new instance of the <see cref="WeakEventListener{TInstance, TSource, TEventArgs}"/> class.`
`@@ -35,7 +35,7 @@ public WeakEventListener(TInstance instance)`
`35`	`35`	`throw new ArgumentNullException(nameof(instance));`
`36`	`36`	`}`
`37`	`37`
`38`		`- weakInstance = new WeakReference(instance);`
	`38`	`+ weakInstance = new WinRT.WeakReference<TInstance>(instance);`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`/// <summary>`
`@@ -55,8 +55,7 @@ public WeakEventListener(TInstance instance)`
`55`	`55`	`/// <param name="eventArgs">Event arguments.</param>`
`56`	`56`	`public void OnEvent(TSource source, TEventArgs eventArgs)`
`57`	`57`	`{`
`58`		`- TInstance target = (TInstance)weakInstance.Target;`
`59`		`- if (target != null)`
	`58`	`+ if (weakInstance.TryGetTarget(out var target))`
`60`	`59`	`{`
`61`	`60`	`// Call registered action`
`62`	`61`	`OnEventAction?.Invoke(target, source, eventArgs);`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ internal sealed class CompositionObjectCache<TKey, TValue>`
`20`	`20`	`/// <summary>`
`21`	`21`	`/// The cache of weak references of type <typeparamref name="TValue"/> to <typeparamref name="TKey"/> instances, to avoid memory leaks`
`22`	`22`	`/// </summary>`
`23`		`- private readonly ConditionalWeakTable<Compositor, Dictionary<TKey, WeakReference<TValue>>> cache = new ConditionalWeakTable<Compositor, Dictionary<TKey, WeakReference<TValue>>>();`
	`23`	`+ private readonly ConditionalWeakTable<Compositor, Dictionary<TKey, WinRT.WeakReference<TValue>>> cache = new ConditionalWeakTable<Compositor, Dictionary<TKey, WinRT.WeakReference<TValue>>>();`
`24`	`24`
`25`	`25`	`/// <summary>`
`26`	`26`	`/// Tries to retrieve a valid instance from the cache, and uses the provided factory if an existing item is not found`
`@@ -59,11 +59,11 @@ public void AddOrUpdate(Compositor compositor, TKey key, TValue value)`
`59`	`59`	`{`
`60`	`60`	`_ = map.Remove(key);`
`61`	`61`
`62`		`- map.Add(key, new WeakReference<TValue>(value));`
	`62`	`+ map.Add(key, new WinRT.WeakReference<TValue>(value));`
`63`	`63`	`}`
`64`	`64`	`else`
`65`	`65`	`{`
`66`		`- map = new Dictionary<TKey, WeakReference<TValue>> { [key] = new WeakReference<TValue>(value) };`
	`66`	`+ map = new Dictionary<TKey, WinRT.WeakReference<TValue>> { [key] = new WinRT.WeakReference<TValue>(value) };`
`67`	`67`
`68`	`68`	`this.cache.Add(compositor, map);`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ private class WeakEventListener<TInstance, TSource>`
`72`	`72`	`/// <summary>`
`73`	`73`	`/// WeakReference to the instance listening for the event.`
`74`	`74`	`/// </summary>`
`75`		`- private WeakReference _weakInstance;`
	`75`	`+ private WinRT.WeakReference<TInstance> _weakInstance;`
`76`	`76`
`77`	`77`	`/// <summary>`
`78`	`78`	`/// Gets or sets the method to call when the event fires.`
`@@ -95,7 +95,7 @@ public WeakEventListener(TInstance instance)`
`95`	`95`	`throw new ArgumentNullException("instance");`
`96`	`96`	`}`
`97`	`97`
`98`		`- _weakInstance = new WeakReference(instance);`
	`98`	`+ _weakInstance = new WinRT.WeakReference<TInstance>(instance);`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`/// <summary>`
`@@ -104,8 +104,7 @@ public WeakEventListener(TInstance instance)`
`104`	`104`	`/// <param name="source">Event source.</param>`
`105`	`105`	`public void OnEvent(TSource source)`
`106`	`106`	`{`
`107`		`- TInstance target = (TInstance)_weakInstance.Target;`
`108`		`- if (target != null)`
	`107`	`+ if (_weakInstance.TryGetTarget(out var target))`
`109`	`108`	`{`
`110`	`109`	`// Call registered action`
`111`	`110`	`OnEventAction?.Invoke(target, source);`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public sealed class WeakEventListener<TInstance, TSource, TEventArgs>`
`20`	`20`	`/// <summary>`
`21`	`21`	`/// WeakReference to the instance listening for the event.`
`22`	`22`	`/// </summary>`
`23`		`- private readonly WeakReference _weakInstance;`
	`23`	`+ private readonly WinRT.WeakReference<TInstance> _weakInstance;`
`24`	`24`
`25`	`25`	`/// <summary>`
`26`	`26`	`/// Initializes a new instance of the <see cref="WeakEventListener{TInstance, TSource, TEventArgs}"/> class.`
`@@ -33,7 +33,7 @@ public WeakEventListener(TInstance instance)`
`33`	`33`	`throw new ArgumentNullException(nameof(instance));`
`34`	`34`	`}`
`35`	`35`
`36`		`- _weakInstance = new WeakReference(instance);`
	`36`	`+ _weakInstance = new WinRT.WeakReference<TInstance>(instance);`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`/// <summary>`
`@@ -53,8 +53,7 @@ public WeakEventListener(TInstance instance)`
`53`	`53`	`/// <param name="eventArgs">Event arguments.</param>`
`54`	`54`	`public void OnEvent(TSource source, TEventArgs eventArgs)`
`55`	`55`	`{`
`56`		`- var target = (TInstance)_weakInstance.Target;`
`57`		`- if (target != null)`
	`56`	`+ if (_weakInstance.TryGetTarget(out var target))`
`58`	`57`	`{`
`59`	`58`	`// Call registered action`
`60`	`59`	`OnEventAction?.Invoke(target, source, eventArgs);`