Remove overly-cautious thread affinity assertions for threadsafe properties.

This commit is contained in:
Scott Goodson 2016-02-04 19:44:44 -08:00
parent e2be6440c2
commit 454d68516b
2 changed files with 1 additions and 3 deletions

View File

@ -1475,14 +1475,12 @@ static NSInteger incrementIfFound(NSInteger i) {
- (NSArray *)subnodes - (NSArray *)subnodes
{ {
ASDisplayNodeAssertThreadAffinity(self);
ASDN::MutexLocker l(_propertyLock); ASDN::MutexLocker l(_propertyLock);
return [_subnodes copy]; return [_subnodes copy];
} }
- (ASDisplayNode *)supernode - (ASDisplayNode *)supernode
{ {
ASDisplayNodeAssertThreadAffinity(self);
ASDN::MutexLocker l(_propertyLock); ASDN::MutexLocker l(_propertyLock);
return _supernode; return _supernode;
} }

View File

@ -31,7 +31,7 @@ extern void ASDisplayNodePerformBlockOnEveryNode(CALayer *layer, ASDisplayNode *
if (node) { if (node) {
block(node); block(node);
} }
if (!layer && [node isNodeLoaded]) { if (!layer && [node isNodeLoaded] && ASDisplayNodeThreadIsMain()) {
layer = node.layer; layer = node.layer;
} }