Clean up SkBitmapOperations.

ui/app_list/app_list_item_view.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/app_list_item_view.h"
 
 #include <algorithm>
+#include <vector>
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/synchronization/cancellation_flag.h"
 #include "base/threading/worker_pool.h"
 #include "base/utf_string_conversions.h"
+#include "skia/ext/image_operations.h"
 #include "ui/app_list/app_list_item_model.h"
 #include "ui/app_list/apps_grid_view.h"
 #include "ui/app_list/drop_shadow_label.h"
 #include "ui/app_list/icon_cache.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/animation/throb_animation.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/shadow_value.h"
@@ skipping 95 matching lines @@
 
   static void Run(scoped_refptr<IconOperation> op) {
     op->ResizeAndGenerateShadow();
   }
 
   // Padding space around icon to contain its shadow. Note it should be at least
   // the max size of shadow radius + shadow offset in shadow generation code.
   static const int kShadowPadding = 15;
 
   void ResizeAndGenerateShadow() {
-    // If you change shadow radius and shadow offset, please also update
-    // kShadowPaddingAbove.
-    const SkColor kShadowColor[] = {
-      SkColorSetARGB(0xCC, 0, 0, 0),
-      SkColorSetARGB(0x33, 0, 0, 0),
-      SkColorSetARGB(0x4C, 0, 0, 0),
-    };
-    const gfx::Point kShadowOffset[] = {
-      gfx::Point(0, 0),
-      gfx::Point(0, 4),
-      gfx::Point(0, 5),
-    };
-    const SkScalar kShadowRadius[] = {
-      SkIntToScalar(2),
-      SkIntToScalar(4),
-      SkIntToScalar(10),
-    };
+    if (cancel_flag_.IsSet())
+      return;
+
+    if (size_ != gfx::Size(bitmap_.width(), bitmap_.height())) {
+      bitmap_ = skia::ImageOperations::Resize(bitmap_,
+          skia::ImageOperations::RESIZE_BEST, size_.width(), size_.height());
+    }
 
     if (cancel_flag_.IsSet())
       return;
 
-    if (size_ != gfx::Size(bitmap_.width(), bitmap_.height()))
-      bitmap_ = SkBitmapOperations::CreateResizedBitmap(bitmap_, size_);
+    // If you change shadow radius and shadow offset, please also update
+    // kShadowPaddingAbove.
+    const gfx::ShadowValue kShadows[] = {
+      gfx::ShadowValue(gfx::Point(0, 0), 2, SkColorSetARGB(0xCC, 0, 0, 0)),
+      gfx::ShadowValue(gfx::Point(0, 4), 4, SkColorSetARGB(0x33, 0, 0, 0)),
+      gfx::ShadowValue(gfx::Point(0, 5), 10, SkColorSetARGB(0x4C, 0, 0, 0)),
+    };
+    const std::vector<gfx::ShadowValue> shadows(
+        &kShadows[0],
+        &kShadows[arraysize(kShadows)]);

[Alexei Svitkine (slow), 2012/05/25 18:16:06]

I think initializing with (kShadows, kShadows + arraysize(kShadows)) is a bit
cleaner. Also, maybe just inline it into the call below.

[xiyuan, 2012/05/25 19:34:01]

Done.

 
-    if (cancel_flag_.IsSet())
-      return;
-
-    bitmap_ = SkBitmapOperations::CreateDropShadow(
-        bitmap_,
-        arraysize(kShadowColor),
-        kShadowColor,
-        kShadowOffset,
-        kShadowRadius);
+    bitmap_ = SkBitmapOperations::CreateDropShadow(bitmap_, shadows);
   }
 
   void Cancel() {
     cancel_flag_.Set();
   }
 
   const SkBitmap& bitmap() const {
     return bitmap_;
   }
 
@@ skipping 235 matching lines @@
 void AppListItemView::StateChanged() {
   if (state() == BS_HOT || state() == BS_PUSHED) {
     list_model_view_->SetSelectedItem(this);
   } else {
     list_model_view_->ClearSelectedItem(this);
     model_->SetHighlighted(false);
   }
 }
 
 }  // namespace app_list