Rename ASLayoutableContext methods

Author: nguyenhuy

AsyncDisplayKit/ASDisplayNode.mm

@@ -631,7 +631,7 @@ - (BOOL)shouldMeasureWithSizeRange:(ASSizeRange)constrainedSize
   }
 
   if (ASHierarchyStateIncludesLayoutPending(_hierarchyState)
-      && _pendingTransitionID != ASLayoutableGetLayoutableContext().transitionID) {
+      && _pendingTransitionID != ASLayoutableGetCurrentContext().transitionID) {
     return NO;
   }
 
@@ -679,7 +679,7 @@ - (void)transitionLayoutWithSizeRange:(ASSizeRange)constrainedSize
   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 @@ - (void)transitionLayoutWithSizeRange:(ASSizeRange)constrainedSize
         self.usesImplicitHierarchyManagement = NO; // Temporary flag for 1.9.x
       }
 
-      ASLayoutableResetLayoutableContext();
+      ASLayoutableClearCurrentContext();
     }
 
     if ([self _shouldAbortTransitionWithID:transitionID]) {

AsyncDisplayKit/Layout/ASLayoutable.mm

@@ -20,21 +20,21 @@ ASLayoutableContext ASLayoutableContextMake(int32_t transitionID, BOOL needsVisu
 
 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());
 }
 
-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() {
-  layoutableContextMap.erase(ASLayoutableGetLayoutableContextKey());
+void ASLayoutableClearCurrentContext() {
+  layoutableContextMap.erase(ASLayoutableGetCurrentContextKey());
 }

AsyncDisplayKit/Layout/ASLayoutablePrivate.h

@@ -21,11 +21,11 @@ struct ASLayoutableContext {
 
 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