Move cancelRequest_ in move ctor in ImageRequest (facebook#37221)

Summary: Pull Request resolved: facebook#37221 changelog: [internal] Add missing cancelRequest_ std::move. Reviewed By: javache, cortinico Differential Revision: D45524704 fbshipit-source-id: 0cc5c30c2696be058306e08f137fd90288578a38
sammy-SC · May 4, 2023 · 677e2d3 · 677e2d3
1 parent c52f38e
commit 677e2d3
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 18 deletions.
diff --git 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/...mon/react/renderer/imagemanager/platform/cxx/react/renderer/imagemanager/ImageRequest.cpp b/...mon/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/...mon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/ImageRequest.cpp b/...mon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/ImageRequest.cpp
@@ -16,16 +16,6 @@ ImageRequest::ImageRequest(
   coordinator_ = std::make_shared<ImageResponseObserverCoordinator>();
 }
 
-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_();