Optimize string handling for CALayer gravity & UIView content mode. Finally fix protocol rename.

Author: Scott Goodson

AsyncDisplayKit/ASTableView.h

@@ -277,7 +277,6 @@
 /**
  * This is a node-based UITableViewDataSource.
  */
-#define ASTableViewDataSource ASTableDataSource
 @protocol ASTableDataSource <ASCommonTableViewDataSource, NSObject>
 
 /**
@@ -315,14 +314,15 @@
 
 @end
 
+@protocol ASTableViewDataSource <ASTableDataSource>
+@end
 
 /**
  * This is a node-based UITableViewDelegate.
  *
  * Note that -tableView:heightForRowAtIndexPath: has been removed; instead, your custom ASCellNode subclasses are
  * responsible for deciding their preferred onscreen height in -calculateSizeThatFits:.
  */
-#define ASTableViewDelegate ASTableDelegate
 @protocol ASTableDelegate <ASCommonTableViewDelegate, NSObject>
 
 @optional
@@ -357,4 +357,7 @@
  */
 - (BOOL)shouldBatchFetchForTableView:(ASTableView *)tableView;
 
-@end
+@end
+
+@protocol ASTableViewDelegate <ASTableDelegate>;
+@end

AsyncDisplayKit/Private/_ASCoreAnimationExtras.mm

@@ -7,7 +7,7 @@
  */
 
 #import "_ASCoreAnimationExtras.h"
-
+#import "ASEqualityHelpers.h"
 #import "ASAssert.h"
 
 extern void ASDisplayNodeSetupLayerContentsWithResizableImage(CALayer *layer, UIImage *image)
@@ -87,7 +87,8 @@ extern void ASDisplayNodeSetupLayerContentsWithResizableImage(CALayer *layer, UI
   {UIViewContentModeBottomRight,     @"bottomRight"},
 };
 
-NSString *ASDisplayNodeNSStringFromUIContentMode(UIViewContentMode contentMode) {
+NSString *ASDisplayNodeNSStringFromUIContentMode(UIViewContentMode contentMode)
+{
   for (int i=0; i< ARRAY_COUNT(UIContentModeDescriptionLUT); i++) {
     if (UIContentModeDescriptionLUT[i].contentMode == contentMode) {
       return UIContentModeDescriptionLUT[i].string;
@@ -96,16 +97,10 @@ extern void ASDisplayNodeSetupLayerContentsWithResizableImage(CALayer *layer, UI
   return [NSString stringWithFormat:@"%d", (int)contentMode];
 }
 
-UIViewContentMode ASDisplayNodeUIContentModeFromNSString(NSString *string) {
-  // If you passed one of the constants (this is just an optimization to avoid string comparison)
-  for (int i=0; i < ARRAY_COUNT(UIContentModeDescriptionLUT); i++) {
-    if (UIContentModeDescriptionLUT[i].string == string) {
-      return UIContentModeDescriptionLUT[i].contentMode;
-    }
-  }
-  // If you passed something isEqualToString: to one of the constants
+UIViewContentMode ASDisplayNodeUIContentModeFromNSString(NSString *string)
+{
   for (int i=0; i < ARRAY_COUNT(UIContentModeDescriptionLUT); i++) {
-    if ([UIContentModeDescriptionLUT[i].string isEqualToString:string]) {
+    if (ASObjectIsEqual(UIContentModeDescriptionLUT[i].string, string)) {
       return UIContentModeDescriptionLUT[i].contentMode;
     }
   }
@@ -126,18 +121,12 @@ UIViewContentMode ASDisplayNodeUIContentModeFromNSString(NSString *string) {
 
 UIViewContentMode ASDisplayNodeUIContentModeFromCAContentsGravity(NSString *const contentsGravity)
 {
-  // If you passed one of the constants (this is just an optimization to avoid string comparison)
-  for (int i=0; i < ARRAY_COUNT(UIContentModeCAGravityLUT); i++) {
-    if (UIContentModeCAGravityLUT[i].string == contentsGravity) {
-      return UIContentModeCAGravityLUT[i].contentMode;
-    }
-  }
-  // If you passed something isEqualToString: to one of the constants
   for (int i=0; i < ARRAY_COUNT(UIContentModeCAGravityLUT); i++) {
-    if ([UIContentModeCAGravityLUT[i].string isEqualToString:contentsGravity]) {
+    if (ASObjectIsEqual(UIContentModeCAGravityLUT[i].string, contentsGravity)) {
       return UIContentModeCAGravityLUT[i].contentMode;
     }
   }
+
   ASDisplayNodeCAssert(contentsGravity, @"Encountered an unknown contentsGravity \"%@\". Is this a new version of iOS?", contentsGravity);
   ASDisplayNodeCAssert(!contentsGravity, @"You passed nil to ASDisplayNodeUIContentModeFromCAContentsGravity. We're falling back to resize, but this is probably a bug.");
   // If asserts disabled, fall back to this