ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-16 11:20:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #968 from facebook/LockHandlingOnRemoveFromSupernode

Browse Source 
[ASDisplayNode] Release the lock before setting supernode pointer to nil, in case we are deallocated.
This commit is contained in:
appleguy 2015-12-21 20:55:54 -08:00
commit d7492b331f
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
AsyncDisplayKit/ASDisplayNode.mm
View File

@ -1217,28 +1217,33 @@ static NSInteger incrementIfFound(NSInteger i) {
- (void)removeFromSupernode - (void)removeFromSupernode
{ {
ASDisplayNodeAssertThreadAffinity(self); ASDisplayNodeAssertThreadAffinity(self);
ASDN::MutexLocker l(_propertyLock);
if (!_supernode)
return;
// Check to ensure that our view or layer is actually inside of our supernode; otherwise, don't remove it.
// Though _ASDisplayView decouples the supernode if it is inserted inside another view hierarchy, this is
// more difficult to guarantee with _ASDisplayLayer because CoreAnimation doesn't have a -didMoveToSuperlayer.
BOOL shouldRemoveFromSuperviewOrSuperlayer = NO; BOOL shouldRemoveFromSuperviewOrSuperlayer = NO;
if (self.nodeLoaded && _supernode.nodeLoaded) { {
if (_flags.layerBacked || _supernode.layerBacked) { ASDN::MutexLocker l(_propertyLock);
shouldRemoveFromSuperviewOrSuperlayer = (_layer.superlayer == _supernode.layer); if (!_supernode)
} else { return;
shouldRemoveFromSuperviewOrSuperlayer = (_view.superview == _supernode.view);
// Check to ensure that our view or layer is actually inside of our supernode; otherwise, don't remove it.
// Though _ASDisplayView decouples the supernode if it is inserted inside another view hierarchy, this is
// more difficult to guarantee with _ASDisplayLayer because CoreAnimation doesn't have a -didMoveToSuperlayer.
if (self.nodeLoaded && _supernode.nodeLoaded) {
if (_flags.layerBacked || _supernode.layerBacked) {
shouldRemoveFromSuperviewOrSuperlayer = (_layer.superlayer == _supernode.layer);
} else {
shouldRemoveFromSuperviewOrSuperlayer = (_view.superview == _supernode.view);
}
} }
} }
// Do this before removing the view from the hierarchy, as the node will clear its supernode pointer when its view is removed from the hierarchy. // Do this before removing the view from the hierarchy, as the node will clear its supernode pointer when its view is removed from the hierarchy.
// This call may result in the object being destroyed.
[_supernode _removeSubnode:self]; [_supernode _removeSubnode:self];
if (shouldRemoveFromSuperviewOrSuperlayer) { if (shouldRemoveFromSuperviewOrSuperlayer) {
ASPerformBlockOnMainThread(^{ ASPerformBlockOnMainThread(^{
ASDN::MutexLocker l(_propertyLock);
if (_flags.layerBacked) { if (_flags.layerBacked) {
[_layer removeFromSuperlayer]; [_layer removeFromSuperlayer];
} else { } else {
@ -1866,7 +1871,7 @@ void recursivelyTriggerDisplayForLayer(CALayer *layer, BOOL shouldBlock)
ASDisplayNode *subnode = nil; ASDisplayNode *subnode = nil;
CGRect subnodeFrame = CGRectZero; CGRect subnodeFrame = CGRectZero;
for (ASLayout *subnodeLayout in _layout.sublayouts) { for (ASLayout *subnodeLayout in _layout.sublayouts) {
ASDisplayNodeAssert([_subnodes containsObject:subnodeLayout.layoutableObject], @"Cached sublayouts must only contain subnodes' layout."); ASDisplayNodeAssert([_subnodes containsObject:subnodeLayout.layoutableObject], @"Cached sublayouts must only contain subnodes' layout. self = %@, subnodes = %@", self, _subnodes);
CGPoint adjustedOrigin = subnodeLayout.position; CGPoint adjustedOrigin = subnodeLayout.position;
if (isfinite(adjustedOrigin.x) == NO) { if (isfinite(adjustedOrigin.x) == NO) {
ASDisplayNodeAssert(0, @"subnodeLayout has an invalid position"); ASDisplayNodeAssert(0, @"subnodeLayout has an invalid position");