Merge branch 'master' into releases/p6.9

Author: appleguy

AsyncDisplayKit/Layout/ASDimension.mm

@@ -17,7 +17,12 @@
 
 ASRelativeDimension ASRelativeDimensionMake(ASRelativeDimensionType type, CGFloat value)
 {
-  if (type == ASRelativeDimensionTypePoints) { ASDisplayNodeCAssertPositiveReal(@"Points", value); }
+  if (type == ASRelativeDimensionTypePoints) {
+    ASDisplayNodeCAssertPositiveReal(@"Points", value);
+  } else if (type == ASRelativeDimensionTypePercent) {
+    // TODO: Enable this assertion for 2.0.  Check that there is no use case for using a larger value, e.g. to layout for a clipsToBounds = NO element.
+    // ASDisplayNodeCAssert( 0 <= value && value <= 1.0, @"ASRelativeDimension percent value (%f) must be between 0 and 1.", value);
+  }
   ASRelativeDimension dimension; dimension.type = type; dimension.value = value; return dimension;
 }
 
@@ -28,6 +33,7 @@ ASRelativeDimension ASRelativeDimensionMakeWithPoints(CGFloat points)
 
 ASRelativeDimension ASRelativeDimensionMakeWithPercent(CGFloat percent)
 {
+  // ASDisplayNodeCAssert( 0 <= percent && percent <= 1.0, @"ASRelativeDimension percent value (%f) must be between 0 and 1.", percent);
   return ASRelativeDimensionMake(ASRelativeDimensionTypePercent, percent);
 }
 

AsyncDisplayKit/Private/ASEnvironmentInternal.mm

@@ -44,7 +44,7 @@ void ASEnvironmentPerformBlockOnObjectAndChildren(id<ASEnvironment> object, void
 
     block(object);
 
-    for (id<ASEnvironment> child in object) {
+    for (id<ASEnvironment> child in [object children]) {
       queue.push(child);
     }
   }