dotnet
diff --git a/‎src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/PresentationSource.cs
Lines changed: 5 additions & 10 deletions b/‎src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/PresentationSource.cs
Lines changed: 5 additions & 10 deletions
diff --git a/‎src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/Primitives/DataGridDetailsPresenter.cs
Lines changed: 1 addition & 1 deletion b/‎src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/Primitives/DataGridDetailsPresenter.cs
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/ScrollViewer.cs
Lines changed: 1 addition & 1 deletion b/‎src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/ScrollViewer.cs
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Window.cs
Lines changed: 1 addition & 1 deletion b/‎src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Window.cs
Lines changed: 1 addition & 1 deletion
@@ -598,25 +598,20 @@ internal static object FireContentRendered(object arg)
         ///     Helper method which returns true when all the given visuals 
         ///     are in the same presentation source.
         /// </summary>
-        [FriendAccessAllowed] // To allow internal code paths to access this function 
-        internal static bool UnderSamePresentationSource(params DependencyObject[] visuals)
+        internal static bool IsUnderSamePresentationSource(params ReadOnlySpan<DependencyObject> visuals)
         {
-            if (visuals == null || visuals.Length == 0)
-            {
+            if (visuals.IsEmpty)
                 return true;
-            }
 
             PresentationSource baseSource = CriticalFromVisual(visuals[0]);
-
-            int count = visuals.Length;
-            for (int i = 1; i < count; i++)
+            for (int i = 1; i < visuals.Length; i++)
             {
-                PresentationSource currentSource = CriticalFromVisual(visuals[i]);
-                if (currentSource != baseSource)
+                if (baseSource != CriticalFromVisual(visuals[i]))
                 {
                     return false;
                 }
             }
+
             return true;
         }
 
 
@@ -109,7 +109,7 @@ private static void OnAnyMouseLeftButtonDownThunk(object sender, MouseButtonEven
         private void OnAnyMouseLeftButtonDown(System.Windows.Input.MouseButtonEventArgs e)
         {
             // Ignore actions if the button down arises from a different presentation source
-            if (!PresentationSource.UnderSamePresentationSource(e.OriginalSource as DependencyObject, this))
+            if (!PresentationSource.IsUnderSamePresentationSource(e.OriginalSource as DependencyObject, this))
             {
                 return;
             }
 
@@ -1654,7 +1654,7 @@ private bool ShouldManipulateScroll(ManipulationStartingEventArgs e, ScrollConte
         {
             // If the original source is not from the same PresentationSource as of ScrollViewer,
             // then do not start the manipulation.
-            if (!PresentationSource.UnderSamePresentationSource(e.OriginalSource as DependencyObject, this))
+            if (!PresentationSource.IsUnderSamePresentationSource(e.OriginalSource as DependencyObject, this))
             {
                 return false;
             }
 
@@ -7053,7 +7053,7 @@ protected override void OnManipulationBoundaryFeedback(ManipulationBoundaryFeedb
 
             // If the original source is not from the same PresentationSource as of the Window,
             // then do not act on the PanningFeedback.
-            if (!PresentationSource.UnderSamePresentationSource(e.OriginalSource as DependencyObject, this))
+            if (!PresentationSource.IsUnderSamePresentationSource(e.OriginalSource as DependencyObject, this))
             {
                 return;
             }
Original file line number	Diff line number	Diff line change
`@@ -598,25 +598,20 @@ internal static object FireContentRendered(object arg)`
`598`	`598`	`/// Helper method which returns true when all the given visuals`
`599`	`599`	`/// are in the same presentation source.`
`600`	`600`	`/// </summary>`
`601`		`- [FriendAccessAllowed] // To allow internal code paths to access this function`
`602`		`- internal static bool UnderSamePresentationSource(params DependencyObject[] visuals)`
	`601`	`+ internal static bool IsUnderSamePresentationSource(params ReadOnlySpan<DependencyObject> visuals)`
`603`	`602`	`{`
`604`		`- if (visuals == null \|\| visuals.Length == 0)`
`605`		`- {`
	`603`	`+ if (visuals.IsEmpty)`
`606`	`604`	`return true;`
`607`		`- }`
`608`	`605`
`609`	`606`	`PresentationSource baseSource = CriticalFromVisual(visuals[0]);`
`610`		`-`
`611`		`- int count = visuals.Length;`
`612`		`- for (int i = 1; i < count; i++)`
	`607`	`+ for (int i = 1; i < visuals.Length; i++)`
`613`	`608`	`{`
`614`		`- PresentationSource currentSource = CriticalFromVisual(visuals[i]);`
`615`		`- if (currentSource != baseSource)`
	`609`	`+ if (baseSource != CriticalFromVisual(visuals[i]))`
`616`	`610`	`{`
`617`	`611`	`return false;`
`618`	`612`	`}`
`619`	`613`	`}`
	`614`	`+`
`620`	`615`	`return true;`
`621`	`616`	`}`
`622`	`617`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ private static void OnAnyMouseLeftButtonDownThunk(object sender, MouseButtonEven`
`109`	`109`	`private void OnAnyMouseLeftButtonDown(System.Windows.Input.MouseButtonEventArgs e)`
`110`	`110`	`{`
`111`	`111`	`// Ignore actions if the button down arises from a different presentation source`
`112`		`- if (!PresentationSource.UnderSamePresentationSource(e.OriginalSource as DependencyObject, this))`
	`112`	`+ if (!PresentationSource.IsUnderSamePresentationSource(e.OriginalSource as DependencyObject, this))`
`113`	`113`	`{`
`114`	`114`	`return;`
`115`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1654,7 +1654,7 @@ private bool ShouldManipulateScroll(ManipulationStartingEventArgs e, ScrollConte`
`1654`	`1654`	`{`
`1655`	`1655`	`// If the original source is not from the same PresentationSource as of ScrollViewer,`
`1656`	`1656`	`// then do not start the manipulation.`
`1657`		`- if (!PresentationSource.UnderSamePresentationSource(e.OriginalSource as DependencyObject, this))`
	`1657`	`+ if (!PresentationSource.IsUnderSamePresentationSource(e.OriginalSource as DependencyObject, this))`
`1658`	`1658`	`{`
`1659`	`1659`	`return false;`
`1660`	`1660`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7053,7 +7053,7 @@ protected override void OnManipulationBoundaryFeedback(ManipulationBoundaryFeedb`
`7053`	`7053`
`7054`	`7054`	`// If the original source is not from the same PresentationSource as of the Window,`
`7055`	`7055`	`// then do not act on the PanningFeedback.`
`7056`		`- if (!PresentationSource.UnderSamePresentationSource(e.OriginalSource as DependencyObject, this))`
	`7056`	`+ if (!PresentationSource.IsUnderSamePresentationSource(e.OriginalSource as DependencyObject, this))`
`7057`	`7057`	`{`
`7058`	`7058`	`return;`
`7059`	`7059`	`}`