Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(15)

Unified Diff: ui/gfx/image/image_skia_operations.cc

Issue 10704199: Implement remaining SkBitmapOperations as ImageSkiaOperations (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gfx/image/image_skia_operations.h ('k') | ui/views/controls/button/image_button.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 8a3aa12c333d43dac8f128c4f61307e644504210..547584f5e1ff87775f40907e5829b17cd7c30bbd 100644
--- a/ui/gfx/image/image_skia_operations.cc
+++ b/ui/gfx/image/image_skia_operations.cc
@@ -68,6 +68,9 @@ class BlendingImageSource : public gfx::ImageSkiaSource {
alpha_(alpha) {
}
+ virtual ~BlendingImageSource() {
+ }
+
// gfx::ImageSkiaSource overrides:
virtual ImageSkiaRep GetImageForScale(ui::ScaleFactor scale_factor) OVERRIDE {
ImageSkiaRep first_rep = first_.GetRepresentation(scale_factor);
@@ -93,6 +96,9 @@ class MaskedImageSource : public gfx::ImageSkiaSource {
alpha_(alpha) {
}
+ virtual ~MaskedImageSource() {
+ }
+
// gfx::ImageSkiaSource overrides:
virtual ImageSkiaRep GetImageForScale(ui::ScaleFactor scale_factor) OVERRIDE {
ImageSkiaRep rgb_rep = rgb_.GetRepresentation(scale_factor);
@@ -122,6 +128,9 @@ class TiledImageSource : public gfx::ImageSkiaSource {
dst_h_(dst_h) {
}
+ virtual ~TiledImageSource() {
+ }
+
// gfx::ImageSkiaSource overrides:
virtual ImageSkiaRep GetImageForScale(ui::ScaleFactor scale_factor) OVERRIDE {
ImageSkiaRep source_rep = source_.GetRepresentation(scale_factor);
@@ -143,6 +152,72 @@ class TiledImageSource : public gfx::ImageSkiaSource {
DISALLOW_COPY_AND_ASSIGN(TiledImageSource);
};
+// ImageSkiaSource which uses SkBitmapOperations::CreateButtonBackground
+// to generate image reps for the target image.
+class ButtonImageSource: public gfx::ImageSkiaSource {
+ public:
+ ButtonImageSource(SkColor color,
+ const ImageSkia& image,
+ const ImageSkia& mask)
+ : color_(color),
+ image_(image),
+ mask_(mask) {
+ }
+
+ virtual ~ButtonImageSource() {
+ }
+
+ // gfx::ImageSkiaSource overrides:
+ virtual ImageSkiaRep GetImageForScale(ui::ScaleFactor scale_factor) OVERRIDE {
+ ImageSkiaRep image_rep = image_.GetRepresentation(scale_factor);
+ ImageSkiaRep mask_rep = mask_.GetRepresentation(scale_factor);
+ MatchScale(&image_rep, &mask_rep);
+ return ImageSkiaRep(
+ SkBitmapOperations::CreateButtonBackground(color_,
+ image_rep.sk_bitmap(), mask_rep.sk_bitmap()),
+ image_rep.scale_factor());
+ }
+
+ private:
+ const SkColor color_;
+ const ImageSkia image_;
+ const ImageSkia mask_;
+
+ DISALLOW_COPY_AND_ASSIGN(ButtonImageSource);
+};
+
+// ImageSkiaSource which uses SkBitmap::extractSubset to generate image reps
+// for the target image.
+class ExtractSubsetImageSource: public gfx::ImageSkiaSource {
+ public:
+ ExtractSubsetImageSource(const gfx::ImageSkia& image,
+ const gfx::Rect& subset_bounds)
+ : image_(image),
+ subset_bounds_(subset_bounds) {
+ }
+
+ ~ExtractSubsetImageSource() {
+ }
+
+ // gfx::ImageSkiaSource overrides:
+ virtual ImageSkiaRep GetImageForScale(ui::ScaleFactor scale_factor) OVERRIDE {
+ ImageSkiaRep image_rep = image_.GetRepresentation(scale_factor);
+ SkIRect subset_bounds_in_pixel = RectToSkIRect(subset_bounds_.Scale(
+ ui::GetScaleFactorScale(image_rep.scale_factor())));
+ SkBitmap dst;
+ bool success = image_rep.sk_bitmap().extractSubset(&dst,
+ subset_bounds_in_pixel);
+ DCHECK(success);
+ return gfx::ImageSkiaRep(dst, image_rep.scale_factor());
+ }
+
+ private:
+ const gfx::ImageSkia image_;
+ const gfx::Rect subset_bounds_;
+
+ DISALLOW_COPY_AND_ASSIGN(ExtractSubsetImageSource);
+};
+
// ResizeSource resizes relevant image reps in |source| to |target_dip_size|
// for requested scale factors.
class ResizeSource : public ImageSkiaSource {
@@ -235,6 +310,25 @@ ImageSkia ImageSkiaOperations::CreateTiledImage(const ImageSkia& source,
}
// static
+ImageSkia ImageSkiaOperations::CreateButtonBackground(SkColor color,
+ const ImageSkia& image,
+ const ImageSkia& mask) {
+ return ImageSkia(new ButtonImageSource(color, image, mask), mask.size());
+}
+
+// static
+ImageSkia ImageSkiaOperations::ExtractSubset(const ImageSkia& image,
+ const Rect& subset_bounds) {
+ gfx::Rect clipped_bounds = subset_bounds.Intersect(gfx::Rect(image.size()));
+ if (image.isNull() || clipped_bounds.IsEmpty()) {
+ return ImageSkia();
+ }
+
+ return ImageSkia(new ExtractSubsetImageSource(image, clipped_bounds),
+ clipped_bounds.size());
+}
+
+// static
ImageSkia ImageSkiaOperations::CreateResizedImage(const ImageSkia& source,
const Size& target_dip_size) {
return ImageSkia(new ResizeSource(source, target_dip_size), target_dip_size);
« no previous file with comments | « ui/gfx/image/image_skia_operations.h ('k') | ui/views/controls/button/image_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698