Merge pull request #635 from garrettmoon/fixShouldRasterizeSubnodes

Fix should rasterize subnodes
This commit is contained in:
appleguy
2015-09-03 01:28:43 -07:00
2 changed files with 14 additions and 2 deletions

View File

@@ -630,10 +630,10 @@ void ASDisplayNodeRespectThreadAffinityOfNode(ASDisplayNode *node, void (^block)
{
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];
}