From edf6ee59e83d1a4dba57fa41cfee1f813b4ea7d7 Mon Sep 17 00:00:00 2001 From: Adlai Holler Date: Sat, 20 Feb 2016 12:32:04 -0800 Subject: [PATCH] [ASDisplayNode] Remove RespectThreadAffinityOfNode function --- AsyncDisplayKit/ASDisplayNode.mm | 20 ------------------- .../Private/ASDisplayNodeInternal.h | 1 - 2 files changed, 21 deletions(-) diff --git a/AsyncDisplayKit/ASDisplayNode.mm b/AsyncDisplayKit/ASDisplayNode.mm index de1612ab38..906cfc43fa 100644 --- a/AsyncDisplayKit/ASDisplayNode.mm +++ b/AsyncDisplayKit/ASDisplayNode.mm @@ -79,26 +79,6 @@ BOOL ASDisplayNodeSubclassOverridesSelector(Class subclass, SEL selector) return ASSubclassOverridesSelector([ASDisplayNode class], subclass, selector); } -void ASDisplayNodeRespectThreadAffinityOfNode(ASDisplayNode *node, void (^block)()) -{ - ASDisplayNodeCAssertNotNil(block, @"block is required"); - if (!block) { - return; - } - - { - // Hold the lock to avoid a race where the node gets loaded while the block is in-flight. - ASDN::MutexLocker l(node->_propertyLock); - if (node.nodeLoaded) { - ASPerformBlockOnMainThread(^{ - block(); - }); - } else { - block(); - } - } -} - /** * Returns ASDisplayNodeFlags for the givern class/instance. instance MAY BE NIL. * diff --git a/AsyncDisplayKit/Private/ASDisplayNodeInternal.h b/AsyncDisplayKit/Private/ASDisplayNodeInternal.h index bc53ff77c0..67d0dea9e8 100644 --- a/AsyncDisplayKit/Private/ASDisplayNodeInternal.h +++ b/AsyncDisplayKit/Private/ASDisplayNodeInternal.h @@ -25,7 +25,6 @@ @class _ASDisplayLayer; BOOL ASDisplayNodeSubclassOverridesSelector(Class subclass, SEL selector); -void ASDisplayNodeRespectThreadAffinityOfNode(ASDisplayNode *node, void (^block)()); typedef NS_OPTIONS(NSUInteger, ASDisplayNodeMethodOverrides) {