-
Notifications
You must be signed in to change notification settings - Fork 24.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add pluggable image processing system
- Loading branch information
Alex Akers
committed
Sep 2, 2015
1 parent
eb9a939
commit 36444a6
Showing
22 changed files
with
982 additions
and
392 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
47 changes: 47 additions & 0 deletions
47
Examples/UIExplorer/UIExplorerUnitTests/RCTImageLoaderHelpers.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| /** | ||
| * The examples provided by Facebook are for non-commercial testing and | ||
| * evaluation purposes only. | ||
| * | ||
| * Facebook reserves all rights not expressly granted. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS | ||
| * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL | ||
| * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN | ||
| * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | ||
| * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| */ | ||
|
|
||
| #import "RCTImageLoader.h" | ||
|
|
||
| typedef BOOL (^RCTImageURLLoaderCanLoadImageURLHandler)(NSURL *requestURL); | ||
| typedef RCTImageLoaderCancellationBlock (^RCTImageURLLoaderLoadImageURLHandler)(NSURL *imageURL, CGSize size, CGFloat scale, UIViewContentMode resizeMode, RCTImageLoaderProgressBlock progressHandler, RCTImageLoaderCompletionBlock completionHandler); | ||
|
|
||
| @interface RCTConcreteImageURLLoader : NSObject <RCTImageURLLoader> | ||
|
|
||
| - (instancetype)initWithPriority:(float)priority | ||
| canLoadImageURLHandler:(RCTImageURLLoaderCanLoadImageURLHandler)canLoadImageURLHandler | ||
| loadImageURLHandler:(RCTImageURLLoaderLoadImageURLHandler)loadImageURLHandler; | ||
|
|
||
| @end | ||
|
|
||
| typedef BOOL (^RCTImageDecoderCanDecodeImageDataHandler)(NSData *imageData); | ||
| typedef RCTImageLoaderCancellationBlock (^RCTImageDecoderDecodeImageDataHandler)(NSData *imageData, CGSize size, CGFloat scale, UIViewContentMode resizeMode, RCTImageLoaderCompletionBlock completionHandler); | ||
|
|
||
| @interface RCTConcreteImageDecoder : NSObject <RCTImageDecoder> | ||
|
|
||
| - (instancetype)initWithPriority:(float)priority | ||
| canDecodeImageDataHandler:(RCTImageDecoderCanDecodeImageDataHandler)canDecodeImageDataHandler | ||
| decodeImageDataHandler:(RCTImageDecoderDecodeImageDataHandler)decodeImageDataHandler; | ||
|
|
||
| @end | ||
|
|
||
| #define _RCTDefineImageHandler(SUPERCLASS, CLASS_NAME) \ | ||
| @interface CLASS_NAME : SUPERCLASS @end \ | ||
| @implementation CLASS_NAME RCT_EXPORT_MODULE() @end | ||
|
|
||
| #define RCTDefineImageURLLoader(CLASS_NAME) \ | ||
| _RCTDefineImageHandler(RCTConcreteImageURLLoader, CLASS_NAME) | ||
|
|
||
| #define RCTDefineImageDecoder(CLASS_NAME) \ | ||
| _RCTDefineImageHandler(RCTConcreteImageDecoder, CLASS_NAME) |
105 changes: 105 additions & 0 deletions
105
Examples/UIExplorer/UIExplorerUnitTests/RCTImageLoaderHelpers.m
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
| /** | ||
| * The examples provided by Facebook are for non-commercial testing and | ||
| * evaluation purposes only. | ||
| * | ||
| * Facebook reserves all rights not expressly granted. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS | ||
| * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL | ||
| * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN | ||
| * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | ||
| * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| */ | ||
|
|
||
| #import "RCTImageLoaderHelpers.h" | ||
|
|
||
| @implementation RCTConcreteImageURLLoader | ||
| { | ||
| RCTImageURLLoaderCanLoadImageURLHandler _canLoadImageURLHandler; | ||
| RCTImageURLLoaderLoadImageURLHandler _loadImageURLHandler; | ||
| float _priority; | ||
| } | ||
|
|
||
| + (NSString *)moduleName | ||
| { | ||
| return nil; | ||
| } | ||
|
|
||
| - (instancetype)init | ||
| { | ||
| return nil; | ||
| } | ||
|
|
||
| - (instancetype)initWithPriority:(float)priority canLoadImageURLHandler:(RCTImageURLLoaderCanLoadImageURLHandler)canLoadImageURLHandler loadImageURLHandler:(RCTImageURLLoaderLoadImageURLHandler)loadImageURLHandler | ||
| { | ||
| if ((self = [super init])) { | ||
| _canLoadImageURLHandler = [canLoadImageURLHandler copy]; | ||
| _loadImageURLHandler = [loadImageURLHandler copy]; | ||
| _priority = priority; | ||
| } | ||
|
|
||
| return self; | ||
| } | ||
|
|
||
| - (BOOL)canLoadImageURL:(NSURL *)requestURL | ||
| { | ||
| return _canLoadImageURLHandler(requestURL); | ||
| } | ||
|
|
||
| - (RCTImageLoaderCancellationBlock)loadImageForURL:(NSURL *)imageURL size:(CGSize)size scale:(CGFloat)scale resizeMode:(UIViewContentMode)resizeMode progressHandler:(RCTImageLoaderProgressBlock)progressHandler completionHandler:(RCTImageLoaderCompletionBlock)completionHandler | ||
| { | ||
| return _loadImageURLHandler(imageURL, size, scale, resizeMode, progressHandler, completionHandler); | ||
| } | ||
|
|
||
| - (float)imageLoaderPriority | ||
| { | ||
| return _priority; | ||
| } | ||
|
|
||
| @end | ||
|
|
||
| @implementation RCTConcreteImageDecoder | ||
| { | ||
| RCTImageDecoderCanDecodeImageDataHandler _canDecodeImageDataHandler; | ||
| RCTImageDecoderDecodeImageDataHandler _decodeImageDataHandler; | ||
| float _priority; | ||
| } | ||
|
|
||
| + (NSString *)moduleName | ||
| { | ||
| return nil; | ||
| } | ||
|
|
||
| - (instancetype)init | ||
| { | ||
| return nil; | ||
| } | ||
|
|
||
| - (instancetype)initWithPriority:(float)priority canDecodeImageDataHandler:(RCTImageDecoderCanDecodeImageDataHandler)canDecodeImageDataHandler decodeImageDataHandler:(RCTImageDecoderDecodeImageDataHandler)decodeImageDataHandler | ||
| { | ||
| if ((self = [super init])) { | ||
| _canDecodeImageDataHandler = [canDecodeImageDataHandler copy]; | ||
| _decodeImageDataHandler = [decodeImageDataHandler copy]; | ||
| _priority = priority; | ||
| } | ||
|
|
||
| return self; | ||
| } | ||
|
|
||
| - (BOOL)canDecodeImageData:(NSData *)imageData | ||
| { | ||
| return _canDecodeImageDataHandler(imageData); | ||
| } | ||
|
|
||
| - (RCTImageLoaderCancellationBlock)decodeImageData:(NSData *)imageData size:(CGSize)size scale:(CGFloat)scale resizeMode:(UIViewContentMode)resizeMode completionHandler:(RCTImageLoaderCompletionBlock)completionHandler | ||
| { | ||
| return _decodeImageDataHandler(imageData, size, scale, resizeMode, completionHandler); | ||
| } | ||
|
|
||
| - (float)imageDecoderPriority | ||
| { | ||
| return _priority; | ||
| } | ||
|
|
||
| @end |
148 changes: 148 additions & 0 deletions
148
Examples/UIExplorer/UIExplorerUnitTests/RCTImageLoaderTests.m
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,148 @@ | ||
| /** | ||
| * The examples provided by Facebook are for non-commercial testing and | ||
| * evaluation purposes only. | ||
| * | ||
| * Facebook reserves all rights not expressly granted. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS | ||
| * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL | ||
| * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN | ||
| * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | ||
| * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| */ | ||
|
|
||
| #import <XCTest/XCTest.h> | ||
|
|
||
| #import "RCTBridge.h" | ||
| #import "RCTImageLoader.h" | ||
| #import "RCTImageLoaderHelpers.h" | ||
|
|
||
| unsigned char blackGIF[] = { | ||
| 0x47, 0x49, 0x46, 0x38, 0x39, 0x61, 0x01, 0x00, 0x01, 0x00, 0x80, 0x00, | ||
| 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x2c, 0x00, 0x00, 0x00, 0x00, | ||
| 0x01, 0x00, 0x01, 0x00, 0x00, 0x02, 0x02, 0x44, 0x01, 0x00, 0x3b | ||
| }; | ||
|
|
||
| RCTDefineImageURLLoader(RCTImageLoaderTestsURLLoader1) | ||
| RCTDefineImageURLLoader(RCTImageLoaderTestsURLLoader2) | ||
| RCTDefineImageDecoder(RCTImageLoaderTestsDecoder1) | ||
| RCTDefineImageDecoder(RCTImageLoaderTestsDecoder2) | ||
|
|
||
| @interface RCTImageLoaderTests : XCTestCase | ||
|
|
||
| @end | ||
|
|
||
| @implementation RCTImageLoaderTests | ||
|
|
||
| - (void)testImageLoading | ||
| { | ||
| UIImage *image = [UIImage new]; | ||
|
|
||
| id<RCTImageURLLoader> loader = [[RCTImageLoaderTestsURLLoader1 alloc] initWithPriority:1.0 canLoadImageURLHandler:^BOOL(__unused NSURL *requestURL) { | ||
| return YES; | ||
| } loadImageURLHandler:^RCTImageLoaderCancellationBlock(__unused NSURL *imageURL, __unused CGSize size, __unused CGFloat scale, __unused UIViewContentMode resizeMode, RCTImageLoaderProgressBlock progressHandler, RCTImageLoaderCompletionBlock completionHandler) { | ||
| progressHandler(1, 1); | ||
| completionHandler(nil, image); | ||
| return nil; | ||
| }]; | ||
|
|
||
| RCTImageLoader *imageLoader = [RCTImageLoader new]; | ||
| NS_VALID_UNTIL_END_OF_SCOPE RCTBridge *bridge = [[RCTBridge alloc] initWithBundleURL:nil moduleProvider:^{ return @[loader, imageLoader]; } launchOptions:nil]; | ||
|
|
||
| RCTImageLoaderCancellationBlock cancelBlock = [imageLoader loadImageWithTag:@"http://facebook.github.io/react/img/logo_og.png" size:CGSizeMake(100, 100) scale:1.0 resizeMode:UIViewContentModeScaleAspectFit progressBlock:^(int64_t progress, int64_t total) { | ||
| XCTAssertEqual(progress, 1); | ||
| XCTAssertEqual(total, 1); | ||
| } completionBlock:^(NSError *loadError, id loadedImage) { | ||
| XCTAssertEqualObjects(loadedImage, image); | ||
| XCTAssertNil(loadError); | ||
| }]; | ||
| XCTAssertNil(cancelBlock); | ||
| } | ||
|
|
||
| - (void)testImageLoaderUsesImageURLLoaderWithHighestPriority | ||
| { | ||
| UIImage *image = [UIImage new]; | ||
|
|
||
| id<RCTImageURLLoader> loader1 = [[RCTImageLoaderTestsURLLoader1 alloc] initWithPriority:1.0 canLoadImageURLHandler:^BOOL(__unused NSURL *requestURL) { | ||
| return YES; | ||
| } loadImageURLHandler:^RCTImageLoaderCancellationBlock(__unused NSURL *imageURL, __unused CGSize size, __unused CGFloat scale, __unused UIViewContentMode resizeMode, RCTImageLoaderProgressBlock progressHandler, RCTImageLoaderCompletionBlock completionHandler) { | ||
| progressHandler(1, 1); | ||
| completionHandler(nil, image); | ||
| return nil; | ||
| }]; | ||
|
|
||
| id<RCTImageURLLoader> loader2 = [[RCTImageLoaderTestsURLLoader2 alloc] initWithPriority:0.5 canLoadImageURLHandler:^BOOL(__unused NSURL *requestURL) { | ||
| return YES; | ||
| } loadImageURLHandler:^RCTImageLoaderCancellationBlock(__unused NSURL *imageURL, __unused CGSize size, __unused CGFloat scale, __unused UIViewContentMode resizeMode, __unused RCTImageLoaderProgressBlock progressHandler, __unused RCTImageLoaderCompletionBlock completionHandler) { | ||
| XCTFail(@"Should not have used loader2"); | ||
| return nil; | ||
| }]; | ||
|
|
||
| RCTImageLoader *imageLoader = [RCTImageLoader new]; | ||
| NS_VALID_UNTIL_END_OF_SCOPE RCTBridge *bridge = [[RCTBridge alloc] initWithBundleURL:nil moduleProvider:^{ return @[loader1, loader2, imageLoader]; } launchOptions:nil]; | ||
|
|
||
| RCTImageLoaderCancellationBlock cancelBlock = [imageLoader loadImageWithTag:@"http://facebook.github.io/react/img/logo_og.png" size:CGSizeMake(100, 100) scale:1.0 resizeMode:UIViewContentModeScaleAspectFit progressBlock:^(int64_t progress, int64_t total) { | ||
| XCTAssertEqual(progress, 1); | ||
| XCTAssertEqual(total, 1); | ||
| } completionBlock:^(NSError *loadError, id loadedImage) { | ||
| XCTAssertEqualObjects(loadedImage, image); | ||
| XCTAssertNil(loadError); | ||
| }]; | ||
| XCTAssertNil(cancelBlock); | ||
| } | ||
|
|
||
| - (void)testImageDecoding | ||
| { | ||
| NSData *data = [NSData dataWithBytesNoCopy:blackGIF length:sizeof(blackGIF) freeWhenDone:NO]; | ||
| UIImage *image = [[UIImage alloc] initWithData:data]; | ||
|
|
||
| id<RCTImageDecoder> decoder = [[RCTImageLoaderTestsDecoder1 alloc] initWithPriority:1.0 canDecodeImageDataHandler:^BOOL(__unused NSData *imageData) { | ||
| return YES; | ||
| } decodeImageDataHandler:^RCTImageLoaderCancellationBlock(NSData *imageData, __unused CGSize size, __unused CGFloat scale, __unused UIViewContentMode resizeMode, RCTImageLoaderCompletionBlock completionHandler) { | ||
| XCTAssertEqualObjects(imageData, data); | ||
| completionHandler(nil, image); | ||
| return nil; | ||
| }]; | ||
|
|
||
| RCTImageLoader *imageLoader = [RCTImageLoader new]; | ||
| NS_VALID_UNTIL_END_OF_SCOPE RCTBridge *bridge = [[RCTBridge alloc] initWithBundleURL:nil moduleProvider:^{ return @[decoder, imageLoader]; } launchOptions:nil]; | ||
|
|
||
| RCTImageLoaderCancellationBlock cancelBlock = [imageLoader decodeImageData:data size:CGSizeMake(1, 1) scale:1.0 resizeMode:UIViewContentModeScaleToFill completionBlock:^(NSError *decodeError, id decodedImage) { | ||
| XCTAssertEqualObjects(decodedImage, image); | ||
| XCTAssertNil(decodeError); | ||
| }]; | ||
| XCTAssertNil(cancelBlock); | ||
| } | ||
|
|
||
| - (void)testImageLoaderUsesImageDecoderWithHighestPriority | ||
| { | ||
| NSData *data = [NSData dataWithBytesNoCopy:blackGIF length:sizeof(blackGIF) freeWhenDone:NO]; | ||
| UIImage *image = [[UIImage alloc] initWithData:data]; | ||
|
|
||
| id<RCTImageDecoder> decoder1 = [[RCTImageLoaderTestsDecoder1 alloc] initWithPriority:1.0 canDecodeImageDataHandler:^BOOL(__unused NSData *imageData) { | ||
| return YES; | ||
| } decodeImageDataHandler:^RCTImageLoaderCancellationBlock(NSData *imageData, __unused CGSize size, __unused CGFloat scale, __unused UIViewContentMode resizeMode, RCTImageLoaderCompletionBlock completionHandler) { | ||
| XCTAssertEqualObjects(imageData, data); | ||
| completionHandler(nil, image); | ||
| return nil; | ||
| }]; | ||
|
|
||
| id<RCTImageDecoder> decoder2 = [[RCTImageLoaderTestsDecoder2 alloc] initWithPriority:0.5 canDecodeImageDataHandler:^BOOL(__unused NSData *imageData) { | ||
| return YES; | ||
| } decodeImageDataHandler:^RCTImageLoaderCancellationBlock(__unused NSData *imageData, __unused CGSize size, __unused CGFloat scale, __unused UIViewContentMode resizeMode, __unused RCTImageLoaderCompletionBlock completionHandler) { | ||
| XCTFail(@"Should not have used decoder2"); | ||
| return nil; | ||
| }]; | ||
|
|
||
| RCTImageLoader *imageLoader = [RCTImageLoader new]; | ||
| NS_VALID_UNTIL_END_OF_SCOPE RCTBridge *bridge = [[RCTBridge alloc] initWithBundleURL:nil moduleProvider:^{ return @[decoder1, decoder2, imageLoader]; } launchOptions:nil]; | ||
|
|
||
| RCTImageLoaderCancellationBlock cancelBlock = [imageLoader decodeImageData:data size:CGSizeMake(1, 1) scale:1.0 resizeMode:UIViewContentModeScaleToFill completionBlock:^(NSError *decodeError, id decodedImage) { | ||
| XCTAssertEqualObjects(decodedImage, image); | ||
| XCTAssertNil(decodeError); | ||
| }]; | ||
| XCTAssertNil(cancelBlock); | ||
| } | ||
|
|
||
| @end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.