Skip to content

Commit cf77067

Browse files
zhongwuzwfacebook-github-bot
authored andcommitted
Remove old GIF code (facebook#25636)
Summary: [After we migrated to new GIF implementation](facebook#24822), we can remove old implementation now. ## Changelog [iOS] [Deprecated] - Remove old GIF code Pull Request resolved: facebook#25636 Test Plan: GIF still works. Reviewed By: shergin Differential Revision: D16280044 Pulled By: osdnk fbshipit-source-id: 00979280e6c17c93859ce886dd563b0d185c84aa
1 parent 84f5ebe commit cf77067

File tree

4 files changed

+5
-36
lines changed

4 files changed

+5
-36
lines changed

Libraries/Image/RCTImageLoader.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@ typedef dispatch_block_t RCTImageLoaderCancellationBlock;
5252

5353
@interface UIImage (React)
5454

55-
@property (nonatomic, copy) CAKeyframeAnimation *reactKeyframeAnimation;
56-
5755
/**
5856
* Memory bytes of the image with the default calculation of static image or GIF. Custom calculations of decoded bytes can be assigned manually.
5957
*/

Libraries/Image/RCTImageLoader.m

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -22,27 +22,12 @@
2222

2323
static NSInteger RCTImageBytesForImage(UIImage *image)
2424
{
25-
CAKeyframeAnimation *keyFrameAnimation = [image reactKeyframeAnimation];
2625
NSInteger singleImageBytes = image.size.width * image.size.height * image.scale * image.scale * 4;
27-
if (keyFrameAnimation) {
28-
return keyFrameAnimation.values.count * singleImageBytes;
29-
} else {
30-
return image.images ? image.images.count * singleImageBytes : singleImageBytes;
31-
}
26+
return image.images ? image.images.count * singleImageBytes : singleImageBytes;
3227
}
3328

3429
@implementation UIImage (React)
3530

36-
- (CAKeyframeAnimation *)reactKeyframeAnimation
37-
{
38-
return objc_getAssociatedObject(self, _cmd);
39-
}
40-
41-
- (void)setReactKeyframeAnimation:(CAKeyframeAnimation *)reactKeyframeAnimation
42-
{
43-
objc_setAssociatedObject(self, @selector(reactKeyframeAnimation), reactKeyframeAnimation, OBJC_ASSOCIATION_COPY_NONATOMIC);
44-
}
45-
4631
- (NSInteger)reactDecodedImageBytes
4732
{
4833
NSNumber *imageBytes = objc_getAssociatedObject(self, _cmd);
@@ -280,11 +265,9 @@ - (void)setImageCache:(id<RCTImageCache>)cache
280265
CGSizeEqualToSize(image.size, size)) {
281266
return image;
282267
}
283-
CAKeyframeAnimation *animation = image.reactKeyframeAnimation;
284268
CGRect targetSize = RCTTargetRect(image.size, size, scale, resizeMode);
285269
CGAffineTransform transform = RCTTransformFromTargetRect(image.size, targetSize);
286270
image = RCTTransformImage(image, size, scale, transform);
287-
image.reactKeyframeAnimation = animation;
288271
return image;
289272
}
290273

Libraries/Image/RCTImageView.m

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,6 @@ - (void)cancelImageLoad
224224
- (void)clearImage
225225
{
226226
[self cancelImageLoad];
227-
[_imageView.layer removeAnimationForKey:@"contents"];
228227
self.image = nil;
229228
_imageSource = nil;
230229
}
@@ -363,18 +362,7 @@ - (void)imageLoaderLoadedImage:(UIImage *)loadedImage error:(NSError *)error for
363362
self->_pendingImageSource = nil;
364363
}
365364

366-
[self->_imageView.layer removeAnimationForKey:@"contents"];
367-
if (image.reactKeyframeAnimation) {
368-
CGImageRef posterImageRef = (__bridge CGImageRef)[image.reactKeyframeAnimation.values firstObject];
369-
if (!posterImageRef) {
370-
return;
371-
}
372-
// Apply renderingMode to animated image.
373-
self->_imageView.image = [[UIImage imageWithCGImage:posterImageRef] imageWithRenderingMode:self->_renderingMode];
374-
[self->_imageView.layer addAnimation:image.reactKeyframeAnimation forKey:@"contents"];
375-
} else {
376-
self.image = image;
377-
}
365+
self.image = image;
378366

379367
if (isPartialLoad) {
380368
if (self->_onPartialLoad) {

Libraries/Image/RCTUIImageViewAnimated.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,11 @@ - (void)setImage:(UIImage *)image
8585
if (self.image == image) {
8686
return;
8787
}
88+
89+
[self stop];
90+
[self resetAnimatedImage];
8891

8992
if ([image respondsToSelector:@selector(animatedImageFrameAtIndex:)]) {
90-
[self stop];
91-
[self resetAnimatedImage];
92-
9393
NSUInteger animatedImageFrameCount = ((UIImage<RCTAnimatedImage> *)image).animatedImageFrameCount;
9494

9595
// In case frame count is 0, there is no reason to continue.

0 commit comments

Comments
 (0)