Remove objc association & weak proxy from node -> controller pointer (#…

…1061) * Remove objc association & weak proxy from node -> controller relationship * Rename ASNodeController+Beta.m to ASNodeControllerx+Beta.mm Currently we can't import ASDisplayNodeInternal from C * Update project pointers * Rename ASNodeControllerx+Beta.mm to ASNodeController+Beta.mm
TextureGroup · Aug 3, 2018 · 40e3bf8 · 40e3bf8
1 parent e76b4f0
commit 40e3bf8
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 58 deletions.
diff --git a/AsyncDisplayKit.xcodeproj/project.pbxproj b/AsyncDisplayKit.xcodeproj/project.pbxproj
@@ -158,7 +158,7 @@
 		697796611D8AC8D3007E93D7 /* ASLayoutSpec+Subclasses.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6977965E1D8AC8D3007E93D7 /* ASLayoutSpec+Subclasses.mm */; };
 		697B315A1CFE4B410049936F /* ASEditableTextNodeTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 697B31591CFE4B410049936F /* ASEditableTextNodeTests.m */; };
 		698371DB1E4379CD00437585 /* ASNodeController+Beta.h in Headers */ = {isa = PBXBuildFile; fileRef = 698371D91E4379CD00437585 /* ASNodeController+Beta.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		698371DC1E4379CD00437585 /* ASNodeController+Beta.m in Sources */ = {isa = PBXBuildFile; fileRef = 698371DA1E4379CD00437585 /* ASNodeController+Beta.m */; };
+		698371DC1E4379CD00437585 /* ASNodeController+Beta.mm in Sources */ = {isa = PBXBuildFile; fileRef = 698371DA1E4379CD00437585 /* ASNodeController+Beta.mm */; };
 		698C8B621CAB49FC0052DC3F /* ASLayoutElementExtensibility.h in Headers */ = {isa = PBXBuildFile; fileRef = 698C8B601CAB49FC0052DC3F /* ASLayoutElementExtensibility.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		698DFF441E36B6C9002891F1 /* ASStackLayoutSpecUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 698DFF431E36B6C9002891F1 /* ASStackLayoutSpecUtilities.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		698DFF471E36B7E9002891F1 /* ASLayoutSpecUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 698DFF461E36B7E9002891F1 /* ASLayoutSpecUtilities.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -716,7 +716,7 @@
 		6977965E1D8AC8D3007E93D7 /* ASLayoutSpec+Subclasses.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "ASLayoutSpec+Subclasses.mm"; sourceTree = "<group>"; };
 		697B31591CFE4B410049936F /* ASEditableTextNodeTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASEditableTextNodeTests.m; sourceTree = "<group>"; };
 		698371D91E4379CD00437585 /* ASNodeController+Beta.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "ASNodeController+Beta.h"; sourceTree = "<group>"; };
-		698371DA1E4379CD00437585 /* ASNodeController+Beta.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "ASNodeController+Beta.m"; sourceTree = "<group>"; };
+		698371DA1E4379CD00437585 /* ASNodeController+Beta.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "ASNodeController+Beta.mm"; sourceTree = "<group>"; };
 		698C8B601CAB49FC0052DC3F /* ASLayoutElementExtensibility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASLayoutElementExtensibility.h; sourceTree = "<group>"; };
 		698DFF431E36B6C9002891F1 /* ASStackLayoutSpecUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASStackLayoutSpecUtilities.h; sourceTree = "<group>"; };
 		698DFF461E36B7E9002891F1 /* ASLayoutSpecUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASLayoutSpecUtilities.h; sourceTree = "<group>"; };
@@ -1197,7 +1197,7 @@
 				055B9FA61A1C154B00035D6D /* ASNetworkImageNode.h */,
 				055B9FA71A1C154B00035D6D /* ASNetworkImageNode.mm */,
 				698371D91E4379CD00437585 /* ASNodeController+Beta.h */,
-				698371DA1E4379CD00437585 /* ASNodeController+Beta.m */,
+				698371DA1E4379CD00437585 /* ASNodeController+Beta.mm */,
 				DBDB83921C6E879900D0098C /* ASPagerFlowLayout.h */,
 				DBDB83931C6E879900D0098C /* ASPagerFlowLayout.m */,
 				25E327541C16819500A2170C /* ASPagerNode.h */,
@@ -2374,7 +2374,7 @@
 				DEFAD8131CC48914000527C4 /* ASVideoNode.mm in Sources */,
 				CCA282C11E9EAE010037E8B7 /* ASTip.m in Sources */,
 				B350624C1B010EFD0018CF92 /* _ASPendingState.mm in Sources */,
-				698371DC1E4379CD00437585 /* ASNodeController+Beta.m in Sources */,
+				698371DC1E4379CD00437585 /* ASNodeController+Beta.mm in Sources */,
 				CC6AA2DB1E9F03B900978E87 /* ASDisplayNode+Ancestry.m in Sources */,
 				509E68621B3AEDA5009B9150 /* ASAbstractLayoutController.mm in Sources */,
 				254C6B861BF94F8A003EC431 /* ASTextKitContext.mm in Sources */,

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,6 +26,7 @@
 - Reduced binary size by disabling exception support (which we don't use.) [Adlai Holler](https://github.com/Adlai-Holler)
 - Create and set delegate for clip corner layers within ASDisplayNode [Michael Schneider](https://github.com/maicki) [#1029](https://github.com/TextureGroup/Texture/pull/1029)
 - Improve locking situation in ASVideoPlayerNode [Michael Schneider](https://github.com/maicki) [#1042](https://github.com/TextureGroup/Texture/pull/1042)
+- Optimize ASDisplayNode -> ASNodeController reference by removing weak proxy and objc associated objects. [Adlai Holler](https://github.com/Adlai-Holler)
 - Remove CA transaction signpost injection because it causes more transactions and is too chatty. [Adlai Holler](https://github.com/Adlai-Holler)
 - Optimize display node accessibility by not creating attributed & non-attributed copies of hint, label, and value. [Adlai Holler](https://github.com/Adlai-Holler)
 

diff --git a/Source/ASNodeController+Beta.m → Source/ASNodeController+Beta.mm b/Source/ASNodeController+Beta.m → Source/ASNodeController+Beta.mm
@@ -16,38 +16,18 @@
 //
 
 #import <AsyncDisplayKit/ASInternalHelpers.h>
+#import <AsyncDisplayKit/ASDisplayNodeInternal.h>
 #import <AsyncDisplayKit/ASDisplayNode+FrameworkPrivate.h>
 #import <AsyncDisplayKit/ASNodeController+Beta.h>
-#import <AsyncDisplayKit/ASWeakProxy.h>
 
 #define _node (_shouldInvertStrongReference ? _weakNode : _strongNode)
 
-@interface ASDisplayNode (ASNodeControllerOwnership)
-
-// This property exists for debugging purposes. Don't use __nodeController in production code.
-@property (nonatomic, readonly) ASNodeController *__nodeController;
-
-// These setters are mutually exclusive. Setting one will clear the relationship of the other.
-- (void)__setNodeControllerStrong:(ASNodeController *)nodeController;
-- (void)__setNodeControllerWeak:(ASNodeController *)nodeController;
-
-@end
-
 @implementation ASNodeController
 {
   ASDisplayNode *_strongNode;
   __weak ASDisplayNode *_weakNode;
 }
 
-- (instancetype)init
-{
-  self = [super init];
-  if (self) {
-
-  }
-  return self;
-}
-
 - (void)loadNode
 {
   self.node = [[ASDisplayNode alloc] init];
@@ -66,12 +46,14 @@ - (void)setupReferencesWithNode:(ASDisplayNode *)node
   if (_shouldInvertStrongReference) {
     // The node should own the controller; weak reference from controller to node.
     _weakNode = node;
-    [node __setNodeControllerStrong:self];
+    node->_strongNodeController = self;
+    node->_weakNodeController = nil;
     _strongNode = nil;
   } else {
     // The controller should own the node; weak reference from node to controller.
     _strongNode = node;
-    [node __setNodeControllerWeak:self];
+    node->_weakNodeController = self;
+    node->_strongNodeController = nil;
     _weakNode = nil;
   }
 
@@ -111,40 +93,10 @@ - (void)interfaceStateDidChange:(ASInterfaceState)newState
 
 @end
 
-@implementation ASDisplayNode (ASNodeControllerOwnership)
-
-- (ASNodeController *)__nodeController
-{
-  ASNodeController *nodeController = nil;
-  id object = objc_getAssociatedObject(self, @selector(__nodeController));
-
-  if ([object isKindOfClass:[ASWeakProxy class]]) {
-    nodeController = (ASNodeController *)[(ASWeakProxy *)object target];
-  } else {
-    nodeController = (ASNodeController *)object;
-  }
-
-  return nodeController;
-}
-
-- (void)__setNodeControllerStrong:(ASNodeController *)nodeController
-{
-  objc_setAssociatedObject(self, @selector(__nodeController), nodeController, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-}
-
-- (void)__setNodeControllerWeak:(ASNodeController *)nodeController
-{
-  // Associated objects don't support weak references. Since assign can become a dangling pointer, use ASWeakProxy.
-  ASWeakProxy *nodeControllerProxy = [ASWeakProxy weakProxyWithTarget:nodeController];
-  objc_setAssociatedObject(self, @selector(__nodeController), nodeControllerProxy, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-}
-
-@end
-
 @implementation ASDisplayNode (ASNodeController)
 
 - (ASNodeController *)nodeController {
-  return self.__nodeController;
+  return _weakNodeController ?: _strongNodeController;
 }
 
 @end
diff --git a/Source/Private/ASDisplayNodeInternal.h b/Source/Private/ASDisplayNodeInternal.h
@@ -34,6 +34,7 @@ NS_ASSUME_NONNULL_BEGIN
 @protocol _ASDisplayLayerDelegate;
 @class _ASDisplayLayer;
 @class _ASPendingState;
+@class ASNodeController;
 struct ASDisplayNodeFlags;
 
 BOOL ASDisplayNodeSubclassOverridesSelector(Class subclass, SEL selector);
@@ -92,6 +93,8 @@ AS_EXTERN NSString * const ASRenderingEngineDidDisplayNodesScheduledBeforeTimest
   ASInterfaceState _pendingInterfaceState;
   UIView *_view;
   CALayer *_layer;
+  ASNodeController *_strongNodeController;
+  __weak ASNodeController *_weakNodeController;
 
   std::atomic<ASDisplayNodeAtomicFlags> _atomicFlags;