Cover the other background dealloc surfaces (TextureGroup#1464)

hebertialmeida · May 10, 2019 · 7757a60 · 7757a60
1 parent 1a7fdb8
commit 7757a60
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Source/ASImageNode+AnimatedImage.mm b/Source/ASImageNode+AnimatedImage.mm
@@ -84,7 +84,7 @@ - (void)_locked_setAnimatedImage:(id <ASAnimatedImageProtocol>)animatedImage
     [self animatedImageSet:animatedImage previousAnimatedImage:previousAnimatedImage];
 
     // Animated image can take while to dealloc, do it off the main queue
-    if (previousAnimatedImage != nil) {
+    if (previousAnimatedImage != nil && ASActivateExperimentalFeature(ASExperimentalOOMBackgroundDeallocDisable) == NO) {
       ASPerformBackgroundDeallocation(&previousAnimatedImage);
     }
   });

diff --git a/Source/ASImageNode.mm b/Source/ASImageNode.mm
@@ -268,7 +268,7 @@ - (void)_locked_setImage:(UIImage *)image
   CGSize oldImageSize = oldImage.size;
   BOOL shouldReleaseImageOnBackgroundThread = oldImageSize.width > kMinReleaseImageOnBackgroundSize.width
                                               || oldImageSize.height > kMinReleaseImageOnBackgroundSize.height;
-  if (shouldReleaseImageOnBackgroundThread) {
+  if (shouldReleaseImageOnBackgroundThread && ASActivateExperimentalFeature(ASExperimentalOOMBackgroundDeallocDisable) == NO) {
     ASPerformBackgroundDeallocation(&oldImage);
   }
 }

diff --git a/Source/ASMultiplexImageNode.mm b/Source/ASMultiplexImageNode.mm
@@ -548,7 +548,7 @@ - (void)_clearImage
   BOOL shouldReleaseImageOnBackgroundThread = imageSize.width > kMinReleaseImageOnBackgroundSize.width ||
   imageSize.height > kMinReleaseImageOnBackgroundSize.height;
   [self _setImage:nil];
-  if (shouldReleaseImageOnBackgroundThread) {
+  if (shouldReleaseImageOnBackgroundThread && ASActivateExperimentalFeature(ASExperimentalOOMBackgroundDeallocDisable) == NO) {
     ASPerformBackgroundDeallocation(&image);
   }
 }