Implement remaining SkBitmapOperations as ImageSkiaOperations

ui/gfx/image/image_skia_operations.h

 // 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.
 
 #ifndef UI_GFX_IMAGESKIA_OPERATIONS_H_
 #define UI_GFX_IMAGESKIA_OPERATIONS_H_
 
 #include "base/gtest_prod_util.h"
 #include "ui/base/ui_export.h"
-#include "ui/gfx/size.h"
+#include "ui/gfx/color_utils.h"
 
 namespace gfx {
 class ImageSkia;
+class Rect;
+class Size;
 
 class UI_EXPORT ImageSkiaOperations {
  public:
   // Create an image that is a blend of two others. The alpha argument
   // specifies the opacity of the second imag. The provided image must
   // use the kARGB_8888_Config config and be of equal dimensions.
   static ImageSkia CreateBlendedImage(const ImageSkia& first,
                                       const ImageSkia& second,
                                       double alpha);
 
   // Create an image that is the original image masked out by the mask defined
   // in the alpha image. The images must use the kARGB_8888_Config config and
   // be of equal dimensions.
   static ImageSkia CreateMaskedImage(const ImageSkia& first,
                                      const ImageSkia& alpha);
 
   // Create an image that is cropped from another image. This is special
   // because it tiles the original image, so your coordinates can extend
   // outside the bounds of the original image.
   static ImageSkia CreateTiledImage(const ImageSkia& image,
                                     int src_x, int src_y,
                                     int dst_w, int dst_h);
 
+  // We create a button background image by compositing the color and image
+  // together, then applying the mask. This is a highly specialized composite
+  // operation that is the equivalent of drawing a background in |color|,
+  // tiling |image| over the top, and then masking the result out with |mask|.
+  // The images must use kARGB_8888_Config config.
+  static ImageSkia CreateButtonBackground(SkColor color,

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

If this is specific to image button, i'd keep it in image_button.cc. Is someone
else using this?

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

I want to keep it here if only because this method is in SkBitmapOperations. I
think that it is currently good on erring on the side of adding to
image_skia_operations. This way we can notice similarities between methods and
try to combine them. For instance SkBitmapOperations::CreateSuperimposedBitmap
is the same as SkBitmapOperations::CreateMaskedBitmap except that they use a
different SkXfermode. 

+                                          const gfx::ImageSkia& image,
+                                          const gfx::ImageSkia& mask);
+
+  // Shift an image's HSL values. The shift values are in the range of 0-1,
+  // with the option to specify -1 for 'no change'. The shift values are
+  // defined as:
+  // hsl_shift[0] (hue): The absolute hue value for the image - 0 and 1 map
+  //    to 0 and 360 on the hue color wheel (red).
+  // hsl_shift[1] (saturation): A saturation shift for the image, with the
+  //    following key values:
+  //    0 = remove all color.
+  //    0.5 = leave unchanged.
+  //    1 = fully saturate the image.
+  // hsl_shift[2] (lightness): A lightness shift for the image, with the
+  //    following key values:
+  //    0 = remove all lightness (make all pixels black).
+  //    0.5 = leave unchanged.
+  //    1 = full lightness (make all pixels white).
+  static ImageSkia CreateHSLShiftedImage(const gfx::ImageSkia& image,
+                                         const color_utils::HSL& hsl_shift);
+
+  // Create an image by combining alpha channel of |image| and color |c|.
+  // The image must use the kARGB_8888_Config config.
+  static ImageSkia CreateColorMask(const gfx::ImageSkia& image, SkColor c);

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

Are these used in this CL? I prefer to add when you need it. (when you update
the place that uses SkBitmapOperations)

+
+  // Returns an image which is a subset of |image| with bounds |subset_bounds|.
+  static ImageSkia ExtractSubset(const gfx::ImageSkia& image,
+                                 const gfx::Rect& subset_bounds);
+
   // Creates an image that resizes |source| to given |target_size_in_dip|.
   // The resize operation occurs synchronously at the time that the desired
   // scale factor is known (either GetRepresentation is called or the image
   // is painted).
   // As |source| is cached for the lifetime of this object and the resize
   // operation will most likely be performed on the UI thread, the maximum
   // supported DIP size of |source| and |target_size_in_dip| is 64x64 DIP.
   // Resizing larger bitmaps should be done more explicitly using
   // ImageOperations::Resize.
   static ImageSkia CreateResizedImage(const ImageSkia& source,
                                       const Size& target_size_in_dip);
 
  private:
   ImageSkiaOperations();  // Class for scoping only.
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_IMAGESKIA_OPERATIONS_H_