fix: Fix possible non disposed tracing.

unoplatform · Feb 3, 2021 · 2bd607b · 2bd607b
1 parent 270bf34
commit 2bd607b
Showing 1 changed file with 10 additions and 16 deletions.
diff --git a/src/Uno.UI/UI/Xaml/Controls/Layouter/Layouter.cs b/src/Uno.UI/UI/Xaml/Controls/Layouter/Layouter.cs
@@ -77,15 +77,13 @@ protected Layouter(IFrameworkElement element)
 		/// <returns>The size of the panel, in logical pixel.</returns>
 		public Size Measure(Size availableSize)
 		{
-			IDisposable traceActivity = null;
-			if (_trace.IsEnabled)
-			{
-				traceActivity = _trace.WriteEventActivity(
+			using var traceActivity = _trace.IsEnabled
+				? _trace.WriteEventActivity(
 					FrameworkElement.TraceProvider.FrameworkElement_MeasureStart,
 					FrameworkElement.TraceProvider.FrameworkElement_MeasureStop,
-					new object[] { LoggingOwnerTypeName, Panel.GetDependencyObjectId() }
-				);
-			}
+					new object[] {LoggingOwnerTypeName, Panel.GetDependencyObjectId()}
+				)
+				: null;
 
 			if (Panel.Visibility == Visibility.Collapsed)
 			{
@@ -154,7 +152,6 @@ public Size Measure(Size availableSize)
 				{
 					UIElement.IsLayoutingVisualTreeRoot = false;
 				}
-				traceActivity?.Dispose();
 			}
 		}
 
@@ -178,15 +175,13 @@ public void Arrange(Rect finalRect)
 		{
 			LayoutInformation.SetLayoutSlot(Panel, finalRect);
 
-			IDisposable traceActivity = null;
-			if (_trace.IsEnabled)
-			{
-				traceActivity = _trace.WriteEventActivity(
+			using var traceActivity = _trace.IsEnabled
+				? _trace.WriteEventActivity(
 					FrameworkElement.TraceProvider.FrameworkElement_ArrangeStart,
 					FrameworkElement.TraceProvider.FrameworkElement_ArrangeStop,
-					new object[] { LoggingOwnerTypeName, Panel.GetDependencyObjectId() }
-				);
-			}
+					new object[] {LoggingOwnerTypeName, Panel.GetDependencyObjectId()}
+				)
+				: null;
 
 			try
 			{
@@ -288,7 +283,6 @@ public void Arrange(Rect finalRect)
 				{
 					UIElement.IsLayoutingVisualTreeRoot = false;
 				}
-				traceActivity?.Dispose();
 			}
 		}