Implement remaining SkBitmapOperations as ImageSkiaOperations

chrome/browser/chromeos/status/network_menu_icon.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 "chrome/browser/chromeos/status/network_menu_icon.h"
 
 #include <algorithm>
 #include <cmath>
 #include <map>
 #include <utility>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
+#include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/image/image_skia_source.h"
-#include "ui/gfx/skbitmap_operations.h"
 
 using std::max;
 using std::min;
 
 namespace chromeos {
 
 namespace {
 
 // Amount to fade icons while connecting.
 const double kConnectingImageAlpha = 0.5;
@@ skipping 119 matching lines @@
       break;
     case NETWORK_TECHNOLOGY_UNKNOWN:
       break;
   }
   if (id == kUnknownBadgeType)
     return NULL;
   else
     return ResourceBundle::GetSharedInstance().GetImageSkiaNamed(id);
 }
 
-const SkBitmap GetEmptyBitmapOfSameSize(const gfx::ImageSkiaRep& reference) {
-  typedef std::pair<int, int> SizeKey;
-  typedef std::map<SizeKey, SkBitmap> SizeBitmapMap;
-  static SizeBitmapMap* empty_bitmaps_ = new SizeBitmapMap;
-
-  SizeKey key(reference.pixel_width(), reference.pixel_height());
-
-  SizeBitmapMap::iterator iter = empty_bitmaps_->find(key);
-  if (iter != empty_bitmaps_->end())
-    return iter->second;
-
-  SkBitmap empty;
-  empty.setConfig(SkBitmap::kARGB_8888_Config, key.first, key.second);
-  empty.allocPixels();
-  empty.eraseARGB(0, 0, 0, 0);
-  (*empty_bitmaps_)[key] = empty;
-  return empty;
-}
-
-class FadedImageSource : public gfx::ImageSkiaSource {
+class EmptyImageSource: public gfx::ImageSkiaSource {
  public:
-  FadedImageSource(const gfx::ImageSkia& source, double alpha)
-      : source_(source),
-        alpha_(alpha) {
+  EmptyImageSource(const gfx::Size& size)
+      : size_(size) {
   }
-  virtual ~FadedImageSource() {}
 
   virtual gfx::ImageSkiaRep GetImageForScale(
       ui::ScaleFactor scale_factor) OVERRIDE {
-    gfx::ImageSkiaRep image_rep = source_.GetRepresentation(scale_factor);
-    const SkBitmap empty_bitmap = GetEmptyBitmapOfSameSize(image_rep);
-    SkBitmap faded_bitmap = SkBitmapOperations::CreateBlendedBitmap(
-        empty_bitmap, image_rep.sk_bitmap(), alpha_);
-    return gfx::ImageSkiaRep(faded_bitmap, image_rep.scale_factor());
+    SkBitmap empty;
+    empty.setConfig(SkBitmap::kARGB_8888_Config, size_.width(),
+        size_.height());
+    empty.allocPixels();
+    empty.eraseARGB(0, 0, 0, 0);

[oshima, 2012/07/13 16:54:55]

can we cache this? I think it'd save more than caching ImageSkia

+    return gfx::ImageSkiaRep(empty, scale_factor);
   }
+ private:
+  const gfx::Size size_;
 
- private:
-  const gfx::ImageSkia source_;
-  const float alpha_;
-
-  DISALLOW_COPY_AND_ASSIGN(FadedImageSource);
+  DISALLOW_COPY_AND_ASSIGN(EmptyImageSource);
 };
 
 // This defines how we assemble a network icon.
 class NetworkIconImageSource : public gfx::ImageSkiaSource {
  public:
   NetworkIconImageSource(const gfx::ImageSkia& icon,
                          const gfx::ImageSkia* top_left_badge,
                          const gfx::ImageSkia* top_right_badge,
                          const gfx::ImageSkia* bottom_left_badge,
                          const gfx::ImageSkia* bottom_right_badge)
@@ skipping 33 matching lines @@
  private:
   const gfx::ImageSkia icon_;
   const gfx::ImageSkia *top_left_badge_;
   const gfx::ImageSkia *top_right_badge_;
   const gfx::ImageSkia *bottom_left_badge_;
   const gfx::ImageSkia *bottom_right_badge_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkIconImageSource);
 };
 
-// This defines how we assemble a network menu icon.
-class NetworkMenuIconSource : public gfx::ImageSkiaSource {
- public:
-  NetworkMenuIconSource(NetworkMenuIcon::ImageType type,
-                        int index,
-                        NetworkMenuIcon::ResourceColorTheme color)
-      : type_(type),
-        index_(index),
-        color_(color) {
-  }
-  virtual ~NetworkMenuIconSource() {}
-
-  virtual gfx::ImageSkiaRep GetImageForScale(
-      ui::ScaleFactor scale_factor) OVERRIDE {
-    int width, height;
-    gfx::ImageSkia* images;
-    if (type_ == NetworkMenuIcon::ARCS) {
-      if (index_ >= kNumArcsImages)
-        return gfx::ImageSkiaRep();
-      images = ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
-          color_ == NetworkMenuIcon::COLOR_DARK ?
-          IDR_STATUSBAR_NETWORK_ARCS_DARK : IDR_STATUSBAR_NETWORK_ARCS_LIGHT);
-      width = images->width();
-      height = images->height() / kNumArcsImages;
-    } else {
-      if (index_ >= kNumBarsImages)
-        return gfx::ImageSkiaRep();
-
-      images = ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
-          color_ == NetworkMenuIcon::COLOR_DARK ?
-          IDR_STATUSBAR_NETWORK_BARS_DARK : IDR_STATUSBAR_NETWORK_BARS_LIGHT);
-      width = images->width();
-      height = images->height() / kNumBarsImages;
-    }
-    gfx::ImageSkiaRep image_rep = images->GetRepresentation(scale_factor);
-
-    float scale = ui::GetScaleFactorScale(image_rep.scale_factor());
-    height *= scale;
-    width *= scale;
-
-    SkIRect subset = SkIRect::MakeXYWH(0, index_ * height, width, height);
-
-    SkBitmap dst_bitmap;
-    image_rep.sk_bitmap().extractSubset(&dst_bitmap, subset);
-    return gfx::ImageSkiaRep(dst_bitmap, image_rep.scale_factor());
-  }
-
-  gfx::Size size() const {
-    // NeworkMenuIcons all have the same size in DIP for arc/bars.
-    if (type_ == NetworkMenuIcon::ARCS) {
-      gfx::Size size = ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
-          IDR_STATUSBAR_NETWORK_ARCS_DARK)->size();
-      return gfx::Size(size.width(), size.height() / kNumArcsImages);
-    } else {
-      gfx::Size size = ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
-          IDR_STATUSBAR_NETWORK_BARS_DARK)->size();
-      return gfx::Size(size.width(), size.height() / kNumBarsImages);
-    }
-  }
-
- private:
-  const NetworkMenuIcon::ImageType type_;
-  const int index_;
-  const NetworkMenuIcon::ResourceColorTheme color_;
-
-  DISALLOW_COPY_AND_ASSIGN(NetworkMenuIconSource);
-};
-
 gfx::ImageSkia CreateVpnImage() {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   const gfx::ImageSkia* ethernet_icon = rb.GetImageSkiaNamed(IDR_STATUSBAR_VPN);
   const gfx::ImageSkia* vpn_badge = rb.GetImageSkiaNamed(kVpnBadgeId);
   return NetworkMenuIcon::GenerateImageFromComponents(
       *ethernet_icon, NULL, NULL, vpn_badge, NULL);
 }
 
