From 19bae967d30a00d2767921b1842087321dae624b Mon Sep 17 00:00:00 2001
From: jgcodes2020 <jackyguo18@hotmail.com>
Date: Sun, 9 Jul 2023 18:09:48 -0400
Subject: [PATCH] Rename ImportCompeted into ImportCompleted

---
 .../Composition/CompositionExternalMemory.cs          | 11 +++++++++--
 .../Rendering/Composition/CompositionInterop.cs       |  6 +++---
 .../Server/ServerCompositionDrawingSurface.cs         |  6 +++---
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/Avalonia.Base/Rendering/Composition/CompositionExternalMemory.cs b/src/Avalonia.Base/Rendering/Composition/CompositionExternalMemory.cs
index ce728f86a2..476e15c47f 100644
--- a/src/Avalonia.Base/Rendering/Composition/CompositionExternalMemory.cs
+++ b/src/Avalonia.Base/Rendering/Composition/CompositionExternalMemory.cs
@@ -84,14 +84,21 @@ public enum CompositionGpuImportedImageSynchronizationCapabilities
 /// <summary>
 /// An imported GPU object that's usable by composition APIs 
 /// </summary>
+[NotClientImplementable]
 public interface ICompositionGpuImportedObject : IAsyncDisposable
 {
     /// <summary>
     /// Tracks the import status of the object. Once the task is completed,
     /// the user code is allowed to free the resource owner in case when a non-owning
-    /// sharing handle was used
+    /// sharing handle was used.
     /// </summary>
-    Task ImportCompeted { get; }
+    Task ImportCompleted { get; }
+    
+    /// <inheritdoc cref="ImportCompleted"/>
+    /// <seealso cref="ImportCompleted">ImportCompleted (recommended replacement)</seealso>
+    [Obsolete("Please use ICompositionGpuImportedObject.ImportCompleted instead")]
+    Task ImportCompeted => ImportCompleted;
+    
     /// <summary>
     /// Indicates if the device context this instance is associated with is no longer available
     /// </summary>
diff --git a/src/Avalonia.Base/Rendering/Composition/CompositionInterop.cs b/src/Avalonia.Base/Rendering/Composition/CompositionInterop.cs
index 1643ec6e8d..9eea228e84 100644
--- a/src/Avalonia.Base/Rendering/Composition/CompositionInterop.cs
+++ b/src/Avalonia.Base/Rendering/Composition/CompositionInterop.cs
@@ -67,18 +67,18 @@ abstract class CompositionGpuImportedObjectBase : ICompositionGpuImportedObject
         Context = context;
         Feature = feature;
         
-        ImportCompeted = Compositor.InvokeServerJobAsync(Import);
+        ImportCompleted = Compositor.InvokeServerJobAsync(Import);
     }
     
     protected abstract void Import();
     public abstract void Dispose();
 
-    public Task ImportCompeted { get; }
+    public Task ImportCompleted { get; }
     public bool IsLost => Context.IsLost;
 
     public ValueTask DisposeAsync() => new(Compositor.InvokeServerJobAsync(() =>
     {
-        if (ImportCompeted.Status == TaskStatus.RanToCompletion)
+        if (ImportCompleted.Status == TaskStatus.RanToCompletion)
             Dispose();
     }));
 }
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionDrawingSurface.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionDrawingSurface.cs
index da24b3812a..f58403f0bc 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionDrawingSurface.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionDrawingSurface.cs
@@ -31,12 +31,12 @@ internal class ServerCompositionDrawingSurface : ServerCompositionSurface, IDisp
             throw new PlatformGraphicsContextLostException();
 
         // This should never happen, but check for it anyway to avoid a deadlock
-        if (!image.ImportCompeted.IsCompleted)
+        if (!image.ImportCompleted.IsCompleted)
             throw new InvalidOperationException("The import operation is not completed yet");
 
         // Rethrow the import here exception
-        if (image.ImportCompeted.IsFaulted)
-            image.ImportCompeted.GetAwaiter().GetResult();
+        if (image.ImportCompleted.IsFaulted)
+            image.ImportCompleted.GetAwaiter().GetResult();
     }
 
     void Update(IBitmapImpl newImage, IPlatformRenderInterfaceContext context)