Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make ImageSource more async-friendly #22098

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Make ImageSource more async-friendly #22098

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 15 additions & 5 deletions src/Controls/src/Core/ImageSource.cs
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@ namespace Microsoft.Maui.Controls
[System.ComponentModel.TypeConverter(typeof(ImageSourceConverter))]
public abstract partial class ImageSource : Element
{
readonly object _synchandle = new object();
readonly SemaphoreSlim _cancellationTokenSourceLock = new(1, 1);
CancellationTokenSource _cancellationTokenSource;

TaskCompletionSource<bool> _completionSource;
Expand Down Expand Up @@ -118,7 +118,7 @@ public static ImageSource FromUri(Uri uri)
return FromUri(uri);
}

private protected void OnLoadingCompleted(bool cancelled)
private protected async Task OnLoadingCompleted(bool cancelled)
{
if (!IsLoading || _completionSource == null)
return;
Expand All @@ -127,18 +127,28 @@ private protected void OnLoadingCompleted(bool cancelled)
if (tcs != null)
tcs.SetResult(cancelled);

lock (_synchandle)
await _cancellationTokenSourceLock.WaitAsync();
try
{
CancellationTokenSource = null;
}
finally
{
_cancellationTokenSourceLock.Release();
}
}

private protected void OnLoadingStarted()
private protected async Task OnLoadingStarted()
{
lock (_synchandle)
await _cancellationTokenSourceLock.WaitAsync();
try
{
CancellationTokenSource = new CancellationTokenSource();
}
finally
{
_cancellationTokenSourceLock.Release();
}
}

protected void OnSourceChanged()
Expand Down
6 changes: 3 additions & 3 deletions src/Controls/src/Core/StreamImageSource.cs
View file
Open in desktop
Expand Up @@ -35,17 +35,17 @@ async Task<Stream> IStreamImageSource.GetStreamAsync(CancellationToken userToken
if (IsEmpty)
return null;

OnLoadingStarted();
await OnLoadingStarted();
userToken.Register(CancellationTokenSource.Cancel);
Stream stream = null;
try
{
stream = await Stream(CancellationTokenSource.Token);
OnLoadingCompleted(false);
await OnLoadingCompleted(false);
}
catch (OperationCanceledException)
{
OnLoadingCompleted(true);
await OnLoadingCompleted(true);
throw;
}
return stream;
Expand Down
6 changes: 3 additions & 3 deletions src/Controls/src/Core/UriImageSource.cs
View file
Open in desktop
Expand Up @@ -56,18 +56,18 @@ async Task<Stream> IStreamImageSource.GetStreamAsync(CancellationToken userToken
if (IsEmpty)
return null;

OnLoadingStarted();
await OnLoadingStarted();
userToken.Register(CancellationTokenSource.Cancel);
Stream stream;

try
{
stream = await GetStreamAsync(Uri, CancellationTokenSource.Token);
OnLoadingCompleted(false);
await OnLoadingCompleted(false);
}
catch (OperationCanceledException)
{
OnLoadingCompleted(true);
await OnLoadingCompleted(true);
throw;
}
catch (Exception ex)
Expand Down