Revert "Use textStorageCreationBlock for resetting the text storage (#…

…1874)" This reverts commit d646d3c.
facebookarchive · Jul 10, 2016 · d83f319 · d83f319
1 parent ff7a586
commit d83f319
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/AsyncDisplayKit/TextKit/ASTextKitContext.mm b/AsyncDisplayKit/TextKit/ASTextKitContext.mm
@@ -23,7 +23,6 @@ @implementation ASTextKitContext
   NSTextContainer *_textContainer;
 
   NSAttributedString *_attributedString;
-  ASTextKitContextTextStorageCreationBlock _textStorageCreationBlock;
 }
 
 #pragma mark - Lifecycle
@@ -35,7 +34,7 @@ - (instancetype)initWithAttributedString:(NSAttributedString *)attributedString
                          constrainedSize:(CGSize)constrainedSize
               layoutManagerCreationBlock:(NSLayoutManager * (^)(void))layoutCreationBlock
                    layoutManagerDelegate:(id<NSLayoutManagerDelegate>)layoutManagerDelegate
-                textStorageCreationBlock:(ASTextKitContextTextStorageCreationBlock)textStorageCreationBlock
+                textStorageCreationBlock:(NSTextStorage * (^)(NSAttributedString *attributedString))textStorageCreationBlock
 
 {
   if (self = [super init]) {
@@ -44,7 +43,6 @@ - (instancetype)initWithAttributedString:(NSAttributedString *)attributedString
     std::lock_guard<std::mutex> l(__static_mutex);
 
     _attributedString = [attributedString copy];
-    _textStorageCreationBlock = [textStorageCreationBlock copy];
 
     // Create the TextKit component stack with our default configuration.
     if (textStorageCreationBlock) {
@@ -81,11 +79,7 @@ - (void)resetTextStorage
 
 - (void)_resetTextStorage
 {
-  if (_textStorageCreationBlock) {
-    [_textStorage setAttributedString:_textStorageCreationBlock(_attributedString)];
-  } else {
-    [_textStorage setAttributedString:_attributedString];
-  }
+  [_textStorage setAttributedString:_attributedString];
 }
 
 #pragma mark - Setter / Getter