diff options
author | Mike Reed <reed@google.com> | 2017-11-09 18:44:05 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-11-09 18:44:17 +0000 |
commit | fc45998242b6e95ff610fd2c4edcf72c10e536ab (patch) | |
tree | ec57e5d0c271ea4a81c66bc73af6c7662282111c /gm/pictureimagefilter.cpp | |
parent | ea000ff33003a661e13d2b5a963820102eaa102a (diff) |
Revert "Remove MakeForLocalSpace since picture image is sufficient"
This reverts commit 0d8766c84c80537f323947089cc196c3cca106f4.
Reason for revert: broke google3
Original change's description:
> 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>
TBR=robertphillips@google.com,fmalita@chromium.org,reed@google.com
Change-Id: I3dec3d2c704e02b4db5977c27cc3e6d9f1c68ed5
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/69500
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'gm/pictureimagefilter.cpp')
-rw-r--r-- | gm/pictureimagefilter.cpp | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/gm/pictureimagefilter.cpp b/gm/pictureimagefilter.cpp index c9a0d393be..587ed3733b 100644 --- a/gm/pictureimagefilter.cpp +++ b/gm/pictureimagefilter.cpp @@ -11,9 +11,6 @@ #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, @@ -73,16 +70,6 @@ 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); { @@ -94,8 +81,14 @@ protected: srcRect)); sk_sp<SkImageFilter> pictureSourceEmptyRect(SkPictureImageFilter::Make(fPicture, emptyRect)); - sk_sp<SkImageFilter> pictureSourceResampled = make(kLow_SkFilterQuality); - sk_sp<SkImageFilter> pictureSourcePixelated = make(kNone_SkFilterQuality); + sk_sp<SkImageFilter> pictureSourceResampled(SkPictureImageFilter::MakeForLocalSpace( + fPicture, + fPicture->cullRect(), + kLow_SkFilterQuality)); + sk_sp<SkImageFilter> pictureSourcePixelated(SkPictureImageFilter::MakeForLocalSpace( + fPicture, + fPicture->cullRect(), + kNone_SkFilterQuality)); canvas->save(); // Draw the picture unscaled. @@ -118,7 +111,10 @@ protected: canvas->drawRect(bounds, stroke); SkPaint paint; - paint.setImageFilter(make(fLCDPicture, fPicture->cullRect(), kNone_SkFilterQuality)); + paint.setImageFilter(SkPictureImageFilter::MakeForLocalSpace( + fLCDPicture, + fPicture->cullRect(), + kNone_SkFilterQuality)); canvas->scale(4, 4); canvas->translate(-0.9f*srcRect.fLeft, -2.45f*srcRect.fTop); |