diff --git a/AsyncDisplayKit/ASTextNode.mm b/AsyncDisplayKit/ASTextNode.mm index bf7ca79005..bc8f2fe7a8 100644 --- a/AsyncDisplayKit/ASTextNode.mm +++ b/AsyncDisplayKit/ASTextNode.mm @@ -40,7 +40,7 @@ struct ASTextNodeDrawParameter { UIColor *backgroundColor; }; -@interface ASTextNode () +@interface ASTextNode () @end diff --git a/AsyncDisplayKit/TextKit/ASTextKitAttributes.h b/AsyncDisplayKit/TextKit/ASTextKitAttributes.h index 46f6e25a9e..dae549e514 100755 --- a/AsyncDisplayKit/TextKit/ASTextKitAttributes.h +++ b/AsyncDisplayKit/TextKit/ASTextKitAttributes.h @@ -81,11 +81,6 @@ struct ASTextKitAttributes { An array of scale factors in descending order to apply to the text to try to make it fit into a constrained size. */ NSArray *pointSizeScaleFactors; - - /** - An optional delegate for the NSLayoutManager - */ - id layoutManagerDelegate; /** We provide an explicit copy function so we can use aggregate initializer syntax while providing copy semantics for @@ -105,7 +100,6 @@ struct ASTextKitAttributes { shadowOpacity, shadowRadius, pointSizeScaleFactors, - layoutManagerDelegate, }; }; diff --git a/AsyncDisplayKit/TextKit/ASTextKitContext.h b/AsyncDisplayKit/TextKit/ASTextKitContext.h index fe5b174b2e..58257efbab 100755 --- a/AsyncDisplayKit/TextKit/ASTextKitContext.h +++ b/AsyncDisplayKit/TextKit/ASTextKitContext.h @@ -27,8 +27,7 @@ lineBreakMode:(NSLineBreakMode)lineBreakMode maximumNumberOfLines:(NSUInteger)maximumNumberOfLines exclusionPaths:(NSArray *)exclusionPaths - constrainedSize:(CGSize)constrainedSize - layoutManagerDelegate:(id)layoutManagerDelegate; + constrainedSize:(CGSize)constrainedSize; @property (nonatomic, assign, readwrite) CGSize constrainedSize; diff --git a/AsyncDisplayKit/TextKit/ASTextKitContext.mm b/AsyncDisplayKit/TextKit/ASTextKitContext.mm index ae5c56f002..ba7477c500 100755 --- a/AsyncDisplayKit/TextKit/ASTextKitContext.mm +++ b/AsyncDisplayKit/TextKit/ASTextKitContext.mm @@ -29,7 +29,6 @@ maximumNumberOfLines:(NSUInteger)maximumNumberOfLines exclusionPaths:(NSArray *)exclusionPaths constrainedSize:(CGSize)constrainedSize - layoutManagerDelegate:(id)layoutManagerDelegate { if (self = [super init]) { @@ -43,7 +42,6 @@ _textStorage = (attributedString ? [[NSTextStorage alloc] initWithAttributedString:attributedString] : [[NSTextStorage alloc] init]); _layoutManager = [[ASLayoutManager alloc] init]; _layoutManager.usesFontLeading = NO; - _layoutManager.delegate = layoutManagerDelegate; [_textStorage addLayoutManager:_layoutManager]; _textContainer = [[NSTextContainer alloc] initWithSize:constrainedSize]; // We want the text laid out up to the very edges of the container. diff --git a/AsyncDisplayKit/TextKit/ASTextKitRenderer.mm b/AsyncDisplayKit/TextKit/ASTextKitRenderer.mm index 7166195006..9faec1786f 100755 --- a/AsyncDisplayKit/TextKit/ASTextKitRenderer.mm +++ b/AsyncDisplayKit/TextKit/ASTextKitRenderer.mm @@ -100,8 +100,7 @@ static NSCharacterSet *_defaultAvoidTruncationCharacterSet() lineBreakMode:attributes.lineBreakMode maximumNumberOfLines:attributes.maximumNumberOfLines exclusionPaths:attributes.exclusionPaths - constrainedSize:shadowConstrainedSize - layoutManagerDelegate:attributes.layoutManagerDelegate]; + constrainedSize:shadowConstrainedSize]; } return _context; } diff --git a/AsyncDisplayKit/TextKit/ASTextKitTailTruncater.mm b/AsyncDisplayKit/TextKit/ASTextKitTailTruncater.mm index 5a39a76645..0a83046a2d 100755 --- a/AsyncDisplayKit/TextKit/ASTextKitTailTruncater.mm +++ b/AsyncDisplayKit/TextKit/ASTextKitTailTruncater.mm @@ -66,8 +66,7 @@ lineBreakMode:NSLineBreakByWordWrapping maximumNumberOfLines:1 exclusionPaths:nil - constrainedSize:constrainedRect.size - layoutManagerDelegate:nil]; + constrainedSize:constrainedRect.size]; __block CGRect truncationUsedRect; [truncationContext performBlockWithLockedTextKitComponents:^(NSLayoutManager *truncationLayoutManager, NSTextStorage *truncationTextStorage, NSTextContainer *truncationTextContainer) { diff --git a/AsyncDisplayKitTests/ASTextKitTruncationTests.mm b/AsyncDisplayKitTests/ASTextKitTruncationTests.mm index 4189f15d65..a504353af8 100644 --- a/AsyncDisplayKitTests/ASTextKitTruncationTests.mm +++ b/AsyncDisplayKitTests/ASTextKitTruncationTests.mm @@ -43,8 +43,7 @@ lineBreakMode:NSLineBreakByWordWrapping maximumNumberOfLines:0 exclusionPaths:nil - constrainedSize:constrainedSize - layoutManagerDelegate:nil]; + constrainedSize:constrainedSize]; __block NSRange textKitVisibleRange; [context performBlockWithLockedTextKitComponents:^(NSLayoutManager *layoutManager, NSTextStorage *textStorage, NSTextContainer *textContainer) { textKitVisibleRange = [layoutManager characterRangeForGlyphRange:[layoutManager glyphRangeForTextContainer:textContainer] @@ -66,8 +65,7 @@ lineBreakMode:NSLineBreakByWordWrapping maximumNumberOfLines:0 exclusionPaths:nil - constrainedSize:constrainedSize - layoutManagerDelegate:nil]; + constrainedSize:constrainedSize]; ASTextKitTailTruncater *tailTruncater = [[ASTextKitTailTruncater alloc] initWithContext:context truncationAttributedString:[self _simpleTruncationAttributedString] avoidTailTruncationSet:[NSCharacterSet characterSetWithCharactersInString:@""]]; @@ -90,8 +88,7 @@ lineBreakMode:NSLineBreakByWordWrapping maximumNumberOfLines:0 exclusionPaths:nil - constrainedSize:constrainedSize - layoutManagerDelegate:nil]; + constrainedSize:constrainedSize]; ASTextKitTailTruncater *tailTruncater = [[ASTextKitTailTruncater alloc] initWithContext:context truncationAttributedString:[self _simpleTruncationAttributedString] avoidTailTruncationSet:[NSCharacterSet characterSetWithCharactersInString:@"."]]; @@ -113,8 +110,7 @@ lineBreakMode:NSLineBreakByCharWrapping maximumNumberOfLines:0 exclusionPaths:nil - constrainedSize:constrainedSize - layoutManagerDelegate:nil]; + constrainedSize:constrainedSize]; ASTextKitTailTruncater *tailTruncater = [[ASTextKitTailTruncater alloc] initWithContext:context truncationAttributedString:[self _simpleTruncationAttributedString] avoidTailTruncationSet:[NSCharacterSet characterSetWithCharactersInString:@"."]]; @@ -137,8 +133,7 @@ lineBreakMode:NSLineBreakByWordWrapping maximumNumberOfLines:0 exclusionPaths:nil - constrainedSize:constrainedSize - layoutManagerDelegate:nil]; + constrainedSize:constrainedSize]; ASTextKitTailTruncater *tailTruncater = [[ASTextKitTailTruncater alloc] initWithContext:context truncationAttributedString:[self _simpleTruncationAttributedString] avoidTailTruncationSet:nil]; @@ -155,8 +150,7 @@ lineBreakMode:NSLineBreakByCharWrapping maximumNumberOfLines:0 exclusionPaths:nil - constrainedSize:constrainedSize - layoutManagerDelegate:nil]; + constrainedSize:constrainedSize]; ASTextKitTailTruncater *tailTruncater = [[ASTextKitTailTruncater alloc] initWithContext:context truncationAttributedString:[self _simpleTruncationAttributedString]