diff options
author | Mike Reed <reed@google.com> | 2017-11-09 11:32:12 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-11-09 16:49:44 +0000 |
commit | 0d8766c84c80537f323947089cc196c3cca106f4 (patch) | |
tree | 140197bf55b98b4c78aa29c5c3d83b981f50663d /gm/pictureimagefilter.cpp | |
parent | 40f5c55358900e855dbd39e56aee1b2aa0a7a3ff (diff) |
Remove MakeForLocalSpace since picture image is sufficient
Bug: skia:
Change-Id: If38e702c418e93141311490edf447d1f09ed4434
Reviewed-on: https://skia-review.googlesource.com/68640
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
Diffstat (limited to 'gm/pictureimagefilter.cpp')
-rw-r--r-- | gm/pictureimagefilter.cpp | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/gm/pictureimagefilter.cpp b/gm/pictureimagefilter.cpp index 587ed3733b..c9a0d393be 100644 --- a/gm/pictureimagefilter.cpp +++ b/gm/pictureimagefilter.cpp @@ -11,6 +11,9 @@ #include "SkPictureImageFilter.h" #include "SkPictureRecorder.h" +#include "SkImage.h" +#include "SkImageSource.h" + // This GM exercises the SkPictureImageFilter ImageFilter class. static void fill_rect_filtered(SkCanvas* canvas, @@ -70,6 +73,16 @@ protected: fLCDPicture = make_LCD_picture(); } + sk_sp<SkImageFilter> make(sk_sp<SkPicture> pic, SkRect r, SkFilterQuality fq) { + SkISize dim = { SkScalarRoundToInt(r.width()), SkScalarRoundToInt(r.height()) }; + auto img = SkImage::MakeFromPicture(pic, dim, nullptr, nullptr, + SkImage::BitDepth::kU8, SkColorSpace::MakeSRGB()); + return SkImageSource::Make(img, r, r, fq); + } + sk_sp<SkImageFilter> make(SkFilterQuality fq) { + return make(fPicture, fPicture->cullRect(), fq); + } + void onDraw(SkCanvas* canvas) override { canvas->clear(SK_ColorGRAY); { @@ -81,14 +94,8 @@ protected: srcRect)); sk_sp<SkImageFilter> pictureSourceEmptyRect(SkPictureImageFilter::Make(fPicture, emptyRect)); - sk_sp<SkImageFilter> pictureSourceResampled(SkPictureImageFilter::MakeForLocalSpace( - fPicture, - fPicture->cullRect(), - kLow_SkFilterQuality)); - sk_sp<SkImageFilter> pictureSourcePixelated(SkPictureImageFilter::MakeForLocalSpace( - fPicture, - fPicture->cullRect(), - kNone_SkFilterQuality)); + sk_sp<SkImageFilter> pictureSourceResampled = make(kLow_SkFilterQuality); + sk_sp<SkImageFilter> pictureSourcePixelated = make(kNone_SkFilterQuality); canvas->save(); // Draw the picture unscaled. @@ -111,10 +118,7 @@ protected: canvas->drawRect(bounds, stroke); SkPaint paint; - paint.setImageFilter(SkPictureImageFilter::MakeForLocalSpace( - fLCDPicture, - fPicture->cullRect(), - kNone_SkFilterQuality)); + paint.setImageFilter(make(fLCDPicture, fPicture->cullRect(), kNone_SkFilterQuality)); canvas->scale(4, 4); canvas->translate(-0.9f*srcRect.fLeft, -2.45f*srcRect.fTop); |