Ensure that the extension icons show up in the omnibox at fractional scales.

extensions/browser/extension_icon_image.cc

 // 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.
 
 #include "extensions/browser/extension_icon_image.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "content/public/browser/notification_service.h"
@@ skipping 205 matching lines @@
       image_in.IsEmpty() ? &default_icon_ : image_in.ToImageSkia();
 
   // Maybe default icon was not set.
   if (image->isNull())
     return;
 
   gfx::ImageSkiaRep rep = image->GetRepresentation(scale);
   DCHECK(!rep.is_null());
   DCHECK_EQ(scale, rep.scale());
 
-  // Remove old representation if there is one.
-  image_skia_.RemoveRepresentation(scale);
+  // Remove all old representations. This will ensure that stale image caches
+  // are invalidated.
+  // A better approach might be to set the |image_| member using the ImageSkia

[oshima, 2015/03/24 01:19:05]

can you add TODO(oshima): here?

[ananta, 2015/03/24 02:12:23]

Done.

+  // copy from the image passed in and set the |image_skia_| member using
+  // image_.ToImageSkia(). However that does not work correctly as the
+  // ImageSkia from the image does not contain a source which breaks requests
+  // for scaled images.
+  std::vector<gfx::ImageSkiaRep> reps = image_skia_.image_reps();
+  for (size_t rep_index = 0; rep_index < reps.size(); ++rep_index) {

[oshima, 2015/03/24 01:19:05]

range based for-loop, and nuke {}

[ananta, 2015/03/24 02:12:23]

Removed the loop and replaced with image_skia_ = gfx::ImageSkia()

+    image_skia_.RemoveRepresentation(reps[rep_index].scale());
+  }

[oshima, 2015/03/24 01:22:22]

actually, you should be able to do:

image_skia_ = gfx::ImageSkia();

to clear reps.

[ananta, 2015/03/24 02:12:23]

Done.

+
   image_skia_.AddRepresentation(rep);
 
   // Update the image to use the updated image skia.
   // It's a shame we have to do this because it means that all the other
   // representations stored on |image_| will be deleted, but unfortunately
   // there's no way to combine the storage of two images.
   image_ = gfx::Image(image_skia_);
 
   FOR_EACH_OBSERVER(Observer, observers_, OnExtensionIconImageChanged(this));
 }
 
 void IconImage::Observe(int type,
                         const content::NotificationSource& source,
                         const content::NotificationDetails& details) {
   DCHECK_EQ(type, extensions::NOTIFICATION_EXTENSION_REMOVED);
 
   const Extension* extension = content::Details<const Extension>(details).ptr();
 
   if (extension_ == extension)
     extension_ = NULL;
 }
 
 }  // namespace extensions