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

Rename ASLayoutableContext methods

Browse Source
This commit is contained in:
Huy Nguyen
2016-03-27 17:36:31 -07:00
parent 81d26994c5
commit 7bb3015950
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
AsyncDisplayKit/ASDisplayNode.mm
View File

@@ -631,7 +631,7 @@ static ASDisplayNodeMethodOverrides GetASDisplayNodeMethodOverrides(Class c)
}
if (ASHierarchyStateIncludesLayoutPending(_hierarchyState)
&& _pendingTransitionID != ASLayoutableGetLayoutableContext().transitionID) {
&& _pendingTransitionID != ASLayoutableGetCurrentContext().transitionID) {
return NO;
}
@@ -679,7 +679,7 @@ static ASDisplayNodeMethodOverrides GetASDisplayNodeMethodOverrides(Class c)
void (^transitionBlock)() = ^{
ASLayout *newLayout;
{
ASLayoutableSetLayoutableContext(ASLayoutableContextMake(transitionID, NO));
ASLayoutableSetCurrentContext(ASLayoutableContextMake(transitionID, NO));
ASDN::MutexLocker l(_propertyLock);
BOOL disableImplicitHierarchyManagement = self.usesImplicitHierarchyManagement == NO;
@@ -689,7 +689,7 @@ static ASDisplayNodeMethodOverrides GetASDisplayNodeMethodOverrides(Class c)
self.usesImplicitHierarchyManagement = NO; // Temporary flag for 1.9.x
}
ASLayoutableResetLayoutableContext();
ASLayoutableClearCurrentContext();
}
if ([self _shouldAbortTransitionWithID:transitionID]) {