Set desired_image_size when decoding images for NTP Tile icons.

services/image_decoder/public/cpp/decode.h

Index: services/image_decoder/public/cpp/decode.h
diff --git a/services/image_decoder/public/cpp/decode.h b/services/image_decoder/public/cpp/decode.h
index 399617267d777acd1f053eac6bbed240d6d63bb3..ea0fa2e848ff7f23132746dc1afc13cbe195349f 100644
--- a/services/image_decoder/public/cpp/decode.h
+++ b/services/image_decoder/public/cpp/decode.h
@@ -11,6 +11,10 @@
 
 #include "services/image_decoder/public/interfaces/image_decoder.mojom.h"
 
+namespace gfx {
+class Size;
+}
+
 namespace service_manager {
 class Connector;
 }
@@ -19,15 +23,21 @@ namespace image_decoder {
 
 const uint64_t kDefaultMaxSizeInBytes = 128 * 1024 * 1024;
 
-// Helper function to decode an image via the image_decoder service. Upon
-// completion, |callback| is invoked on the calling thread TaskRunner with an
-// SkBitmap argument. The SkBitmap will be null on failure and non-null on
+// Helper function to decode an image via the image_decoder service. For images
+// with multiple frames (e.g. ico files), a frame with a size as close as
+// possible to |desired_image_frame_size| is chosen (tries to take one in larger
+// size if there's no precise match). Passing gfx::Size() as
+// |desired_image_frame_size| is also supported and will result in chosing the
+// smallest available size.
+// Upon completion, |callback| is invoked on the calling thread TaskRunner with
+// an SkBitmap argument. The SkBitmap will be null on failure and non-null on
 // success.
 void Decode(service_manager::Connector* connector,
             const std::vector<uint8_t>& encoded_bytes,
             mojom::ImageCodec codec,
             bool shrink_to_fit,
             uint64_t max_size_in_bytes,
+            const gfx::Size& desired_image_frame_size,
             const mojom::ImageDecoder::DecodeImageCallback& callback);
 
 }  // namespace image_decoder