diff --git a/ReactCommon/fabric/components/image/ImageComponentDescriptor.h b/ReactCommon/fabric/components/image/ImageComponentDescriptor.h index d749e3be0..07e50dc50 100644 --- a/ReactCommon/fabric/components/image/ImageComponentDescriptor.h +++ b/ReactCommon/fabric/components/image/ImageComponentDescriptor.h @@ -24,7 +24,7 @@ class ImageComponentDescriptor final: public: ImageComponentDescriptor(SharedEventDispatcher eventDispatcher, const SharedContextContainer &contextContainer): ConcreteComponentDescriptor(eventDispatcher), - imageManager_(contextContainer->getInstance()) {} + imageManager_(contextContainer ? contextContainer->getInstance() : nullptr) {} void adopt(UnsharedShadowNode shadowNode) const override { ConcreteComponentDescriptor::adopt(shadowNode); diff --git a/ReactCommon/fabric/imagemanager/ImageRequest.cpp b/ReactCommon/fabric/imagemanager/ImageRequest.cpp index c95731d96..4b9ad39b3 100644 --- a/ReactCommon/fabric/imagemanager/ImageRequest.cpp +++ b/ReactCommon/fabric/imagemanager/ImageRequest.cpp @@ -17,6 +17,8 @@ public: std::logic_error("Image no longer needed.") {} }; +ImageRequest::ImageRequest() {} + ImageRequest::ImageRequest(const ImageSource &imageSource, folly::Future &&responseFuture): imageSource_(imageSource), responseFutureSplitter_(folly::splitFuture(std::move(responseFuture))) {} diff --git a/ReactCommon/fabric/imagemanager/ImageRequest.h b/ReactCommon/fabric/imagemanager/ImageRequest.h index 3c9e5afd9..6b4eed864 100644 --- a/ReactCommon/fabric/imagemanager/ImageRequest.h +++ b/ReactCommon/fabric/imagemanager/ImageRequest.h @@ -41,6 +41,8 @@ public: */ ImageRequest(const ImageSource &imageSource, folly::Future &&responseFuture); + ImageRequest(); + /* * The move constructor. */ diff --git a/ReactCommon/fabric/imagemanager/platform/android/ImageManager.cpp b/ReactCommon/fabric/imagemanager/platform/android/ImageManager.cpp index 96450d832..6c81c831b 100644 --- a/ReactCommon/fabric/imagemanager/platform/android/ImageManager.cpp +++ b/ReactCommon/fabric/imagemanager/platform/android/ImageManager.cpp @@ -20,6 +20,7 @@ ImageManager::~ImageManager() { ImageRequest ImageManager::requestImage(const ImageSource &imageSource) const { // Not implemented. + return {}; } } // namespace react