Merge pull request #715 from Adlai-Holler/DeeperCompares

Expand usage of ASObjectIsEqual to clean up / encourage fast-path compares.

Author: appleguy

AsyncDisplayKit/ASEditableTextNode.mm

@@ -217,7 +217,7 @@ - (NSDictionary *)typingAttributes
 
 - (void)setTypingAttributes:(NSDictionary *)typingAttributes
 {
-  if (_typingAttributes == typingAttributes)
+  if (ASObjectIsEqual(typingAttributes, _typingAttributes))
     return;
 
   _typingAttributes = [typingAttributes copy];

AsyncDisplayKit/ASImageNode.mm

@@ -18,6 +18,7 @@
 #import "ASImageNode+CGExtras.h"
 
 #import "ASInternalHelpers.h"
+#import "ASEqualityHelpers.h"
 
 @interface _ASImageNodeDrawParameters : NSObject
 
@@ -123,7 +124,7 @@ - (CGSize)calculateSizeThatFits:(CGSize)constrainedSize
 - (void)setImage:(UIImage *)image
 {
   ASDN::MutexLocker l(_imageLock);
-  if (_image != image) {
+  if (!ASObjectIsEqual(_image, image)) {
     _image = image;
 
     ASDN::MutexUnlocker u(_imageLock);

AsyncDisplayKit/ASNetworkImageNode.mm

@@ -11,7 +11,7 @@
 #import "ASBasicImageDownloader.h"
 #import "ASDisplayNode+Subclasses.h"
 #import "ASThread.h"
-
+#import "ASEqualityHelpers.h"
 
 @interface ASNetworkImageNode ()
 {
@@ -70,7 +70,7 @@ - (void)setURL:(NSURL *)URL resetToDefault:(BOOL)reset
 {
   ASDN::MutexLocker l(_lock);
 
-  if (URL == _URL || [URL isEqual:_URL]) {
+  if (ASObjectIsEqual(URL, _URL)) {
     return;
   }
 
@@ -96,7 +96,7 @@ - (void)setDefaultImage:(UIImage *)defaultImage
 {
   ASDN::MutexLocker l(_lock);
 
-  if (defaultImage == _defaultImage || [defaultImage isEqual:_defaultImage]) {
+  if (ASObjectIsEqual(defaultImage, _defaultImage)) {
     return;
   }
   _defaultImage = defaultImage;

AsyncDisplayKit/ASTextNode.mm

@@ -19,6 +19,7 @@
 
 #import "ASTextNodeRenderer.h"
 #import "ASTextNodeShadower.h"
+#import "ASEqualityHelpers.h"
 
 static const NSTimeInterval ASTextNodeHighlightFadeOutDuration = 0.15;
 static const NSTimeInterval ASTextNodeHighlightFadeInDuration = 0.1;
@@ -315,7 +316,7 @@ - (void)_invalidateShadower
 #pragma mark - Modifying User Text
 
 - (void)setAttributedString:(NSAttributedString *)attributedString {
-  if (attributedString == _attributedString) {
+  if (ASObjectIsEqual(attributedString, _attributedString)) {
     return;
   }
 
@@ -349,14 +350,16 @@ - (void)setAttributedString:(NSAttributedString *)attributedString {
 
 - (void)setExclusionPaths:(NSArray *)exclusionPaths
 {
-  if ((_exclusionPaths == nil && exclusionPaths != nil) || (![_exclusionPaths  isEqualToArray:exclusionPaths])) {
-    _exclusionPaths = exclusionPaths;
-    [self _invalidateRenderer];
-    [self invalidateCalculatedLayout];
-    ASDisplayNodeRespectThreadAffinityOfNode(self, ^{
-      [self setNeedsDisplay];
-    });
+  if (ASObjectIsEqual(exclusionPaths, _exclusionPaths)) {
+    return;
   }
+  
+  _exclusionPaths = [exclusionPaths copy];
+  [self _invalidateRenderer];
+  [self invalidateCalculatedLayout];
+  ASDisplayNodeRespectThreadAffinityOfNode(self, ^{
+    [self setNeedsDisplay];
+  });
 }
 
 - (NSArray *)exclusionPaths
@@ -965,28 +968,22 @@ - (UIEdgeInsets)shadowPadding
 
 - (void)setTruncationAttributedString:(NSAttributedString *)truncationAttributedString
 {
-  // No-op if they're exactly equal (avoid redrawing)
-  if (_truncationAttributedString == truncationAttributedString) {
+  if (ASObjectIsEqual(_truncationAttributedString, truncationAttributedString)) {
     return;
   }
 
-  if (![_truncationAttributedString isEqual:truncationAttributedString]) {
-    _truncationAttributedString = [truncationAttributedString copy];
-    [self _invalidateTruncationString];
-  }
+  _truncationAttributedString = [truncationAttributedString copy];
+  [self _invalidateTruncationString];
 }
 
 - (void)setAdditionalTruncationMessage:(NSAttributedString *)additionalTruncationMessage
 {
-  // Short circuit if we're setting to nil (prevent redrawing when we don't need to)
-  if (_additionalTruncationMessage == additionalTruncationMessage) {
+  if (ASObjectIsEqual(_additionalTruncationMessage, additionalTruncationMessage)) {
     return;
   }
 
-  if (![_additionalTruncationMessage isEqual:additionalTruncationMessage]) {
-    _additionalTruncationMessage = [additionalTruncationMessage copy];
-    [self _invalidateTruncationString];
-  }
+  _additionalTruncationMessage = [additionalTruncationMessage copy];
+  [self _invalidateTruncationString];
 }
 
 - (void)setTruncationMode:(NSLineBreakMode)truncationMode

AsyncDisplayKit/Details/ASTextNodeCoreTextAdditions.m

@@ -149,7 +149,7 @@ BOOL ASAttributeWithNameIsUnsupportedCoreTextAttribute(NSString *attributeName)
 
     return cleanAttributedString;
   } else {
-    return dirtyAttributedString;
+    return [dirtyAttributedString copy];
   }
 }