Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(281)

Unified Diff: components/image_fetcher/ios/ios_image_data_fetcher_wrapper_unittest.mm

Issue 2689213010: Add a static method to WebPDecoder to decode WebP (Closed)
Patch Set: Address comment Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/image_fetcher/ios/ios_image_data_fetcher_wrapper_unittest.mm
diff --git a/components/image_fetcher/ios/ios_image_data_fetcher_wrapper_unittest.mm b/components/image_fetcher/ios/ios_image_data_fetcher_wrapper_unittest.mm
index 61bf163279c3a77f30dee370a86e1beb3616a37b..61d21098d4149b28eb0a0c880b4214ae9b80226d 100644
--- a/components/image_fetcher/ios/ios_image_data_fetcher_wrapper_unittest.mm
+++ b/components/image_fetcher/ios/ios_image_data_fetcher_wrapper_unittest.mm
@@ -92,38 +92,11 @@ const char kTestUrl[] = "http://www.img.com";
const char kWEBPHeaderResponse[] =
"HTTP/1.1 200 OK\0Content-type: image/webp\0\0";
-// TODO(crbug.com/687921): Refactor this.
-class WebpDecoderDelegate : public webp_transcode::WebpDecoder::Delegate {
- public:
- WebpDecoderDelegate() = default;
- NSData* data() const { return decoded_image_; }
-
- void OnFinishedDecoding(bool success) override {}
- void SetImageFeatures(
- size_t total_size,
- webp_transcode::WebpDecoder::DecodedImageFormat format) override {
- decoded_image_ = [[NSMutableData alloc] initWithCapacity:total_size];
- }
- void OnDataDecoded(NSData* data) override {
- [decoded_image_ appendData:data];
- }
-
- private:
- ~WebpDecoderDelegate() override {}
- NSMutableData* decoded_image_;
-
- DISALLOW_COPY_AND_ASSIGN(WebpDecoderDelegate);
-};
-
// Returns a NSData object containing the decoded image.
NSData* DecodedWebpImage() {
- scoped_refptr<WebpDecoderDelegate> delegate(new WebpDecoderDelegate);
- scoped_refptr<webp_transcode::WebpDecoder> decoder(
- new webp_transcode::WebpDecoder(delegate.get()));
- decoder->OnDataReceived([NSData
+ return webp_transcode::WebpDecoder::DecodeWebpImage([NSData
dataWithBytes:reinterpret_cast<const char*>(kWEBPImage)
length:sizeof(kWEBPImage)]);
- return delegate->data();
}
} // namespace

Powered by Google App Engine
This is Rietveld 408576698