diff options
| author |  Mike Reed <reed@google.com> | 2017-11-09 21:50:20 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-11-09 21:50:27 +0000 |
| commit | 77e487dfc005be66346ebf3e33d3ec394de4cc36 (patch) | |
| tree | 3cf20f487f1e7f7082044c867d26f1a8c4e7f0b3 /include | |
| parent | 4b56375651f4f00a196e7be0eff2a0c26163f4f9 (diff) | |
Revert "Revert "Remove MakeForLocalSpace since picture image is sufficient""
This reverts commit fc45998242b6e95ff610fd2c4edcf72c10e536ab.
Reason for revert: google3 updated (I think)
Original change's description:
> 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>
TBR=robertphillips@google.com,fmalita@chromium.org,reed@google.com
Change-Id: I5751fa637d280f361dea0f248a43c1f7e9bd8bdc
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/69661
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/core/SkPicture.h | 3 | ||||
| -rw-r--r-- | include/effects/SkPictureImageFilter.h | 11 |
2 files changed, 2 insertions, 12 deletions
diff --git a/include/core/SkPicture.h b/include/core/SkPicture.h index a5f2047e84..b3bc96bb88 100644 --- a/include/core/SkPicture.h +++ b/include/core/SkPicture.h @@ -201,10 +201,11 @@ private: // V56: Add TileMode in SkBlurImageFilter. // V57: Sweep tiling info. // V58: No more 2pt conical flipping. + // V59: No more LocalSpace option on PictureImageFilter // Only SKPs within the min/current picture version range (inclusive) can be read. static const uint32_t MIN_PICTURE_VERSION = 51; // Produced by Chrome ~M56. - static const uint32_t CURRENT_PICTURE_VERSION = 58; + static const uint32_t CURRENT_PICTURE_VERSION = 59; static bool IsValidPictInfo(const SkPictInfo& info); static sk_sp<SkPicture> Forwardport(const SkPictInfo&, diff --git a/include/effects/SkPictureImageFilter.h b/include/effects/SkPictureImageFilter.h index 13bf66aac7..76e7b63e3e 100644 --- a/include/effects/SkPictureImageFilter.h +++ b/include/effects/SkPictureImageFilter.h @@ -24,17 +24,6 @@ public: */ static sk_sp<SkImageFilter> Make(sk_sp<SkPicture> picture, const SkRect& cropRect); - /** - * Refs the passed-in picture. The picture is rasterized at a resolution that matches the - * local coordinate space. If the picture needs to be resampled for drawing it into the - * destination canvas, bilinear filtering will be used. cropRect can be used to crop or - * expand the destination rect when the picture is drawn. (No scaling is implied by the - * dest rect; only the CTM is applied.) - */ - static sk_sp<SkImageFilter> MakeForLocalSpace(sk_sp<SkPicture> picture, - const SkRect& cropRect, - SkFilterQuality filterQuality); - SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkPictureImageFilter) |