[LargeIconService] Allow decoding of images in the service

components/favicon_base/favicon_types.h

 // Copyright 2014 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.
 
 #ifndef COMPONENTS_FAVICON_BASE_FAVICON_TYPES_H_
 #define COMPONENTS_FAVICON_BASE_FAVICON_TYPES_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 81 matching lines @@
 
   // The bitmap from the favicon database if the database has a sufficiently
   // large one.
   FaviconRawBitmapResult bitmap;
 
   // The fallback icon style if a sufficiently large icon isn't available. This
   // uses the dominant color of a smaller icon as the background if available.
   std::unique_ptr<FallbackIconStyle> fallback_icon_style;
 };
 
+// Result returned by LargeIconService::GetLargeIconImageOrFallbackStyle().
+// Contains either the gfx::Image if the favicon database has a sufficiently
+// large favicon bitmap and the style of the fallback icon otherwise.
+struct LargeIconImageResult {
+  explicit LargeIconImageResult(const gfx::Image& image_in);
+
+  // Takes ownership of |fallback_icon_style_in|.
+  explicit LargeIconImageResult(FallbackIconStyle* fallback_icon_style_in);

[jkrcal, 2017/03/30 13:10:46]

Orthogonal to this CL: I find taking ownership by plain pointer a bit ugly but I
want to keep it consistent with LargeIconResult. Wouldn't it be worth (in a
separate CL) to:
 - change these FallbackIconStyle constructors to take unique_ptr, and
 - change the callbacks to pass unique_ptrs of LargeIcon(Image)Result?

This would allow us to get rid of "new ..." and to use std::move out things if
you need to.
(see, e.g. LargeIconCache::CloneLargeIconResult)

WDYT?

[pkotwicz, 2017/03/30 19:14:23]

That would be nice. However, it is not very pressing

[jkrcal, 2017/03/31 12:31:11]

Acknowledged.

+
+  ~LargeIconImageResult();
+
+  // The image from the favicon database if the database has a sufficiently
+  // large one.
+  gfx::Image image;
+
+  // The fallback icon style if a sufficiently large icon isn't available. This
+  // uses the dominant color of a smaller icon as the background if available.
+  std::unique_ptr<FallbackIconStyle> fallback_icon_style;
+};
+
 }  // namespace favicon_base
 
 #endif  // COMPONENTS_FAVICON_BASE_FAVICON_TYPES_H_