From 7ec6f079532646b0d5b8dc6c85dac168b1a083c3 Mon Sep 17 00:00:00 2001 From: Adlai Holler Date: Fri, 22 Jul 2016 13:09:28 -0700 Subject: [PATCH] [General] Remove dead code, check optional protocol selector before calling (#1970) --- AsyncDisplayKit/ASCollectionNode.h | 1 - AsyncDisplayKit/ASCollectionView.mm | 5 --- AsyncDisplayKit/ASTableView.mm | 5 --- AsyncDisplayKit/Details/ASDataController.h | 2 -- AsyncDisplayKit/Details/ASDataController.mm | 33 -------------------- AsyncDisplayKit/Details/ASLayoutController.h | 8 ----- AsyncDisplayKit/Details/ASRangeController.h | 2 -- AsyncDisplayKit/Details/ASRangeController.mm | 8 +++-- 8 files changed, 6 insertions(+), 58 deletions(-) diff --git a/AsyncDisplayKit/ASCollectionNode.h b/AsyncDisplayKit/ASCollectionNode.h index d3ec3df0c4..568f9d1df9 100644 --- a/AsyncDisplayKit/ASCollectionNode.h +++ b/AsyncDisplayKit/ASCollectionNode.h @@ -12,7 +12,6 @@ #import #import -#import #import #import diff --git a/AsyncDisplayKit/ASCollectionView.mm b/AsyncDisplayKit/ASCollectionView.mm index 124dfed1b8..0657caa0b5 100644 --- a/AsyncDisplayKit/ASCollectionView.mm +++ b/AsyncDisplayKit/ASCollectionView.mm @@ -1059,11 +1059,6 @@ static NSString * const kCellReuseIdentifier = @"_ASCollectionViewCell"; return ASInterfaceStateForDisplayNode(self.collectionNode, self.window); } -- (NSArray *)rangeController:(ASRangeController *)rangeController nodesAtIndexPaths:(NSArray *)indexPaths -{ - return [_dataController nodesAtIndexPaths:indexPaths]; -} - - (ASDisplayNode *)rangeController:(ASRangeController *)rangeController nodeAtIndexPath:(NSIndexPath *)indexPath { return [_dataController nodeAtIndexPath:indexPath]; diff --git a/AsyncDisplayKit/ASTableView.mm b/AsyncDisplayKit/ASTableView.mm index a4193ddd4d..4481ed2d4e 100644 --- a/AsyncDisplayKit/ASTableView.mm +++ b/AsyncDisplayKit/ASTableView.mm @@ -897,11 +897,6 @@ static NSString * const kCellReuseIdentifier = @"_ASTableViewCell"; return self.scrollDirection; } -- (NSArray *)rangeController:(ASRangeController *)rangeController nodesAtIndexPaths:(NSArray *)indexPaths -{ - return [_dataController nodesAtIndexPaths:indexPaths]; -} - - (ASDisplayNode *)rangeController:(ASRangeController *)rangeController nodeAtIndexPath:(NSIndexPath *)indexPath { return [_dataController nodeAtIndexPath:indexPath]; diff --git a/AsyncDisplayKit/Details/ASDataController.h b/AsyncDisplayKit/Details/ASDataController.h index 84599c1a97..2c9c324425 100644 --- a/AsyncDisplayKit/Details/ASDataController.h +++ b/AsyncDisplayKit/Details/ASDataController.h @@ -181,8 +181,6 @@ FOUNDATION_EXPORT NSString * const ASDataControllerRowNodeKind; - (nullable NSIndexPath *)indexPathForNode:(ASCellNode *)cellNode; -- (NSArray *)nodesAtIndexPaths:(NSArray *)indexPaths; - /** * Direct access to the nodes that have completed calculation and layout */ diff --git a/AsyncDisplayKit/Details/ASDataController.mm b/AsyncDisplayKit/Details/ASDataController.mm index cd43b9e4a1..21e56e3dc4 100644 --- a/AsyncDisplayKit/Details/ASDataController.mm +++ b/AsyncDisplayKit/Details/ASDataController.mm @@ -131,14 +131,6 @@ NSString * const ASDataControllerRowNodeKind = @"_ASDataControllerRowNodeKind"; } } -- (void)layoutLoadedNodes:(NSArray *)nodes fromContexts:(NSArray *)contexts ofKind:(NSString *)kind -{ - NSAssert(ASDisplayNodeThreadIsMain(), @"Layout of loaded nodes must happen on the main thread."); - ASDisplayNodeAssertTrue(nodes.count == contexts.count); - - [self _layoutNodes:nodes fromContexts:contexts atIndexesOfRange:NSMakeRange(0, nodes.count) ofKind:kind]; -} - /** * Measure and layout the given node with the constrained size range. */ @@ -162,25 +154,6 @@ NSString * const ASDataControllerRowNodeKind = @"_ASDataControllerRowNodeKind"; }]; } -/** - * Perform measurement and layout of loaded or unloaded nodes based if they will be layed out on main thread or not - */ -- (void)_layoutNodes:(NSArray *)nodes fromContexts:(NSArray *)contexts atIndexesOfRange:(NSRange)range ofKind:(NSString *)kind -{ - ASSERT_ON_EDITING_QUEUE; - - if (_dataSource == nil) { - return; - } - - // Layout nodes based on the given context constrained size - for (NSUInteger k = range.location; k < NSMaxRange(range); k++) { - ASCellNode *node = nodes[k]; - ASIndexedNodeContext *context = contexts[k]; - [self _layoutNode:node withConstrainedSize:context.constrainedSize]; - } -} - - (void)_layoutNodesFromContexts:(NSArray *)contexts ofKind:(NSString *)kind completion:(ASDataControllerCompletionBlock)completionBlock { ASSERT_ON_EDITING_QUEUE; @@ -939,12 +912,6 @@ NSString * const ASDataControllerRowNodeKind = @"_ASDataControllerRowNodeKind"; return nil; } -- (NSArray *)nodesAtIndexPaths:(NSArray *)indexPaths -{ - ASDisplayNodeAssertMainThread(); - return ASFindElementsInMultidimensionalArrayAtIndexPaths((NSMutableArray *)[self completedNodes], [indexPaths sortedArrayUsingSelector:@selector(compare:)]); -} - /// Returns nodes that can be queried externally. _externalCompletedNodes is used if available, _completedNodes otherwise. - (NSArray *)completedNodes { diff --git a/AsyncDisplayKit/Details/ASLayoutController.h b/AsyncDisplayKit/Details/ASLayoutController.h index 759c230e20..d159cc0384 100644 --- a/AsyncDisplayKit/Details/ASLayoutController.h +++ b/AsyncDisplayKit/Details/ASLayoutController.h @@ -37,14 +37,6 @@ FOUNDATION_EXPORT BOOL ASRangeTuningParametersEqualToRangeTuningParameters(ASRan @optional -- (void)insertNodesAtIndexPaths:(NSArray *)indexPaths withSizes:(NSArray *)nodeSizes; - -- (void)deleteNodesAtIndexPaths:(NSArray *)indexPaths; - -- (void)insertSections:(NSArray*> *)sections atIndexSet:(NSIndexSet *)indexSet; - -- (void)deleteSectionsAtIndexSet:(NSIndexSet *)indexSet; - - (void)setVisibleNodeIndexPaths:(NSArray *)indexPaths; - (void)setViewportSize:(CGSize)viewportSize; diff --git a/AsyncDisplayKit/Details/ASRangeController.h b/AsyncDisplayKit/Details/ASRangeController.h index e4a883395d..d682e07b9d 100644 --- a/AsyncDisplayKit/Details/ASRangeController.h +++ b/AsyncDisplayKit/Details/ASRangeController.h @@ -130,8 +130,6 @@ NS_ASSUME_NONNULL_BEGIN */ - (ASInterfaceState)interfaceStateForRangeController:(ASRangeController *)rangeController; -- (NSArray *)rangeController:(ASRangeController *)rangeController nodesAtIndexPaths:(NSArray *)indexPaths; - - (ASDisplayNode *)rangeController:(ASRangeController *)rangeController nodeAtIndexPath:(NSIndexPath *)indexPath; - (NSArray *> *)completedNodes; diff --git a/AsyncDisplayKit/Details/ASRangeController.mm b/AsyncDisplayKit/Details/ASRangeController.mm index e002364441..7696a47955 100644 --- a/AsyncDisplayKit/Details/ASRangeController.mm +++ b/AsyncDisplayKit/Details/ASRangeController.mm @@ -26,6 +26,7 @@ BOOL _rangeIsValid; BOOL _needsRangeUpdate; BOOL _layoutControllerImplementsSetVisibleIndexPaths; + BOOL _layoutControllerImplementsSetViewportSize; NSSet *_allPreviousIndexPaths; ASLayoutRangeMode _currentRangeMode; BOOL _didUpdateCurrentRange; @@ -143,7 +144,8 @@ static UIApplicationState __ApplicationState = UIApplicationStateActive; - (void)setLayoutController:(id)layoutController { _layoutController = layoutController; - _layoutControllerImplementsSetVisibleIndexPaths = [_layoutController respondsToSelector:@selector(setVisibleNodeIndexPaths:)]; + _layoutControllerImplementsSetVisibleIndexPaths = [layoutController respondsToSelector:@selector(setVisibleNodeIndexPaths:)]; + _layoutControllerImplementsSetViewportSize = [layoutController respondsToSelector:@selector(setViewportSize:)]; if (layoutController && _dataSource) { [self updateIfNeeded]; } @@ -181,7 +183,9 @@ static UIApplicationState __ApplicationState = UIApplicationStateActive; } ASScrollDirection scrollDirection = [_dataSource scrollDirectionForRangeController:self]; - [_layoutController setViewportSize:[_dataSource viewportSizeForRangeController:self]]; + if (_layoutControllerImplementsSetViewportSize) { + [_layoutController setViewportSize:[_dataSource viewportSizeForRangeController:self]]; + } // the layout controller needs to know what the current visible indices are to calculate range offsets if (_layoutControllerImplementsSetVisibleIndexPaths) {