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

Unified Diff: chrome/utility/image_decoder_impl.cc

Issue 2483013002: Mojo C++ bindings: Remove more use_new_wrapper_types=false. (Closed)
Patch Set: . Created 4 years, 1 month 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
« no previous file with comments | « chrome/utility/image_decoder_impl.h ('k') | chrome/utility/image_decoder_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/utility/image_decoder_impl.cc
diff --git a/chrome/utility/image_decoder_impl.cc b/chrome/utility/image_decoder_impl.cc
index 99564ac45ded0c4d82ef32b4f2b4f56cc79a5c2f..472f9873ae9422796fea48003de1711ad14631b7 100644
--- a/chrome/utility/image_decoder_impl.cc
+++ b/chrome/utility/image_decoder_impl.cc
@@ -34,12 +34,11 @@ ImageDecoderImpl::ImageDecoderImpl(int64_t max_message_size)
ImageDecoderImpl::~ImageDecoderImpl() {
}
-void ImageDecoderImpl::DecodeImage(
- mojo::Array<uint8_t> encoded_data,
- mojom::ImageCodec codec,
- bool shrink_to_fit,
- const DecodeImageCallback& callback) {
- if (encoded_data.size() == 0) {
+void ImageDecoderImpl::DecodeImage(const std::vector<uint8_t>& encoded_data,
+ mojom::ImageCodec codec,
+ bool shrink_to_fit,
+ const DecodeImageCallback& callback) {
+ if (encoded_data.empty()) {
callback.Run(SkBitmap());
return;
}
@@ -48,26 +47,22 @@ void ImageDecoderImpl::DecodeImage(
#if defined(OS_CHROMEOS)
if (codec == mojom::ImageCodec::ROBUST_JPEG) {
// Our robust jpeg decoding is using IJG libjpeg.
- if (encoded_data.size()) {
- std::unique_ptr<SkBitmap> decoded_jpeg(gfx::JPEGCodecRobustSlow::Decode(
- encoded_data.storage().data(), encoded_data.size()));
- if (decoded_jpeg.get() && !decoded_jpeg->empty())
- decoded_image = *decoded_jpeg;
- }
+ std::unique_ptr<SkBitmap> decoded_jpeg(gfx::JPEGCodecRobustSlow::Decode(
+ encoded_data.data(), encoded_data.size()));
+ if (decoded_jpeg.get() && !decoded_jpeg->empty())
+ decoded_image = *decoded_jpeg;
} else if (codec == mojom::ImageCodec::ROBUST_PNG) {
// Our robust PNG decoding is using libpng.
- if (encoded_data.size()) {
- SkBitmap decoded_png;
- if (gfx::PNGCodec::Decode(encoded_data.storage().data(),
- encoded_data.size(), &decoded_png)) {
- decoded_image = decoded_png;
- }
+ SkBitmap decoded_png;
+ if (gfx::PNGCodec::Decode(encoded_data.data(), encoded_data.size(),
+ &decoded_png)) {
+ decoded_image = decoded_png;
}
}
#endif // defined(OS_CHROMEOS)
if (codec == mojom::ImageCodec::DEFAULT) {
- decoded_image = content::DecodeImage(encoded_data.storage().data(),
- gfx::Size(), encoded_data.size());
+ decoded_image = content::DecodeImage(encoded_data.data(), gfx::Size(),
+ encoded_data.size());
}
if (!decoded_image.isNull()) {
« no previous file with comments | « chrome/utility/image_decoder_impl.h ('k') | chrome/utility/image_decoder_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698