From cf77067f0c4eda30f814aafa45ddf962eadcfbdb Mon Sep 17 00:00:00 2001
From: zhongwuzw <zhongwuzw@qq.com>
Date: Tue, 23 Jul 2019 07:04:34 -0700
Subject: [PATCH] Remove old GIF code (#25636)

Summary:
[After we migrated to new GIF implementation](https://github.com/facebook/react-native/pull/24822), we can remove old implementation now.

## Changelog

[iOS] [Deprecated] - Remove old GIF code
Pull Request resolved: https://github.com/facebook/react-native/pull/25636

Test Plan: GIF still works.

Reviewed By: shergin

Differential Revision: D16280044

Pulled By: osdnk

fbshipit-source-id: 00979280e6c17c93859ce886dd563b0d185c84aa
---
 Libraries/Image/RCTImageLoader.h         |  2 --
 Libraries/Image/RCTImageLoader.m         | 19 +------------------
 Libraries/Image/RCTImageView.m           | 14 +-------------
 Libraries/Image/RCTUIImageViewAnimated.m |  6 +++---
 4 files changed, 5 insertions(+), 36 deletions(-)

diff --git a/Libraries/Image/RCTImageLoader.h b/Libraries/Image/RCTImageLoader.h
index 9e5ff9f8c5de61..1c32eab93f8e1e 100644
--- a/Libraries/Image/RCTImageLoader.h
+++ b/Libraries/Image/RCTImageLoader.h
@@ -52,8 +52,6 @@ typedef dispatch_block_t RCTImageLoaderCancellationBlock;
 
 @interface UIImage (React)
 
-@property (nonatomic, copy) CAKeyframeAnimation *reactKeyframeAnimation;
-
 /**
  * Memory bytes of the image with the default calculation of static image or GIF. Custom calculations of decoded bytes can be assigned manually.
  */
diff --git a/Libraries/Image/RCTImageLoader.m b/Libraries/Image/RCTImageLoader.m
index 6b73c03b844f10..6b80d47f69a90e 100644
--- a/Libraries/Image/RCTImageLoader.m
+++ b/Libraries/Image/RCTImageLoader.m
@@ -22,27 +22,12 @@
 
 static NSInteger RCTImageBytesForImage(UIImage *image)
 {
-  CAKeyframeAnimation *keyFrameAnimation = [image reactKeyframeAnimation];
   NSInteger singleImageBytes = image.size.width * image.size.height * image.scale * image.scale * 4;
-  if (keyFrameAnimation) {
-    return keyFrameAnimation.values.count * singleImageBytes;
-  } else {
-    return image.images ? image.images.count * singleImageBytes : singleImageBytes;
-  }
+  return image.images ? image.images.count * singleImageBytes : singleImageBytes;
 }
 
 @implementation UIImage (React)
 
-- (CAKeyframeAnimation *)reactKeyframeAnimation
-{
-  return objc_getAssociatedObject(self, _cmd);
-}
-
-- (void)setReactKeyframeAnimation:(CAKeyframeAnimation *)reactKeyframeAnimation
-{
-  objc_setAssociatedObject(self, @selector(reactKeyframeAnimation), reactKeyframeAnimation, OBJC_ASSOCIATION_COPY_NONATOMIC);
-}
-
 - (NSInteger)reactDecodedImageBytes
 {
   NSNumber *imageBytes = objc_getAssociatedObject(self, _cmd);
@@ -280,11 +265,9 @@ - (void)setImageCache:(id<RCTImageCache>)cache
       CGSizeEqualToSize(image.size, size)) {
     return image;
   }
-  CAKeyframeAnimation *animation = image.reactKeyframeAnimation;
   CGRect targetSize = RCTTargetRect(image.size, size, scale, resizeMode);
   CGAffineTransform transform = RCTTransformFromTargetRect(image.size, targetSize);
   image = RCTTransformImage(image, size, scale, transform);
-  image.reactKeyframeAnimation = animation;
   return image;
 }
 
diff --git a/Libraries/Image/RCTImageView.m b/Libraries/Image/RCTImageView.m
index 6c1c29fe407328..d014775f8487a4 100644
--- a/Libraries/Image/RCTImageView.m
+++ b/Libraries/Image/RCTImageView.m
@@ -224,7 +224,6 @@ - (void)cancelImageLoad
 - (void)clearImage
 {
   [self cancelImageLoad];
-  [_imageView.layer removeAnimationForKey:@"contents"];
   self.image = nil;
   _imageSource = nil;
 }
@@ -363,18 +362,7 @@ - (void)imageLoaderLoadedImage:(UIImage *)loadedImage error:(NSError *)error for
       self->_pendingImageSource = nil;
     }
 
-    [self->_imageView.layer removeAnimationForKey:@"contents"];
-    if (image.reactKeyframeAnimation) {
-      CGImageRef posterImageRef = (__bridge CGImageRef)[image.reactKeyframeAnimation.values firstObject];
-      if (!posterImageRef) {
-        return;
-      }
-      // Apply renderingMode to animated image.
-      self->_imageView.image = [[UIImage imageWithCGImage:posterImageRef] imageWithRenderingMode:self->_renderingMode];
-      [self->_imageView.layer addAnimation:image.reactKeyframeAnimation forKey:@"contents"];
-    } else {
-      self.image = image;
-    }
+    self.image = image;
 
     if (isPartialLoad) {
       if (self->_onPartialLoad) {
diff --git a/Libraries/Image/RCTUIImageViewAnimated.m b/Libraries/Image/RCTUIImageViewAnimated.m
index 99b5a7bd41ce0b..12b8e756821d5a 100644
--- a/Libraries/Image/RCTUIImageViewAnimated.m
+++ b/Libraries/Image/RCTUIImageViewAnimated.m
@@ -85,11 +85,11 @@ - (void)setImage:(UIImage *)image
   if (self.image == image) {
     return;
   }
+  
+  [self stop];
+  [self resetAnimatedImage];
 
   if ([image respondsToSelector:@selector(animatedImageFrameAtIndex:)]) {
-    [self stop];
-    [self resetAnimatedImage];
-    
     NSUInteger animatedImageFrameCount = ((UIImage<RCTAnimatedImage> *)image).animatedImageFrameCount;
     
     // In case frame count is 0, there is no reason to continue.