Revert "Add experiments to skip waiting for updates of collection and…

… table views under some circumstances (TextureGroup#1311)"

Source/ASCollectionView.mm

@@ -1911,10 +1911,7 @@ - (BOOL)dataController:(ASDataController *)dataController shouldSynchronouslyPro
   if (ASCellLayoutModeIncludes(ASCellLayoutModeAlwaysAsync)) {
     return NO;
   }
-  // Reload data is expensive, don't block main while doing so.
-  if (changeSet.includesReloadData) {
-    return NO;
-  }
+  // The heuristics below apply to the ASCellLayoutModeNone.
   // If we have very few ASCellNodes (besides UIKit passthrough ones), match UIKit by blocking.
   if (changeSet.countForAsyncLayout < 2) {
     return YES;
@@ -1924,7 +1921,7 @@ - (BOOL)dataController:(ASDataController *)dataController shouldSynchronouslyPro
   if (contentSize.height <= boundsSize.height && contentSize.width <= boundsSize.width) {
     return YES;
   }
-  return NO; // ASCellLayoutModeNone
+  return NO;
 }
 
 - (BOOL)dataControllerShouldSerializeNodeCreation:(ASDataController *)dataController

Tests/ASCollectionViewTests.mm

@@ -163,6 +163,7 @@ - (instancetype)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibB
 @interface ASCollectionView (InternalTesting)
 
 - (NSArray<NSString *> *)dataController:(ASDataController *)dataController supplementaryNodeKindsInSections:(NSIndexSet *)sections;
+- (BOOL)dataController:(ASDataController *)dataController shouldSynchronouslyProcessChangeSet:(_ASHierarchyChangeSet *)changeSet;
 
 @end
 
@@ -1046,18 +1047,15 @@ - (void)_primitiveBatchFetchingFillTestAnimated:(BOOL)animated visible:(BOOL)vis
 
 - (void)testInitialRangeBounds
 {
-  [self testInitialRangeBoundsWithCellLayoutMode:ASCellLayoutModeNone
-           shouldWaitUntilAllUpdatesAreProcessed:YES];
+  [self testInitialRangeBoundsWithCellLayoutMode:ASCellLayoutModeNone];
 }
 
 - (void)testInitialRangeBoundsCellLayoutModeAlwaysAsync
 {
-  [self testInitialRangeBoundsWithCellLayoutMode:ASCellLayoutModeAlwaysAsync
-           shouldWaitUntilAllUpdatesAreProcessed:YES];
+  [self testInitialRangeBoundsWithCellLayoutMode:ASCellLayoutModeAlwaysAsync];
 }
 
 - (void)testInitialRangeBoundsWithCellLayoutMode:(ASCellLayoutMode)cellLayoutMode
-           shouldWaitUntilAllUpdatesAreProcessed:(BOOL)shouldWait
 {
   UIWindow *window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
   ASCollectionViewTestController *testController = [[ASCollectionViewTestController alloc] initWithNibName:nil bundle:nil];
@@ -1073,7 +1071,9 @@ - (void)testInitialRangeBoundsWithCellLayoutMode:(ASCellLayoutMode)cellLayoutMod
   // Trigger the initial reload to start 
   [window layoutIfNeeded];
 
-  if (shouldWait) {
+  // Test the APIs that monitor ASCollectionNode update handling if collection node should
+  // layout asynchronously
+  if (![cn.view dataController:nil shouldSynchronouslyProcessChangeSet:nil]) {
     XCTAssertTrue(cn.isProcessingUpdates, @"ASCollectionNode should still be processing updates after initial layoutIfNeeded call (reloadData)");
 
     [cn onDidFinishProcessingUpdates:^{