From ce98e563524e3bd32d4544b41ef78f7cf357fa89 Mon Sep 17 00:00:00 2001
From: Michael Schneider <mischneider1@gmail.com>
Date: Sun, 10 Jul 2016 20:59:27 -0700
Subject: [PATCH] Use getter of layout inspector to create it lazily and not
 have to create it at initialization time

---
 AsyncDisplayKit/ASCollectionView.mm | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/AsyncDisplayKit/ASCollectionView.mm b/AsyncDisplayKit/ASCollectionView.mm
index b42ac741e0..7d57011c74 100644
--- a/AsyncDisplayKit/ASCollectionView.mm
+++ b/AsyncDisplayKit/ASCollectionView.mm
@@ -253,9 +253,6 @@ static NSString * const kCellReuseIdentifier = @"_ASCollectionViewCell";
   
   _layoutFacilitator = layoutFacilitator;
   
-  // Trigger creating the layout inspector
-  [self layoutInspector];
-  
   _proxyDelegate = [[ASCollectionViewProxy alloc] initWithTarget:nil interceptor:self];
   super.delegate = (id<UICollectionViewDelegate>)_proxyDelegate;
   
@@ -371,7 +368,7 @@ static NSString * const kCellReuseIdentifier = @"_ASCollectionViewCell";
   super.dataSource = (id<UICollectionViewDataSource>)_proxyDataSource;
   
   if (_layoutInspectorFlags.layoutInspectorDidChangeCollectionViewDataSource) {
-    [_layoutInspector didChangeCollectionViewDataSource:asyncDataSource];
+    [self.layoutInspector didChangeCollectionViewDataSource:asyncDataSource];
   }
 }
 
@@ -406,7 +403,7 @@ static NSString * const kCellReuseIdentifier = @"_ASCollectionViewCell";
   super.delegate = (id<UICollectionViewDelegate>)_proxyDelegate;
   
   if (_layoutInspectorFlags.layoutInspectorDidChangeCollectionViewDelegate) {
-    [_layoutInspector didChangeCollectionViewDelegate:asyncDelegate];
+    [self.layoutInspector didChangeCollectionViewDelegate:asyncDelegate];
   }
 }
 
@@ -977,7 +974,7 @@ static NSString * const kCellReuseIdentifier = @"_ASCollectionViewCell";
 
 - (ASSizeRange)dataController:(ASDataController *)dataController constrainedSizeForNodeAtIndexPath:(NSIndexPath *)indexPath
 {
-  return [_layoutInspector collectionView:self constrainedSizeForNodeAtIndexPath:indexPath];
+  return [self.layoutInspector collectionView:self constrainedSizeForNodeAtIndexPath:indexPath];
 }
 
 - (NSUInteger)dataController:(ASDataController *)dataController rowsInSection:(NSUInteger)section
@@ -1017,17 +1014,17 @@ static NSString * const kCellReuseIdentifier = @"_ASCollectionViewCell";
 
 - (ASSizeRange)dataController:(ASCollectionDataController *)dataController constrainedSizeForSupplementaryNodeOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath
 {
-  return [_layoutInspector collectionView:self constrainedSizeForSupplementaryNodeOfKind:kind atIndexPath:indexPath];
+  return [self.layoutInspector collectionView:self constrainedSizeForSupplementaryNodeOfKind:kind atIndexPath:indexPath];
 }
 
 - (NSUInteger)dataController:(ASCollectionDataController *)dataController supplementaryNodesOfKind:(NSString *)kind inSection:(NSUInteger)section
 {
-  return [_layoutInspector collectionView:self supplementaryNodesOfKind:kind inSection:section];
+  return [self.layoutInspector collectionView:self supplementaryNodesOfKind:kind inSection:section];
 }
 
 - (NSUInteger)dataController:(ASCollectionDataController *)dataController numberOfSectionsForSupplementaryNodeOfKind:(NSString *)kind;
 {
-  return [_layoutInspector collectionView:self numberOfSectionsForSupplementaryNodeOfKind:kind];
+  return [self.layoutInspector collectionView:self numberOfSectionsForSupplementaryNodeOfKind:kind];
 }
 
 #pragma mark - ASRangeControllerDataSource