diff --git a/AsyncDisplayKit/ASCellNode.mm b/AsyncDisplayKit/ASCellNode.mm index 0803c81f79..f6f3dfcef0 100644 --- a/AsyncDisplayKit/ASCellNode.mm +++ b/AsyncDisplayKit/ASCellNode.mm @@ -214,9 +214,9 @@ // To be overriden by subclasses } -- (void)visibilityDidChange:(BOOL)isVisible +- (void)visibileStateDidChange:(BOOL)isVisible { - [super visibilityDidChange:isVisible]; + [super visibileStateDidChange:isVisible]; CGRect cellFrame = CGRectZero; if (_scrollView) { diff --git a/AsyncDisplayKit/ASCollectionNode.mm b/AsyncDisplayKit/ASCollectionNode.mm index a29ee08cf2..be44e9362e 100644 --- a/AsyncDisplayKit/ASCollectionNode.mm +++ b/AsyncDisplayKit/ASCollectionNode.mm @@ -173,9 +173,9 @@ } #if ASRangeControllerLoggingEnabled -- (void)visibilityDidChange:(BOOL)isVisible +- (void)visibileStateDidChange:(BOOL)isVisible { - [super visibilityDidChange:isVisible]; + [super visibileStateDidChange:isVisible]; NSLog(@"%@ - visible: %d", self, isVisible); } #endif diff --git a/AsyncDisplayKit/ASDisplayNode+Subclasses.h b/AsyncDisplayKit/ASDisplayNode+Subclasses.h index cba7216192..53b1fa3d95 100644 --- a/AsyncDisplayKit/ASDisplayNode+Subclasses.h +++ b/AsyncDisplayKit/ASDisplayNode+Subclasses.h @@ -240,7 +240,7 @@ NS_ASSUME_NONNULL_BEGIN * * @discussion Subclasses may use this to monitor when they become visible. */ -- (void)visibilityDidChange:(BOOL)isVisible ASDISPLAYNODE_REQUIRES_SUPER; +- (void)visibileStateDidChange:(BOOL)isVisible ASDISPLAYNODE_REQUIRES_SUPER; /** * @abstract Called whenever the the node has entered or left the display state. diff --git a/AsyncDisplayKit/ASDisplayNode.mm b/AsyncDisplayKit/ASDisplayNode.mm index 2edbf7ec15..7fc85d3c90 100644 --- a/AsyncDisplayKit/ASDisplayNode.mm +++ b/AsyncDisplayKit/ASDisplayNode.mm @@ -2106,7 +2106,7 @@ void recursivelyTriggerDisplayForLayer(CALayer *layer, BOOL shouldBlock) if (![self supportsRangeManagedInterfaceState]) { self.interfaceState = ASInterfaceStateNone; } else { - // This case is important when tearing down hierarchies. We must deliver a visibilityDidChange:NO callback, as part our API guarantee that this method can be used for + // This case is important when tearing down hierarchies. We must deliver a visibileStateDidChange:NO callback, as part our API guarantee that this method can be used for // things like data analytics about user content viewing. We cannot call the method in the dealloc as any incidental retain operations in client code would fail. // Additionally, it may be that a Standard UIView which is containing us is moving between hierarchies, and we should not send the call if we will be re-added in the // same runloop. Strategy: strong reference (might be the last!), wait one runloop, and confirm we are still outside the hierarchy (both layer-backed and view-backed). @@ -2173,7 +2173,7 @@ void recursivelyTriggerDisplayForLayer(CALayer *layer, BOOL shouldBlock) }); } -- (void)visibilityDidChange:(BOOL)isVisible +- (void)visibileStateDidChange:(BOOL)isVisible { // subclass override } @@ -2295,7 +2295,7 @@ void recursivelyTriggerDisplayForLayer(CALayer *layer, BOOL shouldBlock) BOOL wasVisible = ASInterfaceStateIncludesVisible(oldState); if (nowVisible != wasVisible) { - [self visibilityDidChange:nowVisible]; + [self visibileStateDidChange:nowVisible]; } [self interfaceStateDidChange:newState fromState:oldState]; diff --git a/AsyncDisplayKit/ASImageNode+AnimatedImage.mm b/AsyncDisplayKit/ASImageNode+AnimatedImage.mm index ffebb96317..df0da6554a 100644 --- a/AsyncDisplayKit/ASImageNode+AnimatedImage.mm +++ b/AsyncDisplayKit/ASImageNode+AnimatedImage.mm @@ -135,9 +135,9 @@ [self.animatedImage clearAnimatedImageCache]; } -- (void)visibilityDidChange:(BOOL)isVisible +- (void)visibileStateDidChange:(BOOL)isVisible { - [super visibilityDidChange:isVisible]; + [super visibileStateDidChange:isVisible]; ASDisplayNodeAssertMainThread(); if (isVisible) { diff --git a/AsyncDisplayKit/ASMultiplexImageNode.mm b/AsyncDisplayKit/ASMultiplexImageNode.mm index 8dca4e6495..22e87588e0 100644 --- a/AsyncDisplayKit/ASMultiplexImageNode.mm +++ b/AsyncDisplayKit/ASMultiplexImageNode.mm @@ -297,9 +297,9 @@ typedef void(^ASMultiplexImageLoadCompletionBlock)(UIImage *image, id imageIdent /* visibilityDidChange in ASNetworkImageNode has a very similar implementation. Changes here are likely necessary in ASNetworkImageNode as well. */ -- (void)visibilityDidChange:(BOOL)isVisible +- (void)visibileStateDidChange:(BOOL)isVisible { - [super visibilityDidChange:isVisible]; + [super visibileStateDidChange:isVisible]; if (_downloaderImplementsSetPriority) { ASDN::MutexLocker l(_downloadIdentifierLock); diff --git a/AsyncDisplayKit/ASNetworkImageNode.mm b/AsyncDisplayKit/ASNetworkImageNode.mm index b9f6514fb7..bbac40e467 100755 --- a/AsyncDisplayKit/ASNetworkImageNode.mm +++ b/AsyncDisplayKit/ASNetworkImageNode.mm @@ -280,9 +280,9 @@ static const CGSize kMinReleaseImageOnBackgroundSize = {20.0, 20.0}; /* visibilityDidChange in ASMultiplexImageNode has a very similar implementation. Changes here are likely necessary in ASMultiplexImageNode as well. */ -- (void)visibilityDidChange:(BOOL)isVisible +- (void)visibileStateDidChange:(BOOL)isVisible { - [super visibilityDidChange:isVisible]; + [super visibileStateDidChange:isVisible]; if (_downloaderImplementsSetPriority) { _lock.lock(); diff --git a/AsyncDisplayKit/ASTableNode.mm b/AsyncDisplayKit/ASTableNode.mm index 1642478d2d..ab65e6b4cd 100644 --- a/AsyncDisplayKit/ASTableNode.mm +++ b/AsyncDisplayKit/ASTableNode.mm @@ -145,9 +145,9 @@ } #if ASRangeControllerLoggingEnabled -- (void)visibilityDidChange:(BOOL)isVisible +- (void)visibileStateDidChange:(BOOL)isVisible { - [super visibilityDidChange:isVisible]; + [super visibileStateDidChange:isVisible]; NSLog(@"%@ - visible: %d", self, isVisible); } #endif diff --git a/AsyncDisplayKit/ASVideoNode.mm b/AsyncDisplayKit/ASVideoNode.mm index 89cb9fa5bb..98813e5c7b 100644 --- a/AsyncDisplayKit/ASVideoNode.mm +++ b/AsyncDisplayKit/ASVideoNode.mm @@ -382,9 +382,9 @@ static NSString * const kStatus = @"status"; } } -- (void)visibilityDidChange:(BOOL)isVisible +- (void)visibileStateDidChange:(BOOL)isVisible { - [super visibilityDidChange:isVisible]; + [super visibileStateDidChange:isVisible]; ASDN::MutexLocker l(_videoLock); diff --git a/AsyncDisplayKit/Details/ASRangeController.mm b/AsyncDisplayKit/Details/ASRangeController.mm index 7935564a3d..6a14b833ac 100644 --- a/AsyncDisplayKit/Details/ASRangeController.mm +++ b/AsyncDisplayKit/Details/ASRangeController.mm @@ -95,7 +95,7 @@ static UIApplicationState __ApplicationState = UIApplicationStateActive; { _scrollDirection = scrollDirection; - // Perform update immediately, so that cells receive a visibilityDidChange: call before their first pixel is visible. + // Perform update immediately, so that cells receive a visibileStateDidChange: call before their first pixel is visible. [self scheduleRangeUpdate]; } diff --git a/AsyncDisplayKitTests/ASVideoNodeTests.m b/AsyncDisplayKitTests/ASVideoNodeTests.m index f74ba735f9..6fec8701f2 100644 --- a/AsyncDisplayKitTests/ASVideoNodeTests.m +++ b/AsyncDisplayKitTests/ASVideoNodeTests.m @@ -223,7 +223,7 @@ }]; _videoNode.playerNode.layer.frame = CGRectZero; - [_videoNode visibilityDidChange:YES]; + [_videoNode visibileStateDidChange:YES]; XCTAssertTrue(_videoNode.shouldBePlaying); }