Skip to content

Commit

Permalink
#trivial Shouldn't hold the lock while adding subnodes (#1091)
Browse files Browse the repository at this point in the history
* Shouldn't hold the lock while adding subnodes

* Add comments, good call @nguyenhuy
  • Loading branch information
garrettmoon authored and nguyenhuy committed Aug 31, 2018
1 parent b556b2f commit 1fe241d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 3 additions & 1 deletion Source/ASControlNode.mm
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,9 @@ - (void)addTarget:(id)target action:(SEL)action forControlEvents:(ASControlNodeE

// only show tap-able areas for views with 1 or more addTarget:action: pairs
if ([ASControlNode enableHitTestDebug] && _debugHighlightOverlay == nil) {
ASPerformBlockOnMainThread(^{
// do not use ASPerformBlockOnMainThread here, if it performs the block synchronously it will continue
// holding the lock while calling addSubnode.
dispatch_async(dispatch_get_main_queue(), ^{
// add a highlight overlay node with area of ASControlNode + UIEdgeInsets
self.clipsToBounds = NO;
_debugHighlightOverlay = [[ASImageNode alloc] init];
Expand Down
2 changes: 2 additions & 0 deletions Source/ASImageNode.mm
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,8 @@ - (void)_locked_setImage:(UIImage *)image

// For debugging purposes we don't care about locking for now
if ([ASImageNode shouldShowImageScalingOverlay] && _debugLabelNode == nil) {
// do not use ASPerformBlockOnMainThread here, if it performs the block synchronously it will continue
// holding the lock while calling addSubnode.
dispatch_async(dispatch_get_main_queue(), ^{
_debugLabelNode = [[ASTextNode alloc] init];
_debugLabelNode.layerBacked = YES;
Expand Down

0 comments on commit 1fe241d

Please sign in to comment.