Ship ASExperimentalFixRangeController (TextureGroup#1486)

hebertialmeida · May 10, 2019 · d758fc7 · d758fc7
1 parent cdfa08f
commit d758fc7
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 28 deletions.
diff --git a/Schemas/configuration.json b/Schemas/configuration.json
@@ -26,7 +26,6 @@
                     "exp_dispatch_apply",
                     "exp_image_downloader_priority",
                     "exp_text_drawing",
-                    "exp_fix_range_controller",
                     "exp_oom_bg_dealloc_disable",
                     "exp_transaction_operation_retain_cycle",
                     "exp_remove_textkit_initialising_lock"

diff --git a/Source/ASExperimentalFeatures.h b/Source/ASExperimentalFeatures.h
@@ -30,11 +30,10 @@ typedef NS_OPTIONS(NSUInteger, ASExperimentalFeatures) {
   ASExperimentalDispatchApply = 1 << 9,                     // exp_dispatch_apply
   ASExperimentalImageDownloaderPriority = 1 << 10,          // exp_image_downloader_priority
   ASExperimentalTextDrawing = 1 << 11,                      // exp_text_drawing
-  ASExperimentalFixRangeController = 1 << 12,               // exp_fix_range_controller
-  ASExperimentalOOMBackgroundDeallocDisable = 1 << 13,      // exp_oom_bg_dealloc_disable
-  ASExperimentalTransactionOperationRetainCycle = 1 << 14,  // exp_transaction_operation_retain_cycle
-  ASExperimentalRemoveTextKitInitialisingLock = 1 << 15,    // exp_remove_textkit_initialising_lock
-  ASExperimentalDrawingGlobal = 1 << 16,                    // exp_drawing_global
+  ASExperimentalOOMBackgroundDeallocDisable = 1 << 12,      // exp_oom_bg_dealloc_disable
+  ASExperimentalTransactionOperationRetainCycle = 1 << 13,  // exp_transaction_operation_retain_cycle
+  ASExperimentalRemoveTextKitInitialisingLock = 1 << 14,    // exp_remove_textkit_initialising_lock
+  ASExperimentalDrawingGlobal = 1 << 15,                    // exp_drawing_global
   ASExperimentalFeatureAll = 0xFFFFFFFF
 };
 

diff --git a/Source/ASExperimentalFeatures.mm b/Source/ASExperimentalFeatures.mm
@@ -24,7 +24,6 @@
                                       @"exp_dispatch_apply",
                                       @"exp_image_downloader_priority",
                                       @"exp_text_drawing",
-                                      @"exp_fix_range_controller",
                                       @"exp_oom_bg_dealloc_disable",
                                       @"exp_transaction_operation_retain_cycle",
                                       @"exp_remove_textkit_initialising_lock",

diff --git a/Source/Details/ASRangeController.mm b/Source/Details/ASRangeController.mm
@@ -356,29 +356,13 @@ - (void)_updateVisibleNodeIndexPaths
       // DO NOT set Visible: even though these elements are in the visible range / "viewport",
       // our overall container object is itself not yet, or no longer, visible.
       // The moment it becomes visible, we will run the condition above.
-
-      ASInterfaceState interfaceStateBeforeFix = interfaceState;
-      if ([allCurrentIndexPaths containsObject:indexPath]) {
-        interfaceStateBeforeFix |= ASInterfaceStatePreload;
-        if (rangeMode != ASLayoutRangeModeLowMemory) {
-          interfaceStateBeforeFix |= ASInterfaceStateDisplay;
-        }
-      }
-
-      ASInterfaceState interfaceStateAfterFix = interfaceState;
       if ([visibleIndexPaths containsObject:indexPath]) {
-        interfaceStateAfterFix |= ASInterfaceStatePreload;
+        interfaceState |= ASInterfaceStatePreload;
         if (rangeMode != ASLayoutRangeModeLowMemory) {
-          interfaceStateAfterFix |= ASInterfaceStateDisplay;
+          interfaceState |= ASInterfaceStateDisplay;
         }
       } else if ([displayIndexPaths containsObject:indexPath]) {
-        interfaceStateAfterFix |= ASInterfaceStatePreload;
-      }
-
-      if (interfaceStateBeforeFix != interfaceStateAfterFix && ASActivateExperimentalFeature(ASExperimentalFixRangeController)) {
-        interfaceState = interfaceStateAfterFix;
-      } else {
-        interfaceState = interfaceStateBeforeFix;
+        interfaceState |= ASInterfaceStatePreload;
       }
     }
 

diff --git a/Tests/ASConfigurationTests.mm b/Tests/ASConfigurationTests.mm
@@ -30,7 +30,6 @@
   ASExperimentalDispatchApply,
   ASExperimentalImageDownloaderPriority,
   ASExperimentalTextDrawing,
-  ASExperimentalFixRangeController,
   ASExperimentalOOMBackgroundDeallocDisable,
   ASExperimentalTransactionOperationRetainCycle,
   ASExperimentalRemoveTextKitInitialisingLock,
@@ -59,7 +58,6 @@ + (NSArray *)names {
     @"exp_dispatch_apply",
     @"exp_image_downloader_priority",
     @"exp_text_drawing",
-    @"exp_fix_range_controller",
     @"exp_oom_bg_dealloc_disable",
     @"exp_transaction_operation_retain_cycle",
     @"exp_remove_textkit_initialising_lock",