ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-20 21:29:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ASNetworkImageNode] Carry recent progress image block changes over from multiplex image node

Browse Source
This commit is contained in:
Adlai Holler 2016-04-22 12:34:13 -05:00
parent f5adc7999b
commit bc8a2b19ef
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
AsyncDisplayKit/ASMultiplexImageNode.mm
View File

@ -452,9 +452,13 @@ typedef void(^ASMultiplexImageLoadCompletionBlock)(UIImage *image, id imageIdent
#pragma mark - #pragma mark -
/**
@note: This should be called without _downloadIdentifierLock held. We will lock
super to read our interface state and it's best to avoid acquiring both locks.
*/
- (void)_updateProgressImageBlockOnDownloaderIfNeeded - (void)_updateProgressImageBlockOnDownloaderIfNeeded
{ {
// Read our interface state so that we don't lock super while holding our lock. // Read our interface state before locking so that we don't lock super while holding our lock.
ASInterfaceState interfaceState = self.interfaceState; ASInterfaceState interfaceState = self.interfaceState;
ASDN::MutexLocker l(_downloadIdentifierLock); ASDN::MutexLocker l(_downloadIdentifierLock);

12
AsyncDisplayKit/ASNetworkImageNode.mm
View File

@ -213,8 +213,8 @@ static const CGSize kMinReleaseImageOnBackgroundSize = {20.0, 20.0};
{ {
[super visibilityDidChange:isVisible]; [super visibilityDidChange:isVisible];
ASDN::MutexLocker l(_lock);
if (_downloaderImplementsSetPriority) { if (_downloaderImplementsSetPriority) {
ASDN::MutexLocker l(_lock);
if (_downloadIdentifier != nil) { if (_downloadIdentifier != nil) {
if (isVisible) { if (isVisible) {
[_downloader setPriority:ASImageDownloaderPriorityVisible withDownloadIdentifier:_downloadIdentifier]; [_downloader setPriority:ASImageDownloaderPriorityVisible withDownloadIdentifier:_downloadIdentifier];
@ -254,14 +254,22 @@ static const CGSize kMinReleaseImageOnBackgroundSize = {20.0, 20.0};
#pragma mark - Private methods -- only call with lock. #pragma mark - Private methods -- only call with lock.
/**
@note: This should be called without _lock held. We will lock
super to read our interface state and it's best to avoid acquiring both locks.
*/
- (void)_updateProgressImageBlockOnDownloaderIfNeeded - (void)_updateProgressImageBlockOnDownloaderIfNeeded
{ {
// Read our interface state before locking so that we don't lock super while holding our lock.
ASInterfaceState interfaceState = self.interfaceState;
ASDN::MutexLocker l(_lock);
if (!_downloaderImplementsSetProgress || _downloadIdentifier == nil) { if (!_downloaderImplementsSetProgress || _downloadIdentifier == nil) {
return; return;
} }
ASImageDownloaderProgressImage progress = nil; ASImageDownloaderProgressImage progress = nil;
if (ASInterfaceStateIncludesVisible(self.interfaceState)) { if (ASInterfaceStateIncludesVisible(interfaceState)) {
__weak __typeof__(self) weakSelf = self; __weak __typeof__(self) weakSelf = self;
progress = ^(UIImage * _Nonnull progressImage, id _Nullable downloadIdentifier) { progress = ^(UIImage * _Nonnull progressImage, id _Nullable downloadIdentifier) {
__typeof__(self) strongSelf = weakSelf; __typeof__(self) strongSelf = weakSelf;