Browse Source

Revert "Fix ImportCompleted spelling"

pull/12095/head
Max Katz 3 years ago
committed by GitHub
parent
commit
d4b5085ba3
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      src/Avalonia.Base/Rendering/Composition/CompositionExternalMemory.cs
  2. 6
      src/Avalonia.Base/Rendering/Composition/CompositionInterop.cs
  3. 6
      src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionDrawingSurface.cs

3
src/Avalonia.Base/Rendering/Composition/CompositionExternalMemory.cs

@ -91,8 +91,7 @@ public interface ICompositionGpuImportedObject : IAsyncDisposable
/// the user code is allowed to free the resource owner in case when a non-owning /// 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> /// </summary>
Task ImportCompleted { get; } Task ImportCompeted { get; }
/// <summary> /// <summary>
/// Indicates if the device context this instance is associated with is no longer available /// Indicates if the device context this instance is associated with is no longer available
/// </summary> /// </summary>

6
src/Avalonia.Base/Rendering/Composition/CompositionInterop.cs

@ -67,18 +67,18 @@ abstract class CompositionGpuImportedObjectBase : ICompositionGpuImportedObject
Context = context; Context = context;
Feature = feature; Feature = feature;
ImportCompleted = Compositor.InvokeServerJobAsync(Import); ImportCompeted = Compositor.InvokeServerJobAsync(Import);
} }
protected abstract void Import(); protected abstract void Import();
public abstract void Dispose(); public abstract void Dispose();
public Task ImportCompleted { get; } public Task ImportCompeted { get; }
public bool IsLost => Context.IsLost; public bool IsLost => Context.IsLost;
public ValueTask DisposeAsync() => new(Compositor.InvokeServerJobAsync(() => public ValueTask DisposeAsync() => new(Compositor.InvokeServerJobAsync(() =>
{ {
if (ImportCompleted.Status == TaskStatus.RanToCompletion) if (ImportCompeted.Status == TaskStatus.RanToCompletion)
Dispose(); Dispose();
})); }));
} }

6
src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionDrawingSurface.cs

@ -31,12 +31,12 @@ internal class ServerCompositionDrawingSurface : ServerCompositionSurface, IDisp
throw new PlatformGraphicsContextLostException(); throw new PlatformGraphicsContextLostException();
// This should never happen, but check for it anyway to avoid a deadlock // This should never happen, but check for it anyway to avoid a deadlock
if (!image.ImportCompleted.IsCompleted) if (!image.ImportCompeted.IsCompleted)
throw new InvalidOperationException("The import operation is not completed yet"); throw new InvalidOperationException("The import operation is not completed yet");
// Rethrow the import here exception // Rethrow the import here exception
if (image.ImportCompleted.IsFaulted) if (image.ImportCompeted.IsFaulted)
image.ImportCompleted.GetAwaiter().GetResult(); image.ImportCompeted.GetAwaiter().GetResult();
} }
void Update(IBitmapImpl newImage, IPlatformRenderInterfaceContext context) void Update(IBitmapImpl newImage, IPlatformRenderInterfaceContext context)

Loading…
Cancel
Save