Convert extension action icons code to use ImageSkia instead of SkBitmap

ui/gfx/image/image_skia_operations.cc

Index: ui/gfx/image/image_skia_operations.cc
diff --git a/ui/gfx/image/image_skia_operations.cc b/ui/gfx/image/image_skia_operations.cc
index c4bbce4ac6fa482259dd75f71423fc7e8a427470..23f93f41d332cf688067f79b5cc5e4619548d284 100644
--- a/ui/gfx/image/image_skia_operations.cc
+++ b/ui/gfx/image/image_skia_operations.cc
@@ -10,6 +10,8 @@
 #include "skia/ext/platform_canvas.h"
 #include "ui/base/layout.h"
 #include "ui/base/ui_base_switches.h"
+#include "ui/gfx/canvas.h"
+#include "ui/gfx/image/canvas_image_source.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_rep.h"
 #include "ui/gfx/image/image_skia_source.h"
@@ -89,6 +91,63 @@ class BlendingImageSource : public gfx::ImageSkiaSource {
   DISALLOW_COPY_AND_ASSIGN(BlendingImageSource);
 };
 
+class SuperimposedImageSource : public gfx::CanvasImageSource {
+ public:
+  SuperimposedImageSource(const ImageSkia& first,
+                          const ImageSkia& second)
+      : gfx::CanvasImageSource(first.size(), false /* is opaque */),
+        first_(first),
+        second_(second) {
+  }
+
+  virtual ~SuperimposedImageSource() {}
+
+  // gfx::CanvasImageSource override.
+  virtual void Draw(Canvas* canvas) OVERRIDE {
+    canvas->DrawImageInt(first_, 0, 0);
+    canvas->DrawImageInt(second_,
+                         (first_.width() - second_.width()) / 2,
+                         (first_.height() - second_.height()) / 2);
+  }
+
+ private:
+  const ImageSkia first_;
+  const ImageSkia second_;
+
+  DISALLOW_COPY_AND_ASSIGN(SuperimposedImageSource);
+};
+
+class TransparentImageSource : public gfx::ImageSkiaSource {
+ public:
+  TransparentImageSource(const ImageSkia& image, double alpha)
+      : image_(image),
+        alpha_(alpha) {
+  }
+
+  virtual ~TransparentImageSource() {}
+
+ private:
+  // gfx::ImageSkiaSource overrides:
+  virtual ImageSkiaRep GetImageForScale(ui::ScaleFactor scale_factor) OVERRIDE {
+    ImageSkiaRep image_rep = image_.GetRepresentation(scale_factor);
+    SkBitmap alpha;
+    const float scale = ui::GetScaleFactorScale(image_rep.scale_factor());
+    alpha.setConfig(SkBitmap::kARGB_8888_Config,
+                    static_cast<int>(image_.size().width() * scale),
+                    static_cast<int>(image_.size().height() * scale));
+    alpha.allocPixels();
+    alpha.eraseColor(SkColorSetARGB(alpha_ * 256, 0, 0, 0));
+    return ImageSkiaRep(SkBitmapOperations::CreateMaskedBitmap(
+        image_rep.sk_bitmap(), alpha),
+                        image_rep.scale_factor());
+  }
+
+  ImageSkia image_;
+  double alpha_;
+
+  DISALLOW_COPY_AND_ASSIGN(TransparentImageSource);
+};
+
 class MaskedImageSource : public gfx::ImageSkiaSource {
  public:
   MaskedImageSource(const ImageSkia& rgb, const ImageSkia& alpha)
@@ -322,6 +381,19 @@ ImageSkia ImageSkiaOperations::CreateBlendedImage(const ImageSkia& first,
 }
 
 // static
+ImageSkia ImageSkiaOperations::CreateSuperimposedImage(
+    const ImageSkia& first,
+    const ImageSkia& second) {
+  return ImageSkia(new SuperimposedImageSource(first, second), first.size());
+}
+
+// static
+ImageSkia ImageSkiaOperations::CreateTransparentImage(const ImageSkia& image,
+                                                      double alpha) {
+  return ImageSkia(new TransparentImageSource(image, alpha), image.size());
+}
+
+// static
 ImageSkia ImageSkiaOperations::CreateMaskedImage(const ImageSkia& rgb,
                                                  const ImageSkia& alpha) {
   return ImageSkia(new MaskedImageSource(rgb, alpha), rgb.size());