From f385fa8ada9b81318976d73bc2953f2219137855 Mon Sep 17 00:00:00 2001 From: Michael Schneider Date: Tue, 15 Mar 2016 16:34:40 -0700 Subject: [PATCH] Replace recursive methods with ASDisplayNodePerformBlockOnEveryNode function --- AsyncDisplayKit/ASDisplayNode.mm | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/AsyncDisplayKit/ASDisplayNode.mm b/AsyncDisplayKit/ASDisplayNode.mm index d16479a5d5..92b0b337e1 100644 --- a/AsyncDisplayKit/ASDisplayNode.mm +++ b/AsyncDisplayKit/ASDisplayNode.mm @@ -1938,13 +1938,11 @@ void recursivelyTriggerDisplayForLayer(CALayer *layer, BOOL shouldBlock) _placeholderImage = nil; } -// TODO: Replace this with ASDisplayNodePerformBlockOnEveryNode or exitInterfaceState: - (void)recursivelyClearContents { - for (ASDisplayNode *subnode in self.subnodes) { - [subnode recursivelyClearContents]; - } - [self clearContents]; + ASDisplayNodePerformBlockOnEveryNode(nil, self, ^(ASDisplayNode * _Nonnull node) { + [node clearContents]; + }); } - (void)fetchData @@ -1959,13 +1957,11 @@ void recursivelyTriggerDisplayForLayer(CALayer *layer, BOOL shouldBlock) } } -// TODO: Replace this with ASDisplayNodePerformBlockOnEveryNode or enterInterfaceState: - (void)recursivelyFetchData { - for (ASDisplayNode *subnode in self.subnodes) { - [subnode recursivelyFetchData]; - } - [self fetchData]; + ASDisplayNodePerformBlockOnEveryNode(nil, self, ^(ASDisplayNode * _Nonnull node) { + [node fetchData]; + }); } - (void)clearFetchedData @@ -1973,13 +1969,11 @@ void recursivelyTriggerDisplayForLayer(CALayer *layer, BOOL shouldBlock) // subclass override } -// TODO: Replace this with ASDisplayNodePerformBlockOnEveryNode or exitInterfaceState: - (void)recursivelyClearFetchedData { - for (ASDisplayNode *subnode in self.subnodes) { - [subnode recursivelyClearFetchedData]; - } - [self clearFetchedData]; + ASDisplayNodePerformBlockOnEveryNode(nil, self, ^(ASDisplayNode * _Nonnull node) { + [node clearFetchedData]; + }); } - (void)visibilityDidChange:(BOOL)isVisible