Clean up SkBitmapOperations.

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 "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/scoped_layer_animation_settings.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
+#include "ui/gfx/shadow_value.h"
 #include "ui/gfx/skbitmap_operations.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 87 matching lines @@
       bar_(new BarView),
       state_(STATE_NORMAL) {
   set_accessibility_focusable(true);
   AddChildView(bar_);
 }
 
 LauncherButton::~LauncherButton() {
 }
 
 void LauncherButton::SetShadowedImage(const SkBitmap& bitmap) {
-  const SkColor kShadowColor[] = {
-    SkColorSetARGB(0x1A, 0, 0, 0),
-    SkColorSetARGB(0x1A, 0, 0, 0),
-    SkColorSetARGB(0x54, 0, 0, 0),
-  };
-  const gfx::Point kShadowOffset[] = {
-    gfx::Point(0, 2),
-    gfx::Point(0, 3),
-    gfx::Point(0, 0),
-  };
-  const SkScalar kShadowRadius[] = {
-    SkIntToScalar(0),
-    SkIntToScalar(1),
-    SkIntToScalar(1),
+  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,
-      arraysize(kShadowColor) - 1,
-      kShadowColor,
-      kShadowOffset,
-      kShadowRadius);
+      bitmap, gfx::ShadowValues(kShadows, kShadows + arraysize(kShadows)));
   icon_view_->SetImage(shadowed_bitmap);
 }
 
 void LauncherButton::SetImage(const SkBitmap& image) {
   if (image.empty()) {
     // TODO: need an empty image.
     icon_view_->SetImage(image);
     return;
   }
 
@@ skipping 11 matching lines @@
   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 = SkBitmapOperations::CreateResizedBitmap(
-      image, gfx::Size(width, height));
+  SkBitmap resized_image = skia::ImageOperations::Resize(
+      image, skia::ImageOperations::RESIZE_BEST, width, height);
   SetShadowedImage(resized_image);
 }
 
 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));
@@ skipping 162 matching lines @@
                                 views::ImageView::TRAILING);
       bar_->SetVerticalAlignment(views::ImageView::CENTER);
       break;
   }
 
   Layout();
   SchedulePaint();
 }
 }  // namespace internal
 }  // namespace ash