Fixes shouldRasterizeSubnodes

garrettmoon · garrettmoon · commit 32582fca580d · 2015-09-01T13:25:27.000-07:00
Currently, subnodes of nodes marked with shouldRasterizeSubnodes do not get layout calls. This adds the call to layout and changes the __layout method to reference self.bounds instead of _layer.bounds.

Also adds support for corner radius when rasterizing subnodes.
diff --git a/AsyncDisplayKit/ASDisplayNode.mm b/AsyncDisplayKit/ASDisplayNode.mm
@@ -612,10 +612,10 @@ - (void)__layout
 {
   ASDisplayNodeAssertMainThread();
   ASDN::MutexLocker l(_propertyLock);
-  if (CGRectEqualToRect(_layer.bounds, CGRectZero)) {
+  if (CGRectEqualToRect(self.bounds, CGRectZero)) {
     return;     // Performing layout on a zero-bounds view often results in frame calculations with negative sizes after applying margins, which will cause measureWithSizeRange: on subnodes to assert.
   }
-  _placeholderLayer.frame = _layer.bounds;
+  _placeholderLayer.frame = self.bounds;
   [self layout];
   [self layoutDidFinish];
 }
diff --git a/AsyncDisplayKit/Private/ASDisplayNode+AsyncDisplay.mm b/AsyncDisplayKit/Private/ASDisplayNode+AsyncDisplay.mm
@@ -83,6 +83,13 @@ - (void)_recursivelyRasterizeSelfAndSublayersWithIsCancelledBlock:(asdisplaynode
   if (self.isHidden || self.alpha <= 0.0) {
     return;
   }
+    
+  BOOL rasterizingFromAscendent = [self __rasterizedContainerNode] != nil;
+
+  // if super node is rasterizing descendents, subnodes will not have had layout calls becase they don't have layers
+  if (rasterizingFromAscendent) {
+    [self __layout];
+  }
 
   // Capture these outside the display block so they are retained.
   UIColor *backgroundColor = self.backgroundColor;
@@ -121,6 +128,11 @@ - (void)_recursivelyRasterizeSelfAndSublayersWithIsCancelledBlock:(asdisplaynode
 
       CGContextTranslateCTM(context, frame.origin.x, frame.origin.y);
 
+      //support cornerRadius
+      if (rasterizingFromAscendent && self.cornerRadius && self.clipsToBounds) {
+        [[UIBezierPath bezierPathWithRoundedRect:bounds cornerRadius:self.cornerRadius] addClip];
+      }
+
       // Fill background if any.
       CGColorRef backgroundCGColor = backgroundColor.CGColor;
       if (backgroundColor && CGColorGetAlpha(backgroundCGColor) > 0.0) {

Original file line number	Diff line number	Diff line change
`@@ -612,10 +612,10 @@ - (void)__layout`
`612`	`612`	`{`
`613`	`613`	`ASDisplayNodeAssertMainThread();`
`614`	`614`	`ASDN::MutexLocker l(_propertyLock);`
`615`		`- if (CGRectEqualToRect(_layer.bounds, CGRectZero)) {`
	`615`	`+ if (CGRectEqualToRect(self.bounds, CGRectZero)) {`
`616`	`616`	`return; // Performing layout on a zero-bounds view often results in frame calculations with negative sizes after applying margins, which will cause measureWithSizeRange: on subnodes to assert.`
`617`	`617`	`}`
`618`		`- _placeholderLayer.frame = _layer.bounds;`
	`618`	`+ _placeholderLayer.frame = self.bounds;`
`619`	`619`	`[self layout];`
`620`	`620`	`[self layoutDidFinish];`
`621`	`621`	`}`