From 9132d7aad97f2e0843f8b40a748b2fccb7eda219 Mon Sep 17 00:00:00 2001 From: Samuel Susla Date: Wed, 3 May 2023 22:37:11 -0700 Subject: [PATCH] Move cancelRequest_ in move ctor in ImageRequest (#37221) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/37221 changelog: [internal] Add missing cancelRequest_ std::move. bypass-github-export-checks Reviewed By: javache, cortinico Differential Revision: D45524704 fbshipit-source-id: 1dd0d627549dab353872654d78f7b59d1b2d7174 --- .../react/renderer/imagemanager/ImageRequest.h | 2 +- .../cxx/react/renderer/imagemanager/ImageRequest.cpp | 7 ------- .../ios/react/renderer/imagemanager/ImageRequest.cpp | 10 ---------- 3 files changed, 1 insertion(+), 18 deletions(-) diff --git a/packages/react-native/ReactCommon/react/renderer/imagemanager/ImageRequest.h b/packages/react-native/ReactCommon/react/renderer/imagemanager/ImageRequest.h index eaf4b1f6bf3..2e5ca46d87b 100644 --- a/packages/react-native/ReactCommon/react/renderer/imagemanager/ImageRequest.h +++ b/packages/react-native/ReactCommon/react/renderer/imagemanager/ImageRequest.h @@ -34,7 +34,7 @@ class ImageRequest final { /* * The move constructor. */ - ImageRequest(ImageRequest &&other) noexcept; + ImageRequest(ImageRequest &&other) noexcept = default; /* * `ImageRequest` does not support copying by design. 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 ce53a1b65ca..72a46b7a153 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,13 +18,6 @@ ImageRequest::ImageRequest( // Not implemented. } -ImageRequest::ImageRequest(ImageRequest &&other) noexcept - : imageSource_(std::move(other.imageSource_)), - telemetry_(std::move(other.telemetry_)), - coordinator_(std::move(other.coordinator_)) { - // Not implemented. -} - ImageRequest::~ImageRequest() { // 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 e073cc6dfff..d0739947a9f 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 @@ -16,16 +16,6 @@ ImageRequest::ImageRequest( coordinator_ = std::make_shared(); } -ImageRequest::ImageRequest(ImageRequest &&other) noexcept - : imageSource_(std::move(other.imageSource_)), - telemetry_(std::move(other.telemetry_)), - coordinator_(std::move(other.coordinator_)) { - other.coordinator_ = nullptr; - other.cancelRequest_ = nullptr; - other.telemetry_ = nullptr; - other.imageSource_ = {}; -} - ImageRequest::~ImageRequest() { if (cancelRequest_) { cancelRequest_();