From 01a2fd90d492c9330f72e0ea2987b3c9de02cc68 Mon Sep 17 00:00:00 2001 From: Alexey Glushkov Date: Tue, 24 Nov 2015 11:12:36 +0300 Subject: [PATCH] removed displaySize method, added condition to skip _invalidateRendererIfNeeded if there are no view and no layer --- AsyncDisplayKit/ASTextNode.mm | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/AsyncDisplayKit/ASTextNode.mm b/AsyncDisplayKit/ASTextNode.mm index be5ab82e8c..9c0bd9d79d 100644 --- a/AsyncDisplayKit/ASTextNode.mm +++ b/AsyncDisplayKit/ASTextNode.mm @@ -289,19 +289,7 @@ static NSString *ASTextNodeTruncationTokenAttributeName = @"ASTextNodeTruncation - (void)_invalidateRendererIfNeeded { - [self _invalidateRendererIfNeeded:[self displaySize]]; -} - -- (CGSize)displaySize -{ - CGSize resultSize = CGSizeZero; - if (self.isLayerBacked) { - resultSize = self.layer.bounds.size; - } else { - resultSize = self.view.bounds.size; - } - - return resultSize; + [self _invalidateRendererIfNeeded:self.bounds.size]; } - (void)_invalidateRendererIfNeeded:(CGSize)newSize @@ -317,7 +305,8 @@ static NSString *ASTextNodeTruncationTokenAttributeName = @"ASTextNodeTruncation - (BOOL)_needInvalidateRenderer:(CGSize)newSize { - return !CGSizeEqualToSize(newSize, _constrainedSize); + BOOL hasViewOrLayer = self.view || self.layer; + return hasViewOrLayer && !CGSizeEqualToSize(newSize, _constrainedSize); } #pragma mark - Shadow Drawer Management