diff --git a/AsyncDisplayKit/Details/ASAbstractLayoutController.mm b/AsyncDisplayKit/Details/ASAbstractLayoutController.mm index 2edcd4a78f..38828861e7 100644 --- a/AsyncDisplayKit/Details/ASAbstractLayoutController.mm +++ b/AsyncDisplayKit/Details/ASAbstractLayoutController.mm @@ -82,13 +82,6 @@ extern BOOL ASRangeTuningParametersEqualToRangeTuningParameters(ASRangeTuningPar #pragma mark - Abstract Index Path Range Support -// FIXME: This method can be removed once ASRangeControllerBeta becomes the main version. -- (BOOL)shouldUpdateForVisibleIndexPaths:(NSArray *)indexPaths rangeType:(ASLayoutRangeType)rangeType -{ - ASDisplayNodeAssertNotSupported(); - return NO; -} - - (NSSet *)indexPathsForScrolling:(ASScrollDirection)scrollDirection rangeMode:(ASLayoutRangeMode)rangeMode rangeType:(ASLayoutRangeType)rangeType { ASDisplayNodeAssertNotSupported(); diff --git a/AsyncDisplayKit/Details/ASFlowLayoutController.mm b/AsyncDisplayKit/Details/ASFlowLayoutController.mm index cbcde0f011..dce8065e8e 100644 --- a/AsyncDisplayKit/Details/ASFlowLayoutController.mm +++ b/AsyncDisplayKit/Details/ASFlowLayoutController.mm @@ -15,8 +15,6 @@ #include #include -static const CGFloat kASFlowLayoutControllerRefreshingThreshold = 0.3; - @interface ASFlowLayoutController() { ASIndexPathRange _visibleRange; @@ -39,32 +37,6 @@ static const CGFloat kASFlowLayoutControllerRefreshingThreshold = 0.3; #pragma mark - Visible Indices -// FIXME: This method can be removed once ASRangeControllerBeta becomes the main version. -- (BOOL)shouldUpdateForVisibleIndexPaths:(NSArray *)indexPaths rangeType:(ASLayoutRangeType)rangeType -{ - if (!indexPaths.count || rangeType >= _rangesByType.size()) { - return NO; - } - - ASIndexPathRange existingRange = _rangesByType[rangeType]; - ASIndexPathRange newRange = [self indexPathRangeForIndexPaths:indexPaths]; - - ASIndexPath maximumStart = ASIndexPathMaximum(existingRange.start, newRange.start); - ASIndexPath minimumEnd = ASIndexPathMinimum(existingRange.end, newRange.end); - - if (ASIndexPathEqualToIndexPath(maximumStart, existingRange.start) || ASIndexPathEqualToIndexPath(minimumEnd, existingRange.end)) { - return YES; - } - - NSInteger newStartDelta = [self flowLayoutDistanceForRange:ASIndexPathRangeMake(_visibleRange.start, newRange.start)]; - NSInteger existingStartDelta = [self flowLayoutDistanceForRange:ASIndexPathRangeMake(_visibleRange.start, existingRange.start)] * kASFlowLayoutControllerRefreshingThreshold; - - NSInteger newEndDelta = [self flowLayoutDistanceForRange:ASIndexPathRangeMake(_visibleRange.end, newRange.end)]; - NSInteger existingEndDelta = [self flowLayoutDistanceForRange:ASIndexPathRangeMake(_visibleRange.end, existingRange.end)] * kASFlowLayoutControllerRefreshingThreshold; - - return (newStartDelta > existingStartDelta) || (newEndDelta > existingEndDelta); -} - - (void)setVisibleNodeIndexPaths:(NSArray *)indexPaths { _visibleRange = [self indexPathRangeForIndexPaths:indexPaths]; diff --git a/AsyncDisplayKit/Details/ASLayoutController.h b/AsyncDisplayKit/Details/ASLayoutController.h index 0ed8658876..8cf34effd0 100644 --- a/AsyncDisplayKit/Details/ASLayoutController.h +++ b/AsyncDisplayKit/Details/ASLayoutController.h @@ -31,10 +31,6 @@ FOUNDATION_EXPORT BOOL ASRangeTuningParametersEqualToRangeTuningParameters(ASRan - (ASRangeTuningParameters)tuningParametersForRangeMode:(ASLayoutRangeMode)rangeMode rangeType:(ASLayoutRangeType)rangeType; -// FIXME: This method can be removed once ASRangeControllerBeta becomes the main version. -// TODO: Now that it is the main version, can we remove this now? -- (BOOL)shouldUpdateForVisibleIndexPaths:(NSArray *)indexPaths rangeType:(ASLayoutRangeType)rangeType; - - (NSSet *)indexPathsForScrolling:(ASScrollDirection)scrollDirection rangeMode:(ASLayoutRangeMode)rangeMode rangeType:(ASLayoutRangeType)rangeType; @optional