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

Unified Diff: webkit/glue/image_decoder.cc

Issue 10828127: Use hi-resolution favicon variants if available. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: daringfireball hackfix Created 8 years, 5 months 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
Index: webkit/glue/image_decoder.cc
diff --git a/webkit/glue/image_decoder.cc b/webkit/glue/image_decoder.cc
index 83b935c08a246248c41f83947d6aeae836ad230b..ff33b0d64637bd9e17170257255453b87729e1a8 100644
--- a/webkit/glue/image_decoder.cc
+++ b/webkit/glue/image_decoder.cc
@@ -30,4 +30,22 @@ SkBitmap ImageDecoder::Decode(const unsigned char* data, size_t size) const {
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

Powered by Google App Engine
This is Rietveld 408576698