aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--fuzz/FuzzCanvas.cpp10
-rw-r--r--gm/pictureimagefilter.cpp28
-rw-r--r--include/core/SkPicture.h3
-rw-r--r--include/effects/SkPictureImageFilter.h11
-rw-r--r--src/core/SkReadBuffer.h1
-rw-r--r--src/effects/SkPictureImageFilter.cpp37
6 files changed, 53 insertions, 37 deletions
diff --git a/fuzz/FuzzCanvas.cpp b/fuzz/FuzzCanvas.cpp
index 064d38aa72..3b3715fe8a 100644
--- a/fuzz/FuzzCanvas.cpp
+++ b/fuzz/FuzzCanvas.cpp
@@ -920,12 +920,20 @@ static sk_sp<SkImageFilter> make_fuzz_imageFilter(Fuzz* fuzz, int depth) {
return SkPictureImageFilter::Make(std::move(picture), cropRect);
}
case 22: {
+ SkRect cropRect;
+ SkFilterQuality filterQuality;
+ fuzz->next(&cropRect, &filterQuality);
+ sk_sp<SkPicture> picture = make_fuzz_picture(fuzz, depth - 1);
+ return SkPictureImageFilter::MakeForLocalSpace(std::move(picture), cropRect,
+ filterQuality);
+ }
+ case 23: {
SkRect src, dst;
fuzz->next(&src, &dst);
sk_sp<SkImageFilter> input = make_fuzz_imageFilter(fuzz, depth - 1);
return SkTileImageFilter::Make(src, dst, std::move(input));
}
- case 23: {
+ case 24: {
SkBlendMode blendMode;
bool useCropRect;
fuzz->next(&useCropRect, &blendMode);
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);
diff --git a/include/core/SkPicture.h b/include/core/SkPicture.h
index b3bc96bb88..a5f2047e84 100644
--- a/include/core/SkPicture.h
+++ b/include/core/SkPicture.h
@@ -201,11 +201,10 @@ 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 = 59;
+ static const uint32_t CURRENT_PICTURE_VERSION = 58;
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 76e7b63e3e..13bf66aac7 100644
--- a/include/effects/SkPictureImageFilter.h
+++ b/include/effects/SkPictureImageFilter.h
@@ -24,6 +24,17 @@ 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)
diff --git a/src/core/SkReadBuffer.h b/src/core/SkReadBuffer.h
index f7b724d588..ab9ec7fedb 100644
--- a/src/core/SkReadBuffer.h
+++ b/src/core/SkReadBuffer.h
@@ -76,7 +76,6 @@ public:
kTileModeInBlurImageFilter_Version = 56,
kTileInfoInSweepGradient_Version = 57,
k2PtConicalNoFlip_Version = 58,
- kRemovePictureImageFilterLocalSpace = 59,
};
/**
diff --git a/src/effects/SkPictureImageFilter.cpp b/src/effects/SkPictureImageFilter.cpp
index 5611900e7e..c335474200 100644
--- a/src/effects/SkPictureImageFilter.cpp
+++ b/src/effects/SkPictureImageFilter.cpp
@@ -29,6 +29,16 @@ sk_sp<SkImageFilter> SkPictureImageFilter::Make(sk_sp<SkPicture> picture,
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))
@@ -61,25 +71,14 @@ sk_sp<SkFlattenable> SkPictureImageFilter::CreateProc(SkReadBuffer& buffer) {
}
}
buffer.readRect(&cropRect);
+ PictureResolution pictureResolution = (PictureResolution)buffer.readInt();
- // 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();
- }
+ if (kLocalSpace_PictureResolution == pictureResolution) {
+ //filterLevel is only serialized if pictureResolution is LocalSpace
+ SkFilterQuality filterQuality = (SkFilterQuality)buffer.readInt();
+ return MakeForLocalSpace(picture, cropRect, filterQuality);
}
- return sk_sp<SkImageFilter>(new SkPictureImageFilter(picture,
- cropRect,
- pictureResolution,
- filterQuality,
- nullptr));
+ return Make(picture, cropRect);
}
void SkPictureImageFilter::flatten(SkWriteBuffer& buffer) const {
@@ -93,6 +92,10 @@ void SkPictureImageFilter::flatten(SkWriteBuffer& buffer) const {
}
}
buffer.writeRect(fCropRect);
+ buffer.writeInt(fPictureResolution);
+ if (kLocalSpace_PictureResolution == fPictureResolution) {
+ buffer.writeInt(fFilterQuality);
+ }
}
sk_sp<SkSpecialImage> SkPictureImageFilter::onFilterImage(SkSpecialImage* source,
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-27 21:22:05 +0000