From bf6fbd173db9081689c7fd608f401bb683d1efd6 Mon Sep 17 00:00:00 2001
From: Michael Schneider <mischneider1@gmail.com>
Date: Sun, 3 Jul 2016 13:33:23 -0700
Subject: [PATCH] Address first comments

---
 AsyncDisplayKit/ASDisplayNode.mm              | 8 ++++----
 AsyncDisplayKit/Private/ASLayoutTransition.h  | 2 +-
 AsyncDisplayKit/Private/ASLayoutTransition.mm | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/AsyncDisplayKit/ASDisplayNode.mm b/AsyncDisplayKit/ASDisplayNode.mm
index ce0eb1edb5..c32d5a5aef 100644
--- a/AsyncDisplayKit/ASDisplayNode.mm
+++ b/AsyncDisplayKit/ASDisplayNode.mm
@@ -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(^{
diff --git a/AsyncDisplayKit/Private/ASLayoutTransition.h b/AsyncDisplayKit/Private/ASLayoutTransition.h
index 5c38a3d5cd..e5eea561f9 100644
--- a/AsyncDisplayKit/Private/ASLayoutTransition.h
+++ b/AsyncDisplayKit/Private/ASLayoutTransition.h
@@ -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
diff --git a/AsyncDisplayKit/Private/ASLayoutTransition.mm b/AsyncDisplayKit/Private/ASLayoutTransition.mm
index b86fe572f8..1e7e543313 100644
--- a/AsyncDisplayKit/Private/ASLayoutTransition.mm
+++ b/AsyncDisplayKit/Private/ASLayoutTransition.mm
@@ -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);