From 1d21c0bd5545741f284e553d7ed003c69fa6897c Mon Sep 17 00:00:00 2001 From: Adlai Holler Date: Thu, 23 Feb 2017 11:32:01 -0800 Subject: [PATCH] Clean up actionForLayer:forKey: (#3063) --- AsyncDisplayKit/ASDisplayNode.mm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/AsyncDisplayKit/ASDisplayNode.mm b/AsyncDisplayKit/ASDisplayNode.mm index 31aee76220..0c70d52abc 100644 --- a/AsyncDisplayKit/ASDisplayNode.mm +++ b/AsyncDisplayKit/ASDisplayNode.mm @@ -2245,7 +2245,7 @@ static const char *ASDisplayNodeDrawingPriorityKey = "ASDrawingPriority"; #pragma mark -// We are only the delegate for the layer when we are layer-backed, as UIView performs this funcition normally +// We are only the delegate for the layer when we are layer-backed, as UIView performs this function normally - (id)actionForLayer:(CALayer *)layer forKey:(NSString *)event { if (event == kCAOnOrderIn) { @@ -2254,8 +2254,8 @@ static const char *ASDisplayNodeDrawingPriorityKey = "ASDrawingPriority"; [self __exitHierarchy]; } - ASDisplayNodeAssert(_flags.layerBacked, @"We shouldn't get called back here if there is no layer"); - return (id)kCFNull; + ASDisplayNodeAssert(_flags.layerBacked, @"We shouldn't get called back here unless we are layer-backed."); + return nil; } #pragma mark - Error Handling