From 9de014f17940e12266244b33da1118fa16cff32e Mon Sep 17 00:00:00 2001 From: Michael Schneider Date: Sun, 3 Jul 2016 14:38:26 -0700 Subject: [PATCH] Change applySubnodeTransition to startTransition --- AsyncDisplayKit/ASDisplayNode.mm | 4 ++-- AsyncDisplayKit/Private/ASLayoutTransition.h | 4 ++-- AsyncDisplayKit/Private/ASLayoutTransition.mm | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/AsyncDisplayKit/ASDisplayNode.mm b/AsyncDisplayKit/ASDisplayNode.mm index c32d5a5a..50545d6d 100644 --- a/AsyncDisplayKit/ASDisplayNode.mm +++ b/AsyncDisplayKit/ASDisplayNode.mm @@ -2449,13 +2449,13 @@ void recursivelyTriggerDisplayForLayer(CALayer *layer, BOOL shouldBlock) // Subnode insertions and removals need to happen always on the main thread if at least one subnode is already loaded ASPerformBlockOnMainThread(^{ - [layoutTransition applySubnodeTransition]; + [layoutTransition startTransition]; }); return; } - [layoutTransition applySubnodeTransition]; + [layoutTransition startTransition]; } - (void)layout diff --git a/AsyncDisplayKit/Private/ASLayoutTransition.h b/AsyncDisplayKit/Private/ASLayoutTransition.h index e5eea561..3c8e5781 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, getter=isSynchronous) BOOL synchronous; +@property (nonatomic, readonly, assign) BOOL isSynchronous; /** * Returns a newly initialized layout transition @@ -47,7 +47,7 @@ /** * Insert and remove subnodes that where added or removed between the previousLayout and the pendingLayout */ -- (void)applySubnodeTransition; +- (void)startTransition; /** * Insert all new subnodes that where added between the previous layout and the pending layout diff --git a/AsyncDisplayKit/Private/ASLayoutTransition.mm b/AsyncDisplayKit/Private/ASLayoutTransition.mm index 1e7e5433..919378a8 100644 --- a/AsyncDisplayKit/Private/ASLayoutTransition.mm +++ b/AsyncDisplayKit/Private/ASLayoutTransition.mm @@ -77,7 +77,7 @@ static inline BOOL ASLayoutCanTransitionAsynchronous(ASLayout *layout) { return ASLayoutCanTransitionAsynchronous(_pendingLayout); } -- (void)applySubnodeTransition +- (void)startTransition { [self applySubnodeInsertions]; [self applySubnodeRemovals];