+gfx::ImageSkia CreateEmptyImage(const gfx::Size& size) {

[oshima, 2012/07/13 16:54:55]

GetEmptyImage is probably better. Is this only place we need empty image? Just
wondering if this should be in common place.

[pkotwicz, 2012/07/15 03:36:48]

I haven't found a place which does something similar yet.

+  typedef std::pair<int, int> SizeKey;
+  typedef std::map<SizeKey, gfx::ImageSkia> SizeImageMap;
+  static SizeImageMap* empty_images = new SizeImageMap;
+
+  SizeKey key(size.width(), size.height());
+  SizeImageMap::iterator iter = empty_images->find(key);
+
+  if (iter != empty_images->end())
+    return iter->second;
+
+  gfx::ImageSkia empty = gfx::ImageSkia(new EmptyImageSource(size), size);
+  (*empty_images)[key] = empty;
+  return empty;
+}
+
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // NetworkIcon
 // TODO(stevenjb): Separate class implementation from the definition.
 
 // Sets up and generates an ImageSkia for a Network icon.
 class NetworkIcon {
  public:
   // Default constructor is used by the status bar icon (NetworkMenuIcon).
@@ skipping 485 matching lines @@
   icon_->UpdateIcon(network);
   // Overlay the VPN badge if connecting to a VPN.
   if (network->type() != TYPE_VPN && cros->virtual_network()) {
     if (cros->virtual_network()->connecting()) {
       const gfx::ImageSkia* vpn_badge = rb.GetImageSkiaNamed(kVpnBadgeId);
       const double animation = GetAnimation();
       animating = true;
       // Even though this is the only place we use vpn_connecting_badge_,
       // it is important that this is a member variable since we set a
       // pointer to it and access that pointer in icon_->GenerateImage().
-      vpn_connecting_badge_ = gfx::ImageSkia(
-          new FadedImageSource(*vpn_badge, animation), vpn_badge->size());
+      vpn_connecting_badge_ = gfx::ImageSkiaOperations::CreateBlendedImage(
+          CreateEmptyImage(vpn_badge->size()), *vpn_badge, animation);
       icon_->set_bottom_left_badge(&vpn_connecting_badge_);
     }
   }
   if (!animating)
     animation_connecting_.Stop();
 
   // Set the text to display.
   if (network->type() == TYPE_ETHERNET) {
     if (mode_ == MENU_MODE) {
       text_ = l10n_util::GetStringFUTF16(
@@ skipping 55 matching lines @@
                                                    top_left_badge,
                                                    top_right_badge,
                                                    bottom_left_badge,
                                                    bottom_right_badge),
                    icon.size());
 }
 
 // We blend connecting icons with a black image to generate a faded icon.
 const gfx::ImageSkia NetworkMenuIcon::GenerateConnectingImage(
     const gfx::ImageSkia& source) {
-  return gfx::ImageSkia(new FadedImageSource(source, kConnectingImageAlpha),
-                        source.size());
+  return gfx::ImageSkiaOperations::CreateBlendedImage(
+          CreateEmptyImage(source.size()), source, kConnectingImageAlpha);
 }
 
 // Generates and caches an icon image for a network's current state.
 const gfx::ImageSkia NetworkMenuIcon::GetImage(const Network* network,
                                                ResourceColorTheme color) {
   DCHECK(network);
   // Maintain a static (global) icon map. Note: Icons are never destroyed;
   // it is assumed that a finite and reasonable number of network icons will be
   // created during a session.
 
@@ skipping 23 matching lines @@
 
 // Returns an icon for a disconnected VPN.
 const gfx::ImageSkia NetworkMenuIcon::GetVpnImage() {
   static const gfx::ImageSkia *vpn_image = new gfx::ImageSkia(CreateVpnImage());
   return *vpn_image;
 }
 
 const gfx::ImageSkia NetworkMenuIcon::GetImage(ImageType type,
                                                int index,
                                                ResourceColorTheme color) {
-  NetworkMenuIconSource* source = new NetworkMenuIconSource(type, index, color);
-  return gfx::ImageSkia(source, source->size());
+  int width, height;
+  gfx::ImageSkia* images;
+  if (type == NetworkMenuIcon::ARCS) {
+    if (index >= kNumArcsImages)
+      return gfx::ImageSkia();
+    images = ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+        color == NetworkMenuIcon::COLOR_DARK ?
+        IDR_STATUSBAR_NETWORK_ARCS_DARK : IDR_STATUSBAR_NETWORK_ARCS_LIGHT);
+    width = images->width();
+    height = images->height() / kNumArcsImages;
+  } else {
+    if (index >= kNumBarsImages)
+      return gfx::ImageSkia();
+
+    images = ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+        color == NetworkMenuIcon::COLOR_DARK ?
+        IDR_STATUSBAR_NETWORK_BARS_DARK : IDR_STATUSBAR_NETWORK_BARS_LIGHT);
+    width = images->width();
+    height = images->height() / kNumBarsImages;
+  }
+  return gfx::ImageSkiaOperations::ExtractSubset(*images,
+      gfx::Rect(0, index * height, width, height));
 }
 
 const gfx::ImageSkia NetworkMenuIcon::GetDisconnectedImage(
     ImageType type,
     ResourceColorTheme color) {
   return GetImage(type, 0, color);
 }
 
 const gfx::ImageSkia NetworkMenuIcon::GetConnectedImage(ImageType type,
       ResourceColorTheme color) {
   return GetImage(type, NumImages(type) - 1, color);
 }
 
 int NetworkMenuIcon::NumImages(ImageType type) {
   return (type == ARCS) ? kNumArcsImages : kNumBarsImages;
 }
 
 }  // chromeos