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

ash/launcher/launcher_button.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 "ash/launcher/launcher_button.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/launcher/launcher_button_host.h"
 #include "grit/ui_resources.h"
-#include "skia/ext/image_operations.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/animation/animation_delegate.h"
 #include "ui/base/animation/throb_animation.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animation_element.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/compositor/layer_animation_sequence.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
+#include "ui/gfx/image/image_skia_sources.h"
 #include "ui/gfx/shadow_value.h"
-#include "ui/gfx/skbitmap_operations.h"
 #include "ui/gfx/transform_util.h"
 #include "ui/views/controls/image_view.h"
 
 namespace {
 
 // Size of the bar. This is along the opposite axis of the shelf. For example,
 // if the shelf is aligned horizontally then this is the height of the bar.
 const int kBarSize = 3;
 const int kBarSpacing = 5;
 const int kIconSize = 32;
@@ skipping 192 matching lines @@
       icon_view_(NULL),
       bar_(new BarView),
       state_(STATE_NORMAL) {
   set_accessibility_focusable(true);
   AddChildView(bar_);
 }
 
 LauncherButton::~LauncherButton() {
 }
 
-void LauncherButton::SetShadowedImage(const SkBitmap& bitmap) {
+void LauncherButton::SetShadowedImage(const gfx::ImageSkia& image) {
   const gfx::ShadowValue kShadows[] = {
     gfx::ShadowValue(gfx::Point(0, 2), 0, SkColorSetARGB(0x1A, 0, 0, 0)),
     gfx::ShadowValue(gfx::Point(0, 3), 1, SkColorSetARGB(0x1A, 0, 0, 0)),
     gfx::ShadowValue(gfx::Point(0, 0), 1, SkColorSetARGB(0x54, 0, 0, 0)),
   };
 
-  SkBitmap shadowed_bitmap = SkBitmapOperations::CreateDropShadow(
-      bitmap, gfx::ShadowValues(kShadows, kShadows + arraysize(kShadows)));
-  icon_view_->SetImage(shadowed_bitmap);
+  const gfx::ShadowValues shadows(kShadows, kShadows + arraysize(kShadows));
+  const gfx::Insets shadow_padding = -gfx::ShadowValue::GetMargin(shadows);
+  gfx::Size shadow_image_size = image.size();
+  shadow_image_size.Enlarge(shadow_padding.width(),
+                            shadow_padding.height());
+
+  icon_view_->SetImage(gfx::ImageSkia(
+      gfx::image_skia_sources::CreateDropShadowSource(image, shadows),
+      shadow_image_size));

[oshima, 2012/07/10 23:51:06]

Can you move this to gfx::ImageSkiaOperations ?
(ui/gfx/images/image_skia_operations.{h|cc})

[xiyuan, 2012/07/11 17:39:13]

Done. Peter made a similar proposal. :)

 }
 
-void LauncherButton::SetImage(const SkBitmap& image) {
+void LauncherButton::SetImage(const gfx::ImageSkia& image) {
   if (image.empty()) {
     // TODO: need an empty image.
     icon_view_->SetImage(image);
     return;
   }
 
   if (icon_view_->icon_size() == 0) {
     SetShadowedImage(image);
     return;
   }
 
   // Resize the image maintaining our aspect ratio.
   int pref = icon_view_->icon_size();
   float aspect_ratio =
       static_cast<float>(image.width()) / static_cast<float>(image.height());
   int height = pref;
   int width = static_cast<int>(aspect_ratio * height);
   if (width > pref) {
     width = pref;
     height = static_cast<int>(width / aspect_ratio);
   }
 
   if (width == image.width() && height == image.height()) {
     SetShadowedImage(image);
     return;
   }
 
-  SkBitmap resized_image = skia::ImageOperations::Resize(
-      image, skia::ImageOperations::RESIZE_BEST, width, height);
-  SetShadowedImage(resized_image);
+  const gfx::Size size(width, height);
+  SetShadowedImage(gfx::ImageSkia(
+      gfx::image_skia_sources::CreateResizeSource(image, size),
+      size));
 }
 
 void LauncherButton::AddState(State state) {
   if (!(state_ & state)) {
     if (ShouldHop(state) || !ShouldHop(state_)) {
       ui::ScopedLayerAnimationSettings scoped_setter(
           icon_view_->layer()->GetAnimator());
       scoped_setter.SetTransitionDuration(
           base::TimeDelta::FromMilliseconds(kHopUpMS));
       state_ |= state;
@@ skipping 174 matching lines @@
       bar_->SetVerticalAlignment(views::ImageView::CENTER);
       break;
   }
 
   Layout();
   SchedulePaint();
 }
 
 }  // namespace internal
 }  // namespace ash