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

Revert "Need to trampoline to main to make contents check safe if nodes are loaded. (#2545)"

Browse Source 
This reverts commit 11e07ff409.
This commit is contained in:
Garrett Moon
2016-11-06 18:09:29 -08:00
parent d7ba0a9c6d
commit 17bd3acdee
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
AsyncDisplayKit/ASDisplayNode.mm
View File

@@ -1143,15 +1143,7 @@ static ASDisplayNodeMethodOverrides GetASDisplayNodeMethodOverrides(Class c)
[self setCalculatedDisplayNodeLayout:_pendingLayoutTransition.pendingLayout];
[self _completeLayoutTransition:_pendingLayoutTransition];
}
// Trampoline to the main thread if necessary
if (_pendingLayoutTransition && _pendingLayoutTransition.isSynchronous == NO) {
[self _pendingLayoutTransitionDidComplete];
} else {
ASPerformBlockOnMainThread(^{
[self _pendingLayoutTransitionDidComplete];
});
}
[self _pendingLayoutTransitionDidComplete];
}
/*
@@ -1166,7 +1158,7 @@ static ASDisplayNodeMethodOverrides GetASDisplayNodeMethodOverrides(Class c)
}
// Trampoline to the main thread if necessary
if (layoutTransition.isSynchronous == NO) {
if (ASDisplayNodeThreadIsMain() || layoutTransition.isSynchronous == NO) {
[layoutTransition commitTransition];
} else {
// Subnode insertions and removals need to happen always on the main thread if at least one subnode is already loaded
@@ -1194,7 +1186,7 @@ static ASDisplayNodeMethodOverrides GetASDisplayNodeMethodOverrides(Class c)
if (CGSizeEqualToSize(layoutSize, CGSizeZero)) {
return;
}
if (!_placeholderImage) {
_placeholderImage = [self placeholderImage];
}