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

Address first comments

Browse Source
This commit is contained in:
Michael Schneider 2016-07-03 13:33:23 -07:00
parent 01fed69b26
commit bf6fbd173d
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
AsyncDisplayKit/ASDisplayNode.mm
View File

@ -718,7 +718,7 @@ static ASDisplayNodeMethodOverrides GetASDisplayNodeMethodOverrides(Class c)
int32_t transitionID = [self _startNewTransition];
ASDisplayNodePerformBlockOnEverySubnode(self, ^(ASDisplayNode * _Nonnull node) {
ASDisplayNodeAssert([node _hasTransitionInProgress] == NO, @"Can't start a transition when one of the subnodes is performing one.");
ASDisplayNodeAssert([node _isTransitionInProgress] == NO, @"Can't start a transition when one of the subnodes is performing one.");
node.hierarchyState |= ASHierarchyStateLayoutPending;
node.pendingTransitionID = transitionID;
});
@ -821,7 +821,7 @@ static ASDisplayNodeMethodOverrides GetASDisplayNodeMethodOverrides(Class c)
- (void)cancelLayoutTransitionsInProgress
{
ASDN::MutexLocker l(_propertyLock);
if ([self _hasTransitionInProgress]) {
if ([self _isTransitionInProgress]) {
// Cancel transition in progress
[self _finishOrCancelTransition];
@ -844,7 +844,7 @@ static ASDisplayNodeMethodOverrides GetASDisplayNodeMethodOverrides(Class c)
_usesImplicitHierarchyManagement = value;
}
- (BOOL)_hasTransitionInProgress
- (BOOL)_isTransitionInProgress
{
ASDN::MutexLocker l(_propertyLock);
return _transitionInProgress;
@ -2445,7 +2445,7 @@ void recursivelyTriggerDisplayForLayer(CALayer *layer, BOOL shouldBlock)
}
// Trampoline to the main thread if necessary
if (ASDisplayNodeThreadIsMain() == NO && layoutTransition.canTransitionAsynchronous == NO) {
if (ASDisplayNodeThreadIsMain() == NO && layoutTransition.isSynchronous == NO) {
// Subnode insertions and removals need to happen always on the main thread if at least one subnode is already loaded
ASPerformBlockOnMainThread(^{

2
AsyncDisplayKit/Private/ASLayoutTransition.h
View File

@ -36,7 +36,7 @@
/**
* Returns if the layout transition can happen asynchronously
*/
@property (nonatomic, readonly, assign) BOOL canTransitionAsynchronous;
@property (nonatomic, readonly, assign, getter=isSynchronous) BOOL synchronous;
/**
* Returns a newly initialized layout transition

4
AsyncDisplayKit/Private/ASLayoutTransition.mm
View File

@ -27,7 +27,7 @@
* Search the whole layout stack if at least one layout has a layoutable object that can not be layed out asynchronous.
* This can be the case for example if a node was already loaded
*/
static BOOL ASLayoutCanTransitionAsynchronous(ASLayout *layout) {
static inline BOOL ASLayoutCanTransitionAsynchronous(ASLayout *layout) {
// Queue used to keep track of sublayouts while traversing this layout in a BFS fashion.
std::queue<ASLayout *> queue;
queue.push(layout);
@ -71,7 +71,7 @@ static BOOL ASLayoutCanTransitionAsynchronous(ASLayout *layout) {
return self;
}
- (BOOL)canTransitionAsynchronous
- (BOOL)isSynchronous
{
ASDN::MutexLocker l(_propertyLock);
return ASLayoutCanTransitionAsynchronous(_pendingLayout);