Complete merge of working window removal with ASHierarchyState changes in master.

This commit is contained in:
Scott Goodson
2015-12-11 22:15:13 -08:00
parent 00fe336ae7
commit 872b3588d8
3 changed files with 12 additions and 14 deletions

View File

@@ -742,20 +742,6 @@ static ASDisplayNodeMethodOverrides GetASDisplayNodeMethodOverrides(Class c)
[self displayImmediately];
}
- (void)__setNeedsDisplay
{
ASDN::MutexLocker l(_propertyLock);
//NSLog(@"About to find parent rasterize for %@", self);
ASDisplayNode *rasterizedContainerNode = [self __rasterizedContainerNode];
if (rasterizedContainerNode) {
[rasterizedContainerNode setNeedsDisplay];
} else {
if (_layer && !self.isSynchronous && self.displaysAsynchronously) {
[ASDisplayNode scheduleNodeForDisplay:self];
}
}
}
- (void)__setNeedsLayout
{
ASDisplayNodeAssertThreadAffinity(self);