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>
diff --git a/src/effects/SkPictureImageFilter.cpp b/src/effects/SkPictureImageFilter.cpp
index c335474..5611900 100644
--- a/src/effects/SkPictureImageFilter.cpp
+++ b/src/effects/SkPictureImageFilter.cpp
@@ -29,16 +29,6 @@
nullptr));
}
-sk_sp<SkImageFilter> SkPictureImageFilter::MakeForLocalSpace(sk_sp<SkPicture> picture,
- const SkRect& cropRect,
- SkFilterQuality filterQuality) {
- return sk_sp<SkImageFilter>(new SkPictureImageFilter(std::move(picture),
- cropRect,
- kLocalSpace_PictureResolution,
- filterQuality,
- nullptr));
-}
-
SkPictureImageFilter::SkPictureImageFilter(sk_sp<SkPicture> picture)
: INHERITED(nullptr, 0, nullptr)
, fPicture(std::move(picture))
@@ -71,14 +61,25 @@
}
}
buffer.readRect(&cropRect);
- PictureResolution pictureResolution = (PictureResolution)buffer.readInt();
- if (kLocalSpace_PictureResolution == pictureResolution) {
- //filterLevel is only serialized if pictureResolution is LocalSpace
- SkFilterQuality filterQuality = (SkFilterQuality)buffer.readInt();
- return MakeForLocalSpace(picture, cropRect, filterQuality);
+ // NOTE: these two fields can be removed from the class once we have out-lived the need
+ // to load pictures older than SkReadBuffer::kRemovePictureImageFilterLocalSpace
+ //
+ PictureResolution pictureResolution = kDeviceSpace_PictureResolution;
+ SkFilterQuality filterQuality = kNone_SkFilterQuality;
+
+ if (buffer.isVersionLT(SkReadBuffer::kRemovePictureImageFilterLocalSpace)) {
+ pictureResolution = (PictureResolution)buffer.readInt();
+ if (kLocalSpace_PictureResolution == pictureResolution) {
+ //filterLevel is only serialized if pictureResolution is LocalSpace
+ filterQuality = (SkFilterQuality)buffer.readInt();
+ }
}
- return Make(picture, cropRect);
+ return sk_sp<SkImageFilter>(new SkPictureImageFilter(picture,
+ cropRect,
+ pictureResolution,
+ filterQuality,
+ nullptr));
}
void SkPictureImageFilter::flatten(SkWriteBuffer& buffer) const {
@@ -92,10 +93,6 @@
}
}
buffer.writeRect(fCropRect);
- buffer.writeInt(fPictureResolution);
- if (kLocalSpace_PictureResolution == fPictureResolution) {
- buffer.writeInt(fFilterQuality);
- }
}
sk_sp<SkSpecialImage> SkPictureImageFilter::onFilterImage(SkSpecialImage* source,