iOS: Fix image instrumentation lifecycle on image cancel

Summary: Internal loggers were not deallocated when images were canceled on RCTImageView

Reviewed By: fkgozali

Differential Revision: D21380284

fbshipit-source-id: 00440cf49708ec03ecd7d9268001aa458ccbf923

Author: p-sun

Libraries/Image/RCTImageLoader.mm

@@ -563,7 +563,7 @@ - (RCTImageURLLoaderRequest *)_loadImageOrDataWithURLRequest:(NSURLRequest *)req
       }
     }
   });
-  
+
   return [[RCTImageURLLoaderRequest alloc] initWithRequestId:requestId imageURL:request.URL cancellationBlock:^{
     BOOL alreadyCancelled = atomic_fetch_or(cancelled.get(), 1);
     if (alreadyCancelled) {
@@ -801,12 +801,24 @@ - (void)trackURLImageVisibilityForRequest:(RCTImageURLLoaderRequest *)loaderRequ
   }
 }
 
+- (void)trackURLImageRequestDidCancel:(RCTImageURLLoaderRequest *)loaderRequest
+{
+  if (!loaderRequest) {
+    return;
+  }
+
+  id<RCTImageURLLoader> loadHandler = [self imageURLLoaderForURL:loaderRequest.imageURL];
+  if ([loadHandler respondsToSelector:@selector(trackURLImageRequestDidCancel:)]) {
+    [(id<RCTImageURLLoaderWithAttribution>)loadHandler trackURLImageRequestDidCancel:loaderRequest];
+  }
+}
+
 - (void)trackURLImageDidDestroy:(RCTImageURLLoaderRequest *)loaderRequest
 {
   if (!loaderRequest) {
     return;
   }
-  
+
   id<RCTImageURLLoader> loadHandler = [self imageURLLoaderForURL:loaderRequest.imageURL];
   if ([loadHandler respondsToSelector:@selector(trackURLImageDidDestroy:)]) {
     [(id<RCTImageURLLoaderWithAttribution>)loadHandler trackURLImageDidDestroy:loaderRequest];

Libraries/Image/RCTImageLoaderWithAttributionProtocol.h

@@ -44,6 +44,11 @@ RCT_EXTERN void RCTEnableImageLoadingPerfInstrumentation(BOOL enabled);
  */
 - (void)trackURLImageVisibilityForRequest:(RCTImageURLLoaderRequest *)loaderRequest imageView:(UIView *)imageView;
 
+/**
+ * Image instrumentation - notify that the request was cancelled.
+ */
+- (void)trackURLImageRequestDidCancel:(RCTImageURLLoaderRequest *)loaderRequest;
+
 /**
  * Image instrumentation - notify that the native image view was destroyed.
  */

Libraries/Image/RCTImageURLLoaderWithAttribution.h

@@ -65,6 +65,11 @@ struct ImageURLLoaderAttribution {
  */
 - (void)trackURLImageVisibilityForRequest:(RCTImageURLLoaderRequest *)loaderRequest imageView:(UIView *)imageView;
 
+/**
+ * Image instrumentation - notify that the request was cancelled.
+ */
+- (void)trackURLImageRequestDidCancel:(RCTImageURLLoaderRequest *)loaderRequest;
+
 /**
  * Image instrumentation - notify that the native image view was destroyed.
  */

Libraries/Image/RCTImageView.mm

@@ -218,9 +218,8 @@ - (void)setResizeMode:(RCTResizeMode)resizeMode
 
 - (void)cancelImageLoad
 {
-  if (_loaderRequest.cancellationBlock) {
-    _loaderRequest.cancellationBlock();
-  }
+  [_loaderRequest cancel];
+  [_imageLoader trackURLImageRequestDidCancel:_loaderRequest];
 
   _loaderRequest = nil;
   _pendingImageSource = nil;