Address PR comments

- Delegate to layout spec engine if the node is a layout spec node but yoga engine was asked for calculate the layout
- Change ASLayoutType to ASLayoutEngineType
- Improve layout engine fall through code

Source/ASDisplayNode+Layout.mm

@@ -144,19 +144,19 @@ - (NSString *)asciiArtName
 
 @implementation ASDisplayNode (ASLayout)
 
-- (ASLayoutType)layoutType
+- (ASLayoutEngineType)layoutEngineType
 {
 #if YOGA
   ASDN::MutexLocker l(__instanceLock__);
   YGNodeRef yogaNode = _style.yogaNode;
   BOOL hasYogaParent = (_yogaParent != nil);
   BOOL hasYogaChildren = (_yogaChildren.count > 0);
   if (yogaNode != NULL && (hasYogaParent || hasYogaChildren)) {
-    return ASLayoutTypeYoga;
+    return ASLayoutEngineTypeYoga;
   }
 #endif
 
-  return ASLayoutTypeLayoutSpec;
+  return ASLayoutEngineTypeLayoutSpec;
 }
 
 - (ASLayout *)calculatedLayout

Source/ASDisplayNode+Yoga.mm

@@ -21,6 +21,8 @@
 #import <AsyncDisplayKit/ASLayout.h>
 #import <AsyncDisplayKit/ASLayoutElementStylePrivate.h>
 
+#import <AsyncDisplayKit/ASDisplayNode+LayoutSpec.h>
+
 #define YOGA_LAYOUT_LOGGING 0
 
 #pragma mark - ASDisplayNode+Yoga
@@ -321,10 +323,8 @@ - (ASLayout *)calculateLayoutYoga:(ASSizeRange)constrainedSize
     }
   }
 
-  // Manual size calculation via calculateSizeThatFits:
-  CGSize size = [self calculateSizeThatFits:constrainedSize.max];
-  ASDisplayNodeLogEvent(self, @"calculatedSize: %@", NSStringFromCGSize(size));
-  return [ASLayout layoutWithLayoutElement:self size:ASSizeRangeClamp(constrainedSize, size) sublayouts:nil];
+  // Delegate to layout spec layout for nodes that do not support Yoga
+  return [self calculateLayoutLayoutSpec:constrainedSize];
 }
 
 - (void)calculateLayoutFromYogaRoot:(ASSizeRange)rootConstrainedSize

Source/ASDisplayNode.h

@@ -817,17 +817,17 @@ AS_EXTERN NSInteger const ASDefaultDrawingPriority;
 
 @end
 
-typedef NS_ENUM(NSInteger, ASLayoutType) {
-  ASLayoutTypeLayoutSpec,
-  ASLayoutTypeYoga
+typedef NS_ENUM(NSInteger, ASLayoutEngineType) {
+  ASLayoutEngineTypeLayoutSpec,
+  ASLayoutEngineTypeYoga
 };
 
 @interface ASDisplayNode (ASLayout)
 
 /**
  * @abstract Returns the current layout type the node uses for layout the subtree.
  */
-@property (readonly) ASLayoutType layoutType;
+@property (readonly) ASLayoutEngineType layoutEngineType;
 
 /**
  * @abstract Return the calculated size.

Source/ASDisplayNode.mm

@@ -1110,18 +1110,22 @@ - (ASLayout *)calculateLayoutThatFits:(ASSizeRange)constrainedSize
 {
   __ASDisplayNodeCheckForLayoutMethodOverrides;
 
-  switch (self.layoutType) {
-    case ASLayoutTypeLayoutSpec:
+  switch (self.layoutEngineType) {
+    case ASLayoutEngineTypeLayoutSpec:
       return [self calculateLayoutLayoutSpec:constrainedSize];
-    case ASLayoutTypeYoga:
 #if YOGA
+    case ASLayoutEngineTypeYoga:
       return [self calculateLayoutYoga:constrainedSize];
 #endif
-    // If not YOGA we fallthrough here
+      // If YOGA is not defined but for some reason the layout type engine is Yoga
+      // we explicitly fallthrough here
     default:
-      ASDisplayNodeAssert(NO, @"No layout type determined");
+      break;
   }
 
+  // If this case is reached a layout type engine was defined for a node that is currently
+  // not supported.
+  ASDisplayNodeAssert(NO, @"No layout type determined");
   return nil;
 }
 

Source/Private/ASDisplayNodeInternal.h

@@ -194,7 +194,6 @@ AS_EXTERN NSString * const ASRenderingEngineDidDisplayNodesScheduledBeforeTimest
   NSInteger _layoutComputationNumberOfPasses;
 
 
-
   // View Loading
   ASDisplayNodeViewBlock _viewBlock;
   ASDisplayNodeLayerBlock _layerBlock;