Skip to content

Commit 2bd607b

Browse files
committed
fix: Fix possible non disposed tracing.
1 parent 270bf34 commit 2bd607b

File tree

1 file changed

+10
-16
lines changed

1 file changed

+10
-16
lines changed

src/Uno.UI/UI/Xaml/Controls/Layouter/Layouter.cs

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,13 @@ protected Layouter(IFrameworkElement element)
7777
/// <returns>The size of the panel, in logical pixel.</returns>
7878
public Size Measure(Size availableSize)
7979
{
80-
IDisposable traceActivity = null;
81-
if (_trace.IsEnabled)
82-
{
83-
traceActivity = _trace.WriteEventActivity(
80+
using var traceActivity = _trace.IsEnabled
81+
? _trace.WriteEventActivity(
8482
FrameworkElement.TraceProvider.FrameworkElement_MeasureStart,
8583
FrameworkElement.TraceProvider.FrameworkElement_MeasureStop,
86-
new object[] { LoggingOwnerTypeName, Panel.GetDependencyObjectId() }
87-
);
88-
}
84+
new object[] {LoggingOwnerTypeName, Panel.GetDependencyObjectId()}
85+
)
86+
: null;
8987

9088
if (Panel.Visibility == Visibility.Collapsed)
9189
{
@@ -154,7 +152,6 @@ public Size Measure(Size availableSize)
154152
{
155153
UIElement.IsLayoutingVisualTreeRoot = false;
156154
}
157-
traceActivity?.Dispose();
158155
}
159156
}
160157

@@ -178,15 +175,13 @@ public void Arrange(Rect finalRect)
178175
{
179176
LayoutInformation.SetLayoutSlot(Panel, finalRect);
180177

181-
IDisposable traceActivity = null;
182-
if (_trace.IsEnabled)
183-
{
184-
traceActivity = _trace.WriteEventActivity(
178+
using var traceActivity = _trace.IsEnabled
179+
? _trace.WriteEventActivity(
185180
FrameworkElement.TraceProvider.FrameworkElement_ArrangeStart,
186181
FrameworkElement.TraceProvider.FrameworkElement_ArrangeStop,
187-
new object[] { LoggingOwnerTypeName, Panel.GetDependencyObjectId() }
188-
);
189-
}
182+
new object[] {LoggingOwnerTypeName, Panel.GetDependencyObjectId()}
183+
)
184+
: null;
190185

191186
try
192187
{
@@ -288,7 +283,6 @@ public void Arrange(Rect finalRect)
288283
{
289284
UIElement.IsLayoutingVisualTreeRoot = false;
290285
}
291-
traceActivity?.Dispose();
292286
}
293287
}
294288

0 commit comments

Comments
 (0)