Assert when attempting to set a nil background / overlay layout element. (#2796)

master-nevi · Adlai Holler · commit 498e5a94037f · 2016-12-19T17:41:45.000-05:00
diff --git a/AsyncDisplayKit/Layout/ASBackgroundLayoutSpec.mm b/AsyncDisplayKit/Layout/ASBackgroundLayoutSpec.mm
@@ -67,6 +67,7 @@ - (ASLayout *)calculateLayoutThatFits:(ASSizeRange)constrainedSize
 
 - (void)setBackground:(id<ASLayoutElement>)background
 {
+  ASDisplayNodeAssertNotNil(background, @"Background cannot be nil");
   [super setChild:background atIndex:kBackgroundChildIndex];
 }
 
diff --git a/AsyncDisplayKit/Layout/ASOverlayLayoutSpec.mm b/AsyncDisplayKit/Layout/ASOverlayLayoutSpec.mm
@@ -43,6 +43,7 @@ - (instancetype)initWithChild:(id<ASLayoutElement>)child overlay:(id<ASLayoutEle
 
 - (void)setOverlay:(id<ASLayoutElement>)overlay
 {
+  ASDisplayNodeAssertNotNil(overlay, @"Overlay cannot be nil");
   [super setChild:overlay atIndex:kOverlayChildIndex];
 }
 

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,7 @@ - (ASLayout *)calculateLayoutThatFits:(ASSizeRange)constrainedSize`
`67`	`67`
`68`	`68`	`- (void)setBackground:(id<ASLayoutElement>)background`
`69`	`69`	`{`
	`70`	`+ ASDisplayNodeAssertNotNil(background, @"Background cannot be nil");`
`70`	`71`	`[super setChild:background atIndex:kBackgroundChildIndex];`
`71`	`72`	`}`
`72`	`73`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ - (instancetype)initWithChild:(id<ASLayoutElement>)child overlay:(id<ASLayoutEle`
`43`	`43`
`44`	`44`	`- (void)setOverlay:(id<ASLayoutElement>)overlay`
`45`	`45`	`{`
	`46`	`+ ASDisplayNodeAssertNotNil(overlay, @"Overlay cannot be nil");`
`46`	`47`	`[super setChild:overlay atIndex:kOverlayChildIndex];`
`47`	`48`	`}`
`48`	`49`