Remove experimental features (exp_skip_a11y_wait && exp_new_default_c…

…ell_layout_mode) (#1383) * Remove experimental features * prevent blocking main thread * remove small content all together as none is the default * Update ASExperimentalFeatures.h
TextureGroup · Mar 11, 2019 · 6f44c39 · 6f44c39
1 parent 32a2ebf
commit 6f44c39
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 66 deletions.
diff --git a/Schemas/configuration.json b/Schemas/configuration.json
@@ -23,8 +23,6 @@
                     "exp_skip_clear_data",
                     "exp_did_enter_preload_skip_asm_layout",
                     "exp_disable_a11y_cache",
-                    "exp_skip_a11y_wait",
-                    "exp_new_default_cell_layout_mode",
                     "exp_dispatch_apply",
                     "exp_image_downloader_priority",
                     "exp_text_drawing"

diff --git a/Source/ASCollectionView.mm b/Source/ASCollectionView.mm
@@ -318,12 +318,6 @@ - (instancetype)_initWithFrame:(CGRect)frame collectionViewLayout:(UICollectionV
 
   [self _configureCollectionViewLayout:layout];
 
-  if (ASActivateExperimentalFeature(ASExperimentalNewDefaultCellLayoutMode)) {
-    _cellLayoutMode = ASCellLayoutModeSyncForSmallContent;
-  } else {
-    _cellLayoutMode = ASCellLayoutModeNone;
-  }
-
   return self;
 }
 
@@ -1912,20 +1906,18 @@ - (BOOL)dataController:(ASDataController *)dataController shouldSynchronouslyPro
   if (ASCellLayoutModeIncludes(ASCellLayoutModeAlwaysAsync)) {
     return NO;
   }
-  if (ASCellLayoutModeIncludes(ASCellLayoutModeSyncForSmallContent)) {
-    // Reload data is expensive, don't block main while doing so.
-    if (changeSet.includesReloadData) {
-      return NO;
-    }
-    // If we have very few ASCellNodes (besides UIKit passthrough ones), match UIKit by blocking.
-    if (changeSet.countForAsyncLayout < 2) {
-      return YES;
-    }
-    CGSize contentSize = self.contentSize;
-    CGSize boundsSize = self.bounds.size;
-    if (contentSize.height <= boundsSize.height && contentSize.width <= boundsSize.width) {
-      return YES;
-    }
+  // Reload data is expensive, don't block main while doing so.
+  if (changeSet.includesReloadData) {
+    return NO;
+  }
+  // If we have very few ASCellNodes (besides UIKit passthrough ones), match UIKit by blocking.
+  if (changeSet.countForAsyncLayout < 2) {
+    return YES;
+  }
+  CGSize contentSize = self.contentSize;
+  CGSize boundsSize = self.bounds.size;
+  if (contentSize.height <= boundsSize.height && contentSize.width <= boundsSize.width) {
+    return YES;
   }
   return NO; // ASCellLayoutModeNone
 }
@@ -2520,9 +2512,7 @@ - (void)setPrefetchingEnabled:(BOOL)prefetchingEnabled
 
 - (NSArray *)accessibilityElements
 {
-  if (!ASActivateExperimentalFeature(ASExperimentalSkipAccessibilityWait)) {
-    [self waitUntilAllUpdatesAreCommitted];
-  }
+  [self waitUntilAllUpdatesAreCommitted];
   return [super accessibilityElements];
 }
 

diff --git a/Source/ASCollectionViewProtocols.h b/Source/ASCollectionViewProtocols.h
@@ -46,12 +46,6 @@ typedef NS_OPTIONS(NSUInteger, ASCellLayoutMode) {
    * cell height animations are desired.
    */
   ASCellLayoutModeAlwaysBatchUpdateSectionReload = 1 << 9, // Default OFF
-
-  /**
-   * If ASCellLayoutModeSyncForSmallContent is enabled it will cause ASDataController to wait on the
-   * background queue if the amount of new content is small.
-   */
-  ASCellLayoutModeSyncForSmallContent = 1 << 10,
 };
 
 NS_ASSUME_NONNULL_BEGIN

diff --git a/Source/ASExperimentalFeatures.h b/Source/ASExperimentalFeatures.h
@@ -27,12 +27,10 @@ typedef NS_OPTIONS(NSUInteger, ASExperimentalFeatures) {
   ASExperimentalFramesetterCache = 1 << 6,                  // exp_framesetter_cache
   ASExperimentalSkipClearData = 1 << 7,                     // exp_skip_clear_data
   ASExperimentalDidEnterPreloadSkipASMLayout = 1 << 8,      // exp_did_enter_preload_skip_asm_layout
-  ASExperimentalDisableAccessibilityCache = 1 << 9,        // exp_disable_a11y_cache
-  ASExperimentalSkipAccessibilityWait = 1 << 10,            // exp_skip_a11y_wait
-  ASExperimentalNewDefaultCellLayoutMode = 1 << 11,         // exp_new_default_cell_layout_mode
-  ASExperimentalDispatchApply = 1 << 12,                    // exp_dispatch_apply
-  ASExperimentalImageDownloaderPriority = 1 << 13,          // exp_image_downloader_priority
-  ASExperimentalTextDrawing = 1 << 14,                      // exp_text_drawing
+  ASExperimentalDisableAccessibilityCache = 1 << 9,         // exp_disable_a11y_cache
+  ASExperimentalDispatchApply = 1 << 10,                    // exp_dispatch_apply
+  ASExperimentalImageDownloaderPriority = 1 << 11,          // exp_image_downloader_priority
+  ASExperimentalTextDrawing = 1 << 12,                      // exp_text_drawing
   ASExperimentalFeatureAll = 0xFFFFFFFF
 };
 

diff --git a/Source/ASExperimentalFeatures.mm b/Source/ASExperimentalFeatures.mm
@@ -22,8 +22,6 @@
                                       @"exp_skip_clear_data",
                                       @"exp_did_enter_preload_skip_asm_layout",
                                       @"exp_disable_a11y_cache",
-                                      @"exp_skip_a11y_wait",
-                                      @"exp_new_default_cell_layout_mode",
                                       @"exp_dispatch_apply",
                                       @"exp_image_downloader_priority",
                                       @"exp_text_drawing"]));

