Use hi-resolution favicon variants if available.

webkit/glue/image_decoder.cc

 // Copyright (c) 2012 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 "webkit/glue/image_decoder.h"
 
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebData.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebImage.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h"
 #include "third_party/skia/include/core/SkBitmap.h"
@@ skipping 12 matching lines @@
 
 ImageDecoder::~ImageDecoder() {
 }
 
 SkBitmap ImageDecoder::Decode(const unsigned char* data, size_t size) const {
   const WebImage& image = WebImage::fromData(
       WebData(reinterpret_cast<const char*>(data), size), desired_icon_size_);
   return image.getSkBitmap();
 }
 
+// static
+std::vector<SkBitmap> ImageDecoder::DecodeAll(
+      const unsigned char* data, size_t size,
+      const std::vector<gfx::Size>& desired_sizes) {
+  WebKit::WebVector<WebKit::WebSize> sizes(desired_sizes.size());
+  for (size_t i = 0; i < desired_sizes.size(); ++i)
+    sizes[i] = desired_sizes[i];
+
+  const WebKit::WebVector<WebImage>& images = WebImage::framesFromData(

[pkotwicz, 2012/08/02 23:47:08]

Nit: images -> bitmaps

+      WebData(reinterpret_cast<const char*>(data), size), sizes);
+
+  std::vector<SkBitmap> result;
+  result.resize(images.size());
+  for (size_t i = 0; i < images.size(); ++i)
+    result[i] = images[i].getSkBitmap();
+  return result;
+}
+
 }  // namespace webkit_glue