Skip to content

Commit 342ce7b

Browse files
SaadnajmiSaadnajmi
committed
more tags
1 parent 316640d commit 342ce7b

File tree

19 files changed

+54
-54
lines changed

19 files changed

+54
-54
lines changed

‎packages/react-native/Libraries/Image/RCTAnimatedImage.mm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ - (NSTimeInterval)animatedImageDurationAtIndex:(NSUInteger)index
148148
return _frames[index].duration;
149149
}
150150

151-
- (RCTPlatformImage *)animatedImageFrameAtIndex:(NSUInteger)index
151+
- (RCTPlatformImage *)animatedImageFrameAtIndex:(NSUInteger)index // [macOS]
152152
{
153153
CGImageRef imageRef = CGImageSourceCreateImageAtIndex(_imageSource, index, NULL);
154154
if (!imageRef) {

‎packages/react-native/Libraries/Image/RCTBundleAssetImageLoader.mm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ - (nullable RCTImageLoaderCancellationBlock)loadImageForURL:(NSURL *)imageURL
4949
partialLoadHandler:(RCTImageLoaderPartialLoadBlock)partialLoadHandler
5050
completionHandler:(RCTImageLoaderCompletionBlock)completionHandler
5151
{
52-
RCTPlatformImage *image = RCTImageFromLocalAssetURL(imageURL);
52+
RCTPlatformImage *image = RCTImageFromLocalAssetURL(imageURL); // [macOS]
5353
if (image) {
5454
if (progressHandler) {
5555
progressHandler(1, 1);

‎packages/react-native/Libraries/Image/RCTImageCache.mm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ - (RCTPlatformImage *)imageForUrl:(NSString *)url size:(CGSize)size scale:(CGFlo
9999
return [_decodedImageCache objectForKey:cacheKey];
100100
}
101101

102-
- (void)addImageToCache:(RCTPlatformImage *)image
102+
- (void)addImageToCache:(RCTPlatformImage *)image // [macOS]
103103
URL:(NSString *)url
104104
size:(CGSize)size
105105
scale:(CGFloat)scale

‎packages/react-native/Libraries/Image/RCTImageEditingManager.mm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ @implementation RCTImageEditingManager
6060

6161
[[_moduleRegistry moduleForName:"ImageLoader"]
6262
loadImageWithURLRequest:imageRequest
63-
callback:^(NSError *error, RCTPlatformImage *image) {
63+
callback:^(NSError *error, RCTPlatformImage *image) { // [macOS]
6464
if (error) {
6565
errorCallback(@[ RCTJSErrorFromNSError(error) ]);
6666
return;

‎packages/react-native/Libraries/Image/RCTImageLoader.mm‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ - (nullable RCTImageLoaderCancellationBlock)loadImageWithURLRequest:(NSURLReques
419419
attribution:{}
420420
progressBlock:progressBlock
421421
partialLoadBlock:partialLoadBlock
422-
completionBlock:^(NSError *error, RCTPlatformImage *image, id metadata) {
422+
completionBlock:^(NSError *error, RCTPlatformImage *image, id metadata) { // [macOS]
423423
completionBlock(error, image);
424424
}];
425425
return ^{
@@ -555,7 +555,7 @@ - (RCTImageURLLoaderRequest *)_loadImageOrDataWithURLRequest:(NSURLRequest *)req
555555
}
556556

557557
if (cacheResult && partialLoadHandler) {
558-
RCTPlatformImage *image = [[self imageCache] imageForUrl:request.URL.absoluteString
558+
RCTPlatformImage *image = [[self imageCache] imageForUrl:request.URL.absoluteString // [macOS]
559559
size:size
560560
scale:scale
561561
resizeMode:resizeMode];
@@ -577,7 +577,7 @@ - (RCTImageURLLoaderRequest *)_loadImageOrDataWithURLRequest:(NSURLRequest *)req
577577

578578
// If we've received an image, we should try to set it synchronously,
579579
// if it's data, do decoding on a background thread.
580-
if (RCTIsMainQueue() && ![imageOrData isKindOfClass:[RCTPlatformImage class]]) {
580+
if (RCTIsMainQueue() && ![imageOrData isKindOfClass:[RCTPlatformImage class]]) { // [macOS]
581581
// Most loaders do not return on the main thread, so caller is probably not
582582
// expecting it, and may do expensive post-processing in the callback
583583
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
@@ -608,7 +608,7 @@ - (RCTImageURLLoaderRequest *)_loadImageOrDataWithURLRequest:(NSURLRequest *)req
608608
attribution:attributionCopy
609609
progressHandler:progressHandler
610610
partialLoadHandler:partialLoadHandler
611-
completionHandler:^(NSError *error, RCTPlatformImage *image, id metadata) {
611+
completionHandler:^(NSError *error, RCTPlatformImage *image, id metadata) { // [macOS]
612612
completionHandler(error, image, metadata, nil);
613613
}];
614614
}
@@ -618,7 +618,7 @@ - (RCTImageURLLoaderRequest *)_loadImageOrDataWithURLRequest:(NSURLRequest *)req
618618
resizeMode:resizeMode
619619
progressHandler:progressHandler
620620
partialLoadHandler:partialLoadHandler
621-
completionHandler:^(NSError *error, RCTPlatformImage *image) {
621+
completionHandler:^(NSError *error, RCTPlatformImage *image) { // [macOS]
622622
completionHandler(error, image, nil, nil);
623623
}];
624624
return [[RCTImageURLLoaderRequest alloc] initWithRequestId:nil imageURL:request.URL cancellationBlock:cb];
@@ -649,7 +649,7 @@ - (RCTImageURLLoaderRequest *)_loadImageOrDataWithURLRequest:(NSURLRequest *)req
649649
attribution:attributionCopy
650650
progressHandler:progressHandler
651651
partialLoadHandler:partialLoadHandler
652-
completionHandler:^(NSError *error, RCTPlatformImage *image, id metadata) {
652+
completionHandler:^(NSError *error, RCTPlatformImage *image, id metadata) { // [macOS]
653653
completionHandler(error, image, metadata, nil);
654654
}];
655655
cancelLoadLocal = loaderRequest.cancellationBlock;
@@ -660,15 +660,15 @@ - (RCTImageURLLoaderRequest *)_loadImageOrDataWithURLRequest:(NSURLRequest *)req
660660
resizeMode:resizeMode
661661
progressHandler:progressHandler
662662
partialLoadHandler:partialLoadHandler
663-
completionHandler:^(NSError *error, RCTPlatformImage *image) {
663+
completionHandler:^(NSError *error, RCTPlatformImage *image) { // [macOS]
664664
completionHandler(error, image, nil, nil);
665665
}];
666666
}
667667
[cancelLoadLock lock];
668668
cancelLoad = cancelLoadLocal;
669669
[cancelLoadLock unlock];
670670
} else {
671-
RCTPlatformImage *image;
671+
RCTPlatformImage *image; // [macOS]
672672
if (cacheResult) {
673673
image = [[strongSelf imageCache] imageForUrl:request.URL.absoluteString
674674
size:size
@@ -858,15 +858,15 @@ - (RCTImageURLLoaderRequest *)loadImageWithURLRequest:(NSURLRequest *)imageURLRe
858858
return;
859859
}
860860

861-
if (!imageOrData || [imageOrData isKindOfClass:[RCTPlatformImage class]]) {
861+
if (!imageOrData || [imageOrData isKindOfClass:[RCTPlatformImage class]]) { // [macOS]
862862
[cancelLoadLock lock];
863863
cancelLoad = nil;
864864
[cancelLoadLock unlock];
865865
completionBlock(error, imageOrData, imageMetadata);
866866
return;
867867
}
868868

869-
RCTImageLoaderCompletionBlock decodeCompletionHandler = ^(NSError *error_, RCTPlatformImage *image) {
869+
RCTImageLoaderCompletionBlock decodeCompletionHandler = ^(NSError *error_, RCTPlatformImage *image) { // [macOS]
870870
if (cacheResult && image) {
871871
// Store decoded image in cache
872872
[[strongSelf imageCache] addImageToCache:image
@@ -971,7 +971,7 @@ - (RCTImageLoaderCancellationBlock)decodeImageData:(NSData *)data
971971
}
972972

973973
auto cancelled = std::make_shared<std::atomic<int>>(0);
974-
void (^completionHandler)(NSError *, RCTPlatformImage *) = ^(NSError *error, RCTPlatformImage *image) {
974+
void (^completionHandler)(NSError *, RCTPlatformImage *) = ^(NSError *error, RCTPlatformImage *image) { // [macOS]
975975
if (RCTIsMainQueue()) {
976976
// Most loaders do not return on the main thread, so caller is probably not
977977
// expecting it, and may do expensive post-processing in the callback
@@ -1006,7 +1006,7 @@ - (RCTImageLoaderCancellationBlock)decodeImageData:(NSData *)data
10061006
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
10071007
if (!std::atomic_load(cancelled.get())) {
10081008
// Decompress the image data (this may be CPU and memory intensive)
1009-
RCTPlatformImage *image = RCTDecodeImageWithData(data, size, scale, resizeMode);
1009+
RCTPlatformImage *image = RCTDecodeImageWithData(data, size, scale, resizeMode); // [macOS]
10101010

10111011
#if !TARGET_OS_OSX && RCT_DEV // [macOS]
10121012
CGSize imagePixelSize = RCTSizeInPixels(image.size, UIImageGetScale(image)); // [macOS]
@@ -1101,7 +1101,7 @@ - (RCTImageLoaderCancellationBlock)getImageSizeForURLRequest:(NSURLRequest *)ima
11011101
break;
11021102
}
11031103
} else {
1104-
RCTPlatformImage *image = imageOrData;
1104+
RCTPlatformImage *image = imageOrData; // [macOS]
11051105
#if !TARGET_OS_OSX // [macOS]
11061106
CGFloat imageScale = image.scale;
11071107
#else // [macOS
@@ -1195,7 +1195,7 @@ - (id)sendRequest:(NSURLRequest *)request withDelegate:(id<RCTURLRequestDelegate
11951195
{
11961196
__block RCTImageLoaderCancellationBlock requestToken;
11971197
requestToken = [self loadImageWithURLRequest:request
1198-
callback:^(NSError *error, RCTPlatformImage *image) {
1198+
callback:^(NSError *error, RCTPlatformImage *image) { // [macOS]
11991199
if (error) {
12001200
[delegate URLRequest:requestToken didCompleteWithError:error];
12011201
return;
@@ -1305,7 +1305,7 @@ - (void)cancelRequest:(id)requestToken
13051305
}
13061306
progressBlock:nil
13071307
partialLoadBlock:nil
1308-
completionBlock:^(NSError *error, RCTPlatformImage *image, id completionMetadata) {
1308+
completionBlock:^(NSError *error, RCTPlatformImage *image, id completionMetadata) { // [macOS]
13091309
if (error) {
13101310
reject(@"E_PREFETCH_FAILURE", nil, error);
13111311
return;

‎packages/react-native/Libraries/Image/RCTImageStoreManager.mm‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ - (void)getImageDataForTag:(NSString *)imageTag withBlock:(void (^)(NSData *imag
108108
});
109109
}
110110

111-
- (void)storeImage:(RCTPlatformImage *)image withBlock:(void (^)(NSString *imageTag))block
111+
- (void)storeImage:(RCTPlatformImage *)image withBlock:(void (^)(NSString *imageTag))block // [macOS]
112112
{
113113
RCTAssertParam(block);
114114
dispatch_async([self _getAsyncQueue], ^{
@@ -236,7 +236,7 @@ - (void)cancelRequest:(id)requestToken
236236

237237
@implementation RCTImageStoreManager (Deprecated)
238238

239-
- (NSString *)storeImage:(RCTPlatformImage *)image
239+
- (NSString *)storeImage:(RCTPlatformImage *)image // [macOS]
240240
{
241241
RCTAssertMainQueue();
242242
RCTLogWarn(
@@ -248,7 +248,7 @@ - (NSString *)storeImage:(RCTPlatformImage *)image
248248
return imageTag;
249249
}
250250

251-
- (RCTPlatformImage *)imageForTag:(NSString *)imageTag
251+
- (RCTPlatformImage *)imageForTag:(NSString *)imageTag // [macOS]
252252
{
253253
RCTAssertMainQueue();
254254
RCTLogWarn(
@@ -260,7 +260,7 @@ - (RCTPlatformImage *)imageForTag:(NSString *)imageTag
260260
return UIImageWithData(imageData); // [macOS]
261261
}
262262

263-
- (void)getImageForTag:(NSString *)imageTag withBlock:(void (^)(RCTPlatformImage *image))block
263+
- (void)getImageForTag:(NSString *)imageTag withBlock:(void (^)(RCTPlatformImage *image))block // [macOS]
264264
{
265265
RCTAssertParam(block);
266266
dispatch_async([self _getAsyncQueue], ^{

‎packages/react-native/Libraries/Image/RCTImageView.mm‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
175175

176176
RCT_NOT_IMPLEMENTED(-(instancetype)initWithFrame : (CGRect)frame)
177177

178-
- (void)updateWithImage:(RCTPlatformImage *)image
178+
- (void)updateWithImage:(RCTPlatformImage *)image // [macOS]
179179
{
180180
if (!image) {
181181
_imageView.image = nil;
@@ -223,7 +223,7 @@ - (void)updateWithImage:(RCTPlatformImage *)image
223223
_imageView.image = image;
224224
}
225225

226-
- (void)setImage:(RCTPlatformImage *)image
226+
- (void)setImage:(RCTPlatformImage *)image // [macOS]
227227
{
228228
image = image ?: _defaultImage;
229229
if (image != self.image) {
@@ -232,7 +232,7 @@ - (void)setImage:(RCTPlatformImage *)image
232232
}
233233
}
234234

235-
- (RCTPlatformImage *)image
235+
- (RCTPlatformImage *)image // [macOS]
236236
{
237237
return _image ?: _imageView.image; // [macOS]
238238
}
@@ -421,7 +421,7 @@ - (void)reloadImage
421421
}
422422

423423
__weak RCTImageView *weakSelf = self;
424-
RCTImageLoaderPartialLoadBlock partialLoadHandler = ^(RCTPlatformImage *image) {
424+
RCTImageLoaderPartialLoadBlock partialLoadHandler = ^(RCTPlatformImage *image) { // [macOS]
425425
[weakSelf imageLoaderLoadedImage:image error:nil forImageSource:source partial:YES];
426426
};
427427

@@ -437,7 +437,7 @@ - (void)reloadImage
437437
imageScale = source.scale;
438438
}
439439

440-
RCTImageLoaderCompletionBlockWithMetadata completionHandler = ^(NSError *error, RCTPlatformImage *loadedImage, id metadata) {
440+
RCTImageLoaderCompletionBlockWithMetadata completionHandler = ^(NSError *error, RCTPlatformImage *loadedImage, id metadata) { // [macOS]
441441
[weakSelf imageLoaderLoadedImage:loadedImage error:error forImageSource:source partial:NO];
442442
};
443443

@@ -464,7 +464,7 @@ - (void)reloadImage
464464
}
465465
}
466466

467-
- (void)imageLoaderLoadedImage:(RCTPlatformImage *)loadedImage
467+
- (void)imageLoaderLoadedImage:(RCTPlatformImage *)loadedImage // [macOS]
468468
error:(NSError *)error
469469
forImageSource:(RCTImageSource *)source
470470
partial:(BOOL)isPartialLoad
@@ -494,7 +494,7 @@ - (void)imageLoaderLoadedImage:(RCTPlatformImage *)loadedImage
494494
}
495495

496496
__weak RCTImageView *weakSelf = self;
497-
void (^setImageBlock)(RCTPlatformImage *) = ^(RCTPlatformImage *image) {
497+
void (^setImageBlock)(RCTPlatformImage *) = ^(RCTPlatformImage *image) { // [macOS]
498498
RCTImageView *strongSelf = weakSelf;
499499
if (!strongSelf) {
500500
return;
@@ -525,7 +525,7 @@ - (void)imageLoaderLoadedImage:(RCTPlatformImage *)loadedImage
525525
// Blur on a background thread to avoid blocking interaction
526526
CGFloat blurRadius = self.blurRadius;
527527
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
528-
RCTPlatformImage *blurredImage = RCTBlurredImageWithRadius(loadedImage, blurRadius);
528+
RCTPlatformImage *blurredImage = RCTBlurredImageWithRadius(loadedImage, blurRadius); // [macOS]
529529
RCTExecuteOnMainQueue(^{
530530
setImageBlock(blurredImage);
531531
});

‎packages/react-native/Libraries/Image/RCTImageViewManager.mm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ - (RCTPlatformView *)view // [macOS]
100100
lazilyLoadIfNecessary:YES];
101101
[imageLoader loadImageWithURLRequest:request
102102
priority:RCTImageLoaderPriorityPrefetch
103-
callback:^(NSError *error, RCTPlatformImage *image) {
103+
callback:^(NSError *error, RCTPlatformImage *image) { // [macOS]
104104
if (error) {
105105
reject(@"E_PREFETCH_FAILURE", nil, error);
106106
return;

‎packages/react-native/Libraries/Image/RCTLocalAssetImageLoader.mm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ - (nullable RCTImageLoaderCancellationBlock)loadImageForURL:(NSURL *)imageURL
4949
partialLoadHandler:(RCTImageLoaderPartialLoadBlock)partialLoadHandler
5050
completionHandler:(RCTImageLoaderCompletionBlock)completionHandler
5151
{
52-
RCTPlatformImage *image = RCTImageFromLocalAssetURL(imageURL);
52+
RCTPlatformImage *image = RCTImageFromLocalAssetURL(imageURL); // [macOS]
5353
if (image) {
5454
if (progressHandler) {
5555
progressHandler(1, 1);

‎packages/react-native/Libraries/Image/RCTUIImageViewAnimated.mm‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ static NSUInteger RCTDeviceFreeMemory(void)
3535
@interface RCTUIImageViewAnimated () <CALayerDelegate, RCTDisplayRefreshable>
3636

3737
@property (nonatomic, assign) NSUInteger maxBufferSize;
38-
@property (nonatomic, strong, readwrite) RCTPlatformImage *currentFrame;
38+
@property (nonatomic, strong, readwrite) RCTPlatformImage *currentFrame; // [macOS]
3939
@property (nonatomic, assign, readwrite) NSUInteger currentFrameIndex;
4040
@property (nonatomic, assign, readwrite) NSUInteger currentLoopCount;
4141
@property (nonatomic, assign) NSUInteger totalFrameCount;
4242
@property (nonatomic, assign) NSUInteger totalLoopCount;
43-
@property (nonatomic, strong) RCTPlatformImage<RCTAnimatedImage> *animatedImage;
44-
@property (nonatomic, strong) NSMutableDictionary<NSNumber *, RCTPlatformImage *> *frameBuffer;
43+
@property (nonatomic, strong) RCTPlatformImage<RCTAnimatedImage> *animatedImage; // [macOS]
44+
@property (nonatomic, strong) NSMutableDictionary<NSNumber *, RCTPlatformImage *> *frameBuffer; // [macOS]
4545
@property (nonatomic, assign) NSTimeInterval currentTime;
4646
@property (nonatomic, assign) BOOL bufferMiss;
4747
@property (nonatomic, assign) NSUInteger maxBufferCount;
@@ -90,7 +90,7 @@ - (void)resetAnimatedImage
9090
dispatch_semaphore_signal(self.lock);
9191
}
9292

93-
- (void)setImage:(RCTPlatformImage *)image
93+
- (void)setImage:(RCTPlatformImage *)image // [macOS]
9494
{
9595
if (self.image == image) {
9696
return;
@@ -150,7 +150,7 @@ - (NSOperationQueue *)fetchQueue
150150
return _fetchQueue;
151151
}
152152

153-
- (NSMutableDictionary<NSNumber *, RCTPlatformImage *> *)frameBuffer
153+
- (NSMutableDictionary<NSNumber *, RCTPlatformImage *> *)frameBuffer // [macOS]
154154
{
155155
if (!_frameBuffer) {
156156
_frameBuffer = [NSMutableDictionary dictionary];

0 commit comments

Comments
 (0)