chromeos: Fix pixelated icons in app list and launcher (part 1)

ui/app_list/icon_cache.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 "ui/app_list/icon_cache.h"
 
 #include "base/logging.h"
 #include "base/md5.h"
 #include "ui/gfx/size.h"
+#include "ui/gfx/screen.h"
 
 namespace {
 
 // Gets cache key based on |image| contents and desired |size|.
-std::string GetKey(const SkBitmap& image, const gfx::Size& size) {
-  SkAutoLockPixels image_lock(image);
+std::string GetKey(const gfx::ImageSkia& image, const gfx::Size& size) {
+  // TODO(xiyuan): Revisit this after ImageLoadingTracker DIP support is done.
+  ui::ScaleFactor scale_factor = gfx::Screen::IsDIPEnabled() ?
+      ui::SCALE_FACTOR_200P : ui::SCALE_FACTOR_100P;

[sky, 2012/07/16 16:49:39]

How come if dip is enabled this always scales by 2?

[xiyuan, 2012/07/16 17:08:02]

This is because we have not yet decided what is the right DIP scale to use here.
The code here assumes high-res image is always used. This might not be true and
that's why I have a TODO above to fix it once we have decided how extension icon
should be loaded.

Maybe we should fingerprint all representations in ImageSkia here? Then we don't
need to worry about DIP here.

+  const gfx::ImageSkiaRep& image_rep = image.GetRepresentation(scale_factor);
+  DCHECK(!image_rep.is_null());
+  const SkBitmap& bitmap = image_rep.sk_bitmap();
+  SkAutoLockPixels image_lock(bitmap);
   base::MD5Digest digest;
-  MD5Sum(image.getPixels(), image.getSize(), &digest);
+  MD5Sum(bitmap.getPixels(), bitmap.getSize(), &digest);
 
   return MD5DigestToBase16(digest) + "." + size.ToString();
 }
 
 }  // namespace
 
 namespace app_list {
 
 // static
 IconCache* IconCache::instance_ = NULL;
@@ skipping 24 matching lines @@
 
 void IconCache::PurgeAllUnused() {
   for (Cache::iterator i = cache_.begin(); i != cache_.end();) {
     Cache::iterator current(i);
     ++i;
     if (!current->second.used)
       cache_.erase(current);
   }
 }
 
-bool IconCache::Get(const SkBitmap& src,
+bool IconCache::Get(const gfx::ImageSkia& src,
                     const gfx::Size& size,
-                    SkBitmap* processed) {
+                    gfx::ImageSkia* processed) {
   Cache::iterator it = cache_.find(GetKey(src, size));
   if (it == cache_.end())
     return false;
 
   it->second.used = true;
 
   if (processed)
     *processed = it->second.image;
   return true;
 }
 
-void IconCache::Put(const SkBitmap& src,
+void IconCache::Put(const gfx::ImageSkia& src,
                     const gfx::Size& size,
-                    const SkBitmap& processed) {
+                    const gfx::ImageSkia& processed) {
   const std::string key = GetKey(src, size);
   cache_[key].image = processed;
   cache_[key].used = true;
 }
 
 IconCache::IconCache() {
 }
 
 IconCache::~IconCache() {
 }
 
 }  // namespace app_list