wip

chrome/browser/ui/webui/extensions/extension_icon_source.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 "chrome/browser/ui/webui/extensions/extension_icon_source.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/stl_util.h"
@@ skipping 14 matching lines @@
 #include "skia/ext/image_operations.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/skbitmap_operations.h"
 #include "webkit/glue/image_decoder.h"
 
 namespace {
 
+// Hmm, this sends desaturated favicons to the renderer. We either need our own
+// binary serialization of multiple pngs, or we just use ico.
 scoped_refptr<base::RefCountedMemory> BitmapToMemory(const SkBitmap* image) {
   base::RefCountedBytes* image_bytes = new base::RefCountedBytes;
   gfx::PNGCodec::EncodeBGRASkBitmap(*image, false, &image_bytes->data());
   return image_bytes;
 }
 
 SkBitmap DesaturateImage(const SkBitmap* image) {
   color_utils::HSL shift = {-1, 0, 0.6};
   return SkBitmapOperations::CreateHSLShiftedBitmap(*image, shift);
 }
@@ skipping 185 matching lines @@
   // Fallback to the default icon if there wasn't a favicon.
   if (!favicon.is_valid()) {
     LoadDefaultImage(request_id);
     return;
   }
 
   if (!request->grayscale) {
     // If we don't need a grayscale image, then we can bypass FinalizeImage
     // to avoid unnecessary conversions.
     ClearData(request_id);
-    SendResponse(request_id, favicon.bitmap_data);
+    SendResponse(request_id, favicon.variants[0].bitmap_data);
   } else {
-    FinalizeImage(ToBitmap(favicon.bitmap_data->front(),
-                           favicon.bitmap_data->size()), request_id);
+    FinalizeImage(ToBitmap(
+          favicon.variants[0].bitmap_data->front(),
+          favicon.variants[0].bitmap_data->size()), request_id);
   }
 }
 
 void ExtensionIconSource::OnImageLoaded(const gfx::Image& image,
                                         const std::string& extension_id,
                                         int index) {
   int request_id = tracker_map_[index];
   tracker_map_.erase(tracker_map_.find(index));
 
   if (image.IsEmpty())
@@ skipping 84 matching lines @@
 
 void ExtensionIconSource::ClearData(int request_id) {
   std::map<int, ExtensionIconRequest*>::iterator i =
       request_map_.find(request_id);
   if (i == request_map_.end())
     return;
 
   delete i->second;
   request_map_.erase(i);
 }