From b47c2d5ecf559b3e4a381b2641374e18c8998397 Mon Sep 17 00:00:00 2001 From: Adlai Holler Date: Sat, 20 Feb 2016 12:26:26 -0800 Subject: [PATCH] [ASTextNode] Remove more thread affinity dispatches --- AsyncDisplayKit/ASTextNode.mm | 42 +++++++++-------------------------- 1 file changed, 11 insertions(+), 31 deletions(-) diff --git a/AsyncDisplayKit/ASTextNode.mm b/AsyncDisplayKit/ASTextNode.mm index d333d88b06..f78d929009 100644 --- a/AsyncDisplayKit/ASTextNode.mm +++ b/AsyncDisplayKit/ASTextNode.mm @@ -333,10 +333,8 @@ static NSArray *DefaultLinkAttributeNames = @[ NSLinkAttributeName ]; // Instead of invalidating the renderer, in case this is a new call with a different constrained size, // just update the size of the NSTextContainer that is owned by the renderer's internal context object. [self _renderer].constrainedSize = _constrainedSize; - - ASDisplayNodeRespectThreadAffinityOfNode(self, ^{ - [self setNeedsDisplay]; - }); + + [self setNeedsDisplay]; CGSize size = [[self _renderer] size]; // the renderer computes the current scale factor during sizing, so let's grab it here @@ -400,9 +398,7 @@ static NSArray *DefaultLinkAttributeNames = @[ NSLinkAttributeName ]; _exclusionPaths = [exclusionPaths copy]; [self _invalidateRenderer]; [self invalidateCalculatedLayout]; - ASDisplayNodeRespectThreadAffinityOfNode(self, ^{ - [self setNeedsDisplay]; - }); + [self setNeedsDisplay]; } - (NSArray *)exclusionPaths @@ -951,9 +947,7 @@ static NSArray *DefaultLinkAttributeNames = @[ NSLinkAttributeName ]; } _shadowColor = shadowColor; [self _invalidateRenderer]; - ASDisplayNodeRespectThreadAffinityOfNode(self, ^{ - [self setNeedsDisplay]; - }); + [self setNeedsDisplay]; } } @@ -967,9 +961,7 @@ static NSArray *DefaultLinkAttributeNames = @[ NSLinkAttributeName ]; if (!CGSizeEqualToSize(_shadowOffset, shadowOffset)) { _shadowOffset = shadowOffset; [self _invalidateRenderer]; - ASDisplayNodeRespectThreadAffinityOfNode(self, ^{ - [self setNeedsDisplay]; - }); + [self setNeedsDisplay]; } } @@ -983,9 +975,7 @@ static NSArray *DefaultLinkAttributeNames = @[ NSLinkAttributeName ]; if (_shadowOpacity != shadowOpacity) { _shadowOpacity = shadowOpacity; [self _invalidateRenderer]; - ASDisplayNodeRespectThreadAffinityOfNode(self, ^{ - [self setNeedsDisplay]; - }); + [self setNeedsDisplay]; } } @@ -999,9 +989,7 @@ static NSArray *DefaultLinkAttributeNames = @[ NSLinkAttributeName ]; if (_shadowRadius != shadowRadius) { _shadowRadius = shadowRadius; [self _invalidateRenderer]; - ASDisplayNodeRespectThreadAffinityOfNode(self, ^{ - [self setNeedsDisplay]; - }); + [self setNeedsDisplay]; } } @@ -1053,9 +1041,7 @@ static NSAttributedString *DefaultTruncationAttributedString() if (_truncationMode != truncationMode) { _truncationMode = truncationMode; [self _invalidateRenderer]; - ASDisplayNodeRespectThreadAffinityOfNode(self, ^{ - [self setNeedsDisplay]; - }); + [self setNeedsDisplay]; } } @@ -1070,9 +1056,7 @@ static NSAttributedString *DefaultTruncationAttributedString() if ([_pointSizeScaleFactors isEqualToArray:pointSizeScaleFactors] == NO) { _pointSizeScaleFactors = pointSizeScaleFactors; [self _invalidateRenderer]; - ASDisplayNodeRespectThreadAffinityOfNode(self, ^{ - [self setNeedsDisplay]; - }); + [self setNeedsDisplay]; }} - (void)setMaximumNumberOfLines:(NSUInteger)maximumNumberOfLines @@ -1080,9 +1064,7 @@ static NSAttributedString *DefaultTruncationAttributedString() if (_maximumNumberOfLines != maximumNumberOfLines) { _maximumNumberOfLines = maximumNumberOfLines; [self _invalidateRenderer]; - ASDisplayNodeRespectThreadAffinityOfNode(self, ^{ - [self setNeedsDisplay]; - }); + [self setNeedsDisplay]; } } @@ -1102,9 +1084,7 @@ static NSAttributedString *DefaultTruncationAttributedString() { [self _updateComposedTruncationString]; [self _invalidateRenderer]; - ASDisplayNodeRespectThreadAffinityOfNode(self, ^{ - [self setNeedsDisplay]; - }); + [self setNeedsDisplay]; } /**