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

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

14
AsyncDisplayKit/Layout/ASLayoutable.mm
View File

@ -20,21 +20,21 @@ ASLayoutableContext ASLayoutableContextMake(int32_t transitionID, BOOL needsVisu
static std::map<mach_port_t, ASLayoutableContext> layoutableContextMap; static std::map<mach_port_t, ASLayoutableContext> layoutableContextMap;
static inline mach_port_t ASLayoutableGetLayoutableContextKey() static inline mach_port_t ASLayoutableGetCurrentContextKey()
{ {
return pthread_mach_thread_np(pthread_self()); return pthread_mach_thread_np(pthread_self());
} }
void ASLayoutableSetLayoutableContext(struct ASLayoutableContext context) void ASLayoutableSetCurrentContext(struct ASLayoutableContext context)
{ {
layoutableContextMap[ASLayoutableGetLayoutableContextKey()] = context; layoutableContextMap[ASLayoutableGetCurrentContextKey()] = context;
} }
struct ASLayoutableContext ASLayoutableGetLayoutableContext() struct ASLayoutableContext ASLayoutableGetCurrentContext()
{ {
return layoutableContextMap[ASLayoutableGetLayoutableContextKey()]; return layoutableContextMap[ASLayoutableGetCurrentContextKey()];
} }
void ASLayoutableResetLayoutableContext() { void ASLayoutableClearCurrentContext() {
layoutableContextMap.erase(ASLayoutableGetLayoutableContextKey()); layoutableContextMap.erase(ASLayoutableGetCurrentContextKey());
} }

6
AsyncDisplayKit/Layout/ASLayoutablePrivate.h
View File

@ -21,11 +21,11 @@ struct ASLayoutableContext {
extern struct ASLayoutableContext ASLayoutableContextMake(int32_t transitionID, BOOL needsVisualizeNode); extern struct ASLayoutableContext ASLayoutableContextMake(int32_t transitionID, BOOL needsVisualizeNode);
extern void ASLayoutableSetLayoutableContext(struct ASLayoutableContext context); extern void ASLayoutableSetCurrentContext(struct ASLayoutableContext context);
extern struct ASLayoutableContext ASLayoutableGetLayoutableContext(); extern struct ASLayoutableContext ASLayoutableGetCurrentContext();
extern void ASLayoutableResetLayoutableContext(); extern void ASLayoutableClearCurrentContext();
/** /**
* The base protocol for ASLayoutable. Generally the methods/properties in this class do not need to be * The base protocol for ASLayoutable. Generally the methods/properties in this class do not need to be