diff --git a/Source/ASTableView.mm b/Source/ASTableView.mm
@@ -1703,20 +1703,18 @@ - (BOOL)dataControllerShouldSerializeNodeCreation:(ASDataController *)dataContro
 
 - (BOOL)dataController:(ASDataController *)dataController shouldSynchronouslyProcessChangeSet:(_ASHierarchyChangeSet *)changeSet
 {
-  if (ASActivateExperimentalFeature(ASExperimentalNewDefaultCellLayoutMode)) {
-    // Reload data is expensive, don't block main while doing so.
-    if (changeSet.includesReloadData) {
-      return NO;
-    }
-    // For more details on this method, see the comment in the ASCollectionView implementation.
-    if (changeSet.countForAsyncLayout < 2) {
-      return YES;
-    }
-    CGSize contentSize = self.contentSize;
-    CGSize boundsSize = self.bounds.size;
-    if (contentSize.height <= boundsSize.height && contentSize.width <= boundsSize.width) {
-      return YES;
-    }
+  // Reload data is expensive, don't block main while doing so.
+  if (changeSet.includesReloadData) {
+    return NO;
+  }
+  // For more details on this method, see the comment in the ASCollectionView implementation.
+  if (changeSet.countForAsyncLayout < 2) {
+    return YES;
+  }
+  CGSize contentSize = self.contentSize;
+  CGSize boundsSize = self.bounds.size;
+  if (contentSize.height <= boundsSize.height && contentSize.width <= boundsSize.width) {
+    return YES;
   }
   return NO;
 }
@@ -2036,9 +2034,7 @@ - (void)didMoveToSuperview
 
 - (NSArray *)accessibilityElements
 {
-  if (!ASActivateExperimentalFeature(ASExperimentalSkipAccessibilityWait)) {
-    [self waitUntilAllUpdatesAreCommitted];
-  }
+  [self waitUntilAllUpdatesAreCommitted];
   return [super accessibilityElements];
 }
 

diff --git a/Tests/ASCollectionViewTests.mm b/Tests/ASCollectionViewTests.mm
@@ -1050,12 +1050,6 @@ - (void)testInitialRangeBounds
            shouldWaitUntilAllUpdatesAreProcessed:YES];
 }
 
-- (void)testInitialRangeBoundsCellLayoutModeSyncForSmallContent
-{
-  [self testInitialRangeBoundsWithCellLayoutMode:ASCellLayoutModeSyncForSmallContent
-           shouldWaitUntilAllUpdatesAreProcessed:YES]; // Need to wait because the first initial data load is always async
-}
-
 - (void)testInitialRangeBoundsCellLayoutModeAlwaysAsync
 {
   [self testInitialRangeBoundsWithCellLayoutMode:ASCellLayoutModeAlwaysAsync

diff --git a/Tests/ASConfigurationTests.mm b/Tests/ASConfigurationTests.mm
@@ -28,8 +28,6 @@
   ASExperimentalSkipClearData,
   ASExperimentalDidEnterPreloadSkipASMLayout,
   ASExperimentalDisableAccessibilityCache,
-  ASExperimentalSkipAccessibilityWait,
-  ASExperimentalNewDefaultCellLayoutMode,
   ASExperimentalDispatchApply,
   ASExperimentalImageDownloaderPriority,
   ASExperimentalTextDrawing
@@ -55,8 +53,6 @@ + (NSArray *)names {
     @"exp_skip_clear_data",
     @"exp_did_enter_preload_skip_asm_layout",
     @"exp_disable_a11y_cache",
-    @"exp_skip_a11y_wait",
-    @"exp_new_default_cell_layout_mode",
     @"exp_dispatch_apply",
     @"exp_image_downloader_priority",
     @"exp_text_drawing"