Set desired_image_size when decoding images for NTP Tile icons.

services/image_decoder/image_decoder_impl.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "services/image_decoder/image_decoder_impl.h"
 
 #include <string.h>
 
 #include <utility>
 
 #include "base/logging.h"
 #include "content/public/child/image_decoder_utils.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/skia/include/core/SkBitmap.h"
-#include "ui/gfx/geometry/size.h"
 
 #if defined(OS_CHROMEOS)
 #include "ui/gfx/chromeos/codec/jpeg_codec_robust_slow.h"
 #include "ui/gfx/codec/png_codec.h"
 #endif
 
 namespace image_decoder {
 
 namespace {
 
 int64_t kPadding = 64;
 
 }  // namespace
 
 ImageDecoderImpl::ImageDecoderImpl(
     std::unique_ptr<service_manager::ServiceContextRef> service_ref)
     : service_ref_(std::move(service_ref)) {}
 
 ImageDecoderImpl::~ImageDecoderImpl() = default;
 
 void ImageDecoderImpl::DecodeImage(const std::vector<uint8_t>& encoded_data,
                                    mojom::ImageCodec codec,
                                    bool shrink_to_fit,
                                    int64_t max_size_in_bytes,
+                                   const gfx::Size& desired_image_frame_size,
                                    const DecodeImageCallback& callback) {
   if (encoded_data.size() == 0) {
     callback.Run(SkBitmap());
     return;
   }
 
   SkBitmap decoded_image;
 #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.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.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.data(), gfx::Size(), encoded_data.size());
+        encoded_data.data(), desired_image_frame_size, encoded_data.size());
   }
 
   if (!decoded_image.isNull()) {
     // When serialized, the space taken up by a skia::mojom::Bitmap excluding
     // the pixel data payload should be:
     //   sizeof(skia::mojom::Bitmap::Data_) + pixel data array header (8 bytes)
     // Use a bigger number in case we need padding at the end.
     int64_t struct_size = sizeof(skia::mojom::Bitmap::Data_) + kPadding;
     int64_t image_size = decoded_image.computeSize64();
     int halves = 0;
@@ skipping 13 matching lines @@
       } else {
         decoded_image.reset();
       }
     }
   }
 
   callback.Run(decoded_image);
 }
 
 }  // namespace image_decoder