Remove ASExperimentalTransactionOperationRetainCycle (TextureGroup#1547)

* Remove ASExperimentalTransactionOperationRetainCycle
yclod · Jun 13, 2019 · c67acab · c67acab
1 parent 2de8eec
commit c67acab
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 67 deletions.
diff --git a/Schemas/configuration.json b/Schemas/configuration.json
@@ -24,7 +24,6 @@
                     "exp_did_enter_preload_skip_asm_layout",
                     "exp_dispatch_apply",
                     "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
@@ -28,9 +28,8 @@ typedef NS_OPTIONS(NSUInteger, ASExperimentalFeatures) {
   ASExperimentalDidEnterPreloadSkipASMLayout = 1 << 7,      // exp_did_enter_preload_skip_asm_layout
   ASExperimentalDispatchApply = 1 << 8,                     // exp_dispatch_apply
   ASExperimentalOOMBackgroundDeallocDisable = 1 << 9,      // exp_oom_bg_dealloc_disable
-  ASExperimentalTransactionOperationRetainCycle = 1 << 10,  // exp_transaction_operation_retain_cycle
-  ASExperimentalRemoveTextKitInitialisingLock = 1 << 11,    // exp_remove_textkit_initialising_lock
-  ASExperimentalDrawingGlobal = 1 << 12,                    // exp_drawing_global
+  ASExperimentalRemoveTextKitInitialisingLock = 1 << 10,    // exp_remove_textkit_initialising_lock
+  ASExperimentalDrawingGlobal = 1 << 11,                    // exp_drawing_global
   ASExperimentalFeatureAll = 0xFFFFFFFF
 };
 

diff --git a/Source/ASExperimentalFeatures.mm b/Source/ASExperimentalFeatures.mm
@@ -22,7 +22,6 @@
                                       @"exp_did_enter_preload_skip_asm_layout",
                                       @"exp_dispatch_apply",
                                       @"exp_oom_bg_dealloc_disable",
-                                      @"exp_transaction_operation_retain_cycle",
                                       @"exp_remove_textkit_initialising_lock",
                                       @"exp_drawing_global"]));
   if (flags == ASExperimentalFeatureAll) {

diff --git a/Source/Details/Transactions/_ASAsyncTransactionContainer.mm b/Source/Details/Transactions/_ASAsyncTransactionContainer.mm
@@ -56,33 +56,18 @@ - (_ASAsyncTransaction *)asyncdisplaykit_asyncTransaction
       self.asyncdisplaykit_asyncLayerTransactions = transactions;
     }
     __weak CALayer *weakSelf = self;
-    if (ASActivateExperimentalFeature(ASExperimentalTransactionOperationRetainCycle)) {
-      transaction = [[_ASAsyncTransaction alloc] initWithCompletionBlock:^(_ASAsyncTransaction *completedTransaction, BOOL cancelled) {
-        __strong CALayer *self = weakSelf;
-        if (self == nil) {
-          return;
-        }
-        [self.asyncdisplaykit_asyncLayerTransactions removeObject:completedTransaction];
-        if (self.asyncdisplaykit_asyncLayerTransactions.count == 0) {
-          // Reclaim object memory.
-          self.asyncdisplaykit_asyncLayerTransactions = nil;
-        }
-        [self asyncdisplaykit_asyncTransactionContainerDidCompleteTransaction:completedTransaction];
-      }];
-    } else {
-      transaction = [[_ASAsyncTransaction alloc] initWithCompletionBlock:^(_ASAsyncTransaction *completedTransaction, BOOL cancelled) {
-        __strong CALayer *self = weakSelf;
-        if (self == nil) {
-          return;
-        }
-        [transactions removeObject:completedTransaction];
-        if (transactions.count == 0) {
-          // Reclaim object memory.
-          self.asyncdisplaykit_asyncLayerTransactions = nil;
-        }
-        [self asyncdisplaykit_asyncTransactionContainerDidCompleteTransaction:completedTransaction];
-      }];
-    }
+    transaction = [[_ASAsyncTransaction alloc] initWithCompletionBlock:^(_ASAsyncTransaction *completedTransaction, BOOL cancelled) {
+      __strong CALayer *self = weakSelf;
+      if (self == nil) {
+        return;
+      }
+      [self.asyncdisplaykit_asyncLayerTransactions removeObject:completedTransaction];
+      if (self.asyncdisplaykit_asyncLayerTransactions.count == 0) {
+        // Reclaim object memory.
+        self.asyncdisplaykit_asyncLayerTransactions = nil;
+      }
+      [self asyncdisplaykit_asyncTransactionContainerDidCompleteTransaction:completedTransaction];
+    }];
     [transactions addObject:transaction];
     self.asyncdisplaykit_currentAsyncTransaction = transaction;
     [self asyncdisplaykit_asyncTransactionContainerWillBeginTransaction:transaction];

diff --git a/Tests/ASConfigurationTests.mm b/Tests/ASConfigurationTests.mm
@@ -28,7 +28,6 @@
   ASExperimentalDidEnterPreloadSkipASMLayout,
   ASExperimentalDispatchApply,
   ASExperimentalOOMBackgroundDeallocDisable,
-  ASExperimentalTransactionOperationRetainCycle,
   ASExperimentalRemoveTextKitInitialisingLock,
   ASExperimentalDrawingGlobal
 };
@@ -53,7 +52,6 @@ + (NSArray *)names {
     @"exp_did_enter_preload_skip_asm_layout",
     @"exp_dispatch_apply",
     @"exp_oom_bg_dealloc_disable",
-    @"exp_transaction_operation_retain_cycle",
     @"exp_remove_textkit_initialising_lock",
     @"exp_drawing_global"
   ];

diff --git a/Tests/ASTransactionTests.mm b/Tests/ASTransactionTests.mm
@@ -52,41 +52,8 @@ - (void)testWeakWhenCancelled
   XCTAssertNil(weakTransaction);
 }
 
-- (void)testWeakWithSingleOperation_noExperiment
-{
-  __weak _ASAsyncTransaction* weakTransaction = nil;
-  @autoreleasepool {
-    CALayer *layer = [[CALayer alloc] init];
-    _ASAsyncTransaction *transaction = layer.asyncdisplaykit_asyncTransaction;
-
-    [transaction addOperationWithBlock:^id<NSObject> _Nullable{
-      return nil;
-    } priority:1
-                                 queue:dispatch_get_main_queue()
-                            completion:^(id  _Nullable value, BOOL canceled) {
-                              ;
-                            }];
-
-    weakTransaction = transaction;
-    layer = nil;
-  }
-
-  // held by main transaction group
-  XCTAssertNotNil(weakTransaction);
-
-  // run so that transaction group drains.
-  static NSTimeInterval delay = 0.1;
-  [[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:delay]];
-
-  XCTAssertNotNil(weakTransaction); // Oops! Experiment will fix this.
-}
-
 - (void)testWeakWithSingleOperation
 {
-  ASConfiguration *config = [[ASConfiguration alloc] initWithDictionary:nil];
-  config.experimentalFeatures = ASExperimentalTransactionOperationRetainCycle;
-  [ASConfigurationManager test_resetWithConfiguration:config];
-
   __weak _ASAsyncTransaction* weakTransaction = nil;
   @autoreleasepool {
     CALayer *layer = [[CALayer alloc] init];