Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

@implementation RCTImageComponentView {
ImageShadowNode::ConcreteState::Shared _state;
RCTImageResponseObserverProxy _imageResponseObserverProxy;
std::shared_ptr<RCTImageResponseObserverProxy> _imageResponseObserverProxy;
}

- (instancetype)initWithFrame:(CGRect)frame
Expand All @@ -36,7 +36,7 @@ - (instancetype)initWithFrame:(CGRect)frame
_imageView.layer.minificationFilter = kCAFilterTrilinear;
_imageView.layer.magnificationFilter = kCAFilterTrilinear;

_imageResponseObserverProxy = RCTImageResponseObserverProxy(self);
_imageResponseObserverProxy = std::make_shared<RCTImageResponseObserverProxy>(self);

self.contentView = _imageView;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,29 +20,29 @@ ImageResponseObserverCoordinator::ImageResponseObserverCoordinator(
cancelRequest_(std::move(cancelationFunction)) {}

void ImageResponseObserverCoordinator::addObserver(
const ImageResponseObserver& observer) const {
std::shared_ptr<const ImageResponseObserver> observer) const {
mutex_.lock();
switch (status_) {
case ImageResponse::Status::Loading: {
observers_.push_back(&observer);
observers_.push_back(observer);
mutex_.unlock();
break;
}
case ImageResponse::Status::Completed: {
auto imageData = imageData_;
auto imageMetadata = imageMetadata_;
mutex_.unlock();
observer.didReceiveImage(ImageResponse{imageData, imageMetadata});
observer->didReceiveImage(ImageResponse{imageData, imageMetadata});
break;
}
case ImageResponse::Status::Failed: {
auto imageErrorData = imageErrorData_;
mutex_.unlock();
observer.didReceiveFailure(ImageLoadError{imageErrorData});
observer->didReceiveFailure(ImageLoadError{imageErrorData});
break;
}
case ImageResponse::Status::Cancelled: {
observers_.push_back(&observer);
observers_.push_back(observer);
status_ = ImageResponse::Status::Loading;
mutex_.unlock();
resumeRequest_();
Expand All @@ -52,13 +52,13 @@ void ImageResponseObserverCoordinator::addObserver(
}

void ImageResponseObserverCoordinator::removeObserver(
const ImageResponseObserver& observer) const {
const std::shared_ptr<const ImageResponseObserver>& observer) const {
std::scoped_lock lock(mutex_);

// We remove only one element to maintain a balance between add/remove calls.
auto position = std::find(observers_.begin(), observers_.end(), &observer);
auto position = std::find(observers_.begin(), observers_.end(), observer);
if (position != observers_.end()) {
observers_.erase(position, observers_.end());
observers_.erase(position);

if (observers_.empty() && status_ == ImageResponse::Status::Loading) {
status_ = ImageResponse::Status::Cancelled;
Expand All @@ -78,7 +78,7 @@ void ImageResponseObserverCoordinator::nativeImageResponseProgress(
status_ == ImageResponse::Status::Cancelled);
mutex_.unlock();

for (auto observer : observers) {
for (const auto& observer : observers) {
observer->didReceiveProgress(progress, loaded, total);
}
}
Expand All @@ -95,7 +95,7 @@ void ImageResponseObserverCoordinator::nativeImageResponseComplete(
auto observers = observers_;
mutex_.unlock();

for (auto observer : observers) {
for (const auto& observer : observers) {
observer->didReceiveImage(imageResponse);
}
}
Expand All @@ -111,7 +111,7 @@ void ImageResponseObserverCoordinator::nativeImageResponseFailed(
auto observers = observers_;
mutex_.unlock();

for (auto observer : observers) {
for (const auto& observer : observers) {
observer->didReceiveFailure(loadError);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include <react/renderer/imagemanager/ImageResponseObserver.h>
#include <react/utils/SharedFunction.h>

#include <memory>
#include <mutex>
#include <vector>

Expand All @@ -33,12 +34,13 @@ class ImageResponseObserverCoordinator {
* If the current image request status is not equal to `Loading`, the observer
* will be called immediately.
*/
void addObserver(const ImageResponseObserver& observer) const;
void addObserver(std::shared_ptr<const ImageResponseObserver> observer) const;

/*
* Interested parties may stop observing the image response.
*/
void removeObserver(const ImageResponseObserver& observer) const;
void removeObserver(
const std::shared_ptr<const ImageResponseObserver>& observer) const;

/*
* Platform-specific image loader will call this method with progress updates.
Expand All @@ -65,7 +67,7 @@ class ImageResponseObserverCoordinator {
* List of observers.
* Mutable: protected by mutex_.
*/
mutable std::vector<const ImageResponseObserver*> observers_;
mutable std::vector<std::shared_ptr<const ImageResponseObserver>> observers_;

/*
* Current status of image loading.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,11 @@ - (ImageRequest)requestImage:(ImageSource)imageSource surfaceId:(SurfaceId)surfa
completionBlock:completionBlock];

RCTImageLoaderCancellationBlock cancelationBlock = loaderRequest.cancellationBlock;
sharedCancelationFunction.assign([cancelationBlock]() { cancelationBlock(); });
sharedCancelationFunction.assign([cancelationBlock]() {
if (cancelationBlock) {
cancelationBlock();
}
});
};

startRequest();
Expand Down
Loading