From f3cb243de5dfeef3b73ff979a4bb34a4059470e4 Mon Sep 17 00:00:00 2001 From: Max Katz Date: Mon, 29 May 2023 17:49:38 -0400 Subject: [PATCH] Fix android/ios --- src/Android/Avalonia.Android/AndroidPlatform.cs | 6 +----- src/Avalonia.Base/Rendering/Composition/Compositor.cs | 8 +++----- src/iOS/Avalonia.iOS/Platform.cs | 6 +----- 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/src/Android/Avalonia.Android/AndroidPlatform.cs b/src/Android/Avalonia.Android/AndroidPlatform.cs index 2e22386ef8..d5d5f211e9 100644 --- a/src/Android/Avalonia.Android/AndroidPlatform.cs +++ b/src/Android/Avalonia.Android/AndroidPlatform.cs @@ -52,11 +52,7 @@ namespace Avalonia.Android EglPlatformGraphics.TryInitialize(); } - Compositor = new Compositor( - AvaloniaLocator.Current.GetRequiredService(), - AvaloniaLocator.Current.GetService()); - - + Compositor = new Compositor(AvaloniaLocator.Current.GetService()); } } diff --git a/src/Avalonia.Base/Rendering/Composition/Compositor.cs b/src/Avalonia.Base/Rendering/Composition/Compositor.cs index 0a4b7be15e..dde9dcd6fb 100644 --- a/src/Avalonia.Base/Rendering/Composition/Compositor.cs +++ b/src/Avalonia.Base/Rendering/Composition/Compositor.cs @@ -66,16 +66,14 @@ namespace Avalonia.Rendering.Composition /// Creates a new compositor on a specified render loop that would use a particular GPU /// [PrivateApi] - public Compositor(IPlatformGraphics? gpu, bool useUiThreadForSynchronousCommits = false) + public Compositor(IPlatformGraphics? gpu, bool useUiThreadForSynchronousCommits = false) : this(RenderLoop.LocatorAutoInstance, gpu, useUiThreadForSynchronousCommits) { - } - - internal Compositor(IRenderLoop loop, IPlatformGraphics? gpu, bool useUiThreadForSynchronousCommits = false) + + internal Compositor(IRenderLoop loop, IPlatformGraphics? gpu, bool useUiThreadForSynchronousCommits = false) : this(loop, gpu, useUiThreadForSynchronousCommits, MediaContext.Instance, false) { - } internal Compositor(IRenderLoop loop, IPlatformGraphics? gpu, diff --git a/src/iOS/Avalonia.iOS/Platform.cs b/src/iOS/Avalonia.iOS/Platform.cs index 918c0caaa2..de664c93e0 100644 --- a/src/iOS/Avalonia.iOS/Platform.cs +++ b/src/iOS/Avalonia.iOS/Platform.cs @@ -47,12 +47,8 @@ namespace Avalonia.iOS .Bind().ToConstant(DispatcherImpl.Instance) .Bind().ToConstant(keyboard); - Compositor = new Compositor( - AvaloniaLocator.Current.GetRequiredService(), - AvaloniaLocator.Current.GetService()); + Compositor = new Compositor(AvaloniaLocator.Current.GetService()); } - - } }