From 9d5ca3647a25c2c60a51b00635dcb246c4ff3a1e Mon Sep 17 00:00:00 2001 From: Samuel Susla Date: Wed, 3 May 2023 22:37:11 -0700 Subject: [PATCH] Delete ImageRequest::~ImageRequest (#37222) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/37222 changelog: [internal] User defined destructor does not make sense here. ImageRequest is owned by ImageState, which is owned by ImageShadowNode. ImageShadowNode requires garbage collection from the runtime to be destroyed. Calling cancel in dtor is not deterministic and that is undesired. bypass-github-export-checks Reviewed By: javache Differential Revision: D45524705 fbshipit-source-id: 410def2100f479b68682620b2c43071fdfb86715 --- .../ReactCommon/react/renderer/imagemanager/ImageRequest.h | 2 -- .../cxx/react/renderer/imagemanager/ImageRequest.cpp | 4 ---- .../ios/react/renderer/imagemanager/ImageRequest.cpp | 6 ------ 3 files changed, 12 deletions(-) diff --git a/packages/react-native/ReactCommon/react/renderer/imagemanager/ImageRequest.h b/packages/react-native/ReactCommon/react/renderer/imagemanager/ImageRequest.h index 092b208bb0c..d3dbee8bdeb 100644 --- a/packages/react-native/ReactCommon/react/renderer/imagemanager/ImageRequest.h +++ b/packages/react-native/ReactCommon/react/renderer/imagemanager/ImageRequest.h @@ -42,8 +42,6 @@ class ImageRequest final { */ ImageRequest(const ImageRequest &other) = delete; - ~ImageRequest(); - /** * Set cancelation function. */ diff --git a/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/cxx/react/renderer/imagemanager/ImageRequest.cpp b/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/cxx/react/renderer/imagemanager/ImageRequest.cpp index 72a46b7a153..a502f65d9c3 100644 --- a/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/cxx/react/renderer/imagemanager/ImageRequest.cpp +++ b/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/cxx/react/renderer/imagemanager/ImageRequest.cpp @@ -18,10 +18,6 @@ ImageRequest::ImageRequest( // Not implemented. } -ImageRequest::~ImageRequest() { - // Not implemented. -} - const ImageResponseObserverCoordinator &ImageRequest::getObserverCoordinator() const { // Not implemented diff --git a/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/ImageRequest.cpp b/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/ImageRequest.cpp index c9b60383ef2..01e65d6353c 100644 --- a/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/ImageRequest.cpp +++ b/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/ImageRequest.cpp @@ -17,12 +17,6 @@ ImageRequest::ImageRequest( coordinator_ = std::make_shared(); } -ImageRequest::~ImageRequest() { - if (cancelRequest_) { - cancelRequest_(); - } -} - void ImageRequest::setCancelationFunction( std::function cancelationFunction) { cancelRequest_ = cancelationFunction;