From 01143859ffd46b024fc2ec086192f7095a8a33bb Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Tue, 15 Oct 2019 16:12:53 -0700
Subject: [PATCH] Fabric: Simplifying RCTImageResponseObserverProxy interface

Summary: There is no reason why RCTImageResponseObserverProxy accepts untyped pointer. This diff fixes that. The call sites now look much cleaner.

Reviewed By: sammy-SC

Differential Revision: D17923552

fbshipit-source-id: b08556e1164b00c9cf2676c0d9b1718ae60b2aca
---
 .../ComponentViews/Image/RCTImageComponentView.mm         | 2 +-
 .../ComponentViews/Slider/RCTSliderComponentView.mm       | 8 ++++----
 React/Fabric/RCTImageResponseObserverProxy.h              | 2 +-
 React/Fabric/RCTImageResponseObserverProxy.mm             | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.mm b/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.mm
index 8a8752a4ccf..d88ffbf259a 100644
--- a/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.mm
@@ -39,7 +39,7 @@
 
     _imageView.contentMode = (UIViewContentMode)RCTResizeModeFromImageResizeMode(defaultProps->resizeMode);
 
-    _imageResponseObserverProxy = std::make_unique<RCTImageResponseObserverProxy>((__bridge void *)self);
+    _imageResponseObserverProxy = std::make_unique<RCTImageResponseObserverProxy>(self);
 
     self.contentView = _imageView;
   }
diff --git a/React/Fabric/Mounting/ComponentViews/Slider/RCTSliderComponentView.mm b/React/Fabric/Mounting/ComponentViews/Slider/RCTSliderComponentView.mm
index 40928326462..c708037c195 100644
--- a/React/Fabric/Mounting/ComponentViews/Slider/RCTSliderComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/Slider/RCTSliderComponentView.mm
@@ -55,10 +55,10 @@ using namespace facebook::react;
 
     _sliderView.value = defaultProps->value;
 
-    _trackImageResponseObserverProxy = std::make_unique<RCTImageResponseObserverProxy>((__bridge void *)self);
-    _minimumTrackImageResponseObserverProxy = std::make_unique<RCTImageResponseObserverProxy>((__bridge void *)self);
-    _maximumTrackImageResponseObserverProxy = std::make_unique<RCTImageResponseObserverProxy>((__bridge void *)self);
-    _thumbImageResponseObserverProxy = std::make_unique<RCTImageResponseObserverProxy>((__bridge void *)self);
+    _trackImageResponseObserverProxy = std::make_unique<RCTImageResponseObserverProxy>(self);
+    _minimumTrackImageResponseObserverProxy = std::make_unique<RCTImageResponseObserverProxy>(self);
+    _maximumTrackImageResponseObserverProxy = std::make_unique<RCTImageResponseObserverProxy>(self);
+    _thumbImageResponseObserverProxy = std::make_unique<RCTImageResponseObserverProxy>(self);
 
     self.contentView = _sliderView;
   }
diff --git a/React/Fabric/RCTImageResponseObserverProxy.h b/React/Fabric/RCTImageResponseObserverProxy.h
index a8f50b06400..63de2b783ac 100644
--- a/React/Fabric/RCTImageResponseObserverProxy.h
+++ b/React/Fabric/RCTImageResponseObserverProxy.h
@@ -18,7 +18,7 @@ namespace react {
 
 class RCTImageResponseObserverProxy final : public ImageResponseObserver {
  public:
-  RCTImageResponseObserverProxy(void *delegate);
+  RCTImageResponseObserverProxy(id<RCTImageResponseDelegate> delegate);
 
   void didReceiveImage(ImageResponse const &imageResponse) const override;
   void didReceiveProgress(float progress) const override;
diff --git a/React/Fabric/RCTImageResponseObserverProxy.mm b/React/Fabric/RCTImageResponseObserverProxy.mm
index 2fb0f031e0c..e7c1faf334e 100644
--- a/React/Fabric/RCTImageResponseObserverProxy.mm
+++ b/React/Fabric/RCTImageResponseObserverProxy.mm
@@ -14,8 +14,8 @@
 namespace facebook {
 namespace react {
 
-RCTImageResponseObserverProxy::RCTImageResponseObserverProxy(void *delegate)
-    : delegate_((__bridge id<RCTImageResponseDelegate>)delegate)
+RCTImageResponseObserverProxy::RCTImageResponseObserverProxy(id<RCTImageResponseDelegate> delegate)
+    : delegate_(delegate)
 {
 }