diff options
author | Michael Ludwig <michaelludwig@google.com> | 2022-09-21 16:53:57 -0400 |
---|---|---|
committer | SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> | 2022-09-27 15:22:04 +0000 |
commit | 7d79076adc2b7a744cc595134f2e2a0295f40b2a (patch) | |
tree | b9661ae2beb6bbef8cbc2fc99b93d0ef02367f16 /gm/lazytiling.cpp | |
parent | 9a07b43ad4303dd1c9600cdca61d4456ede4f3a0 (diff) | |
download | skia-7d79076adc2b7a744cc595134f2e2a0295f40b2a.tar.gz |
Reland "Reland "Let FilterResults track a deferred transform""
This reverts commit 721da68f52e0b948f8b56a4a8020977a533b1b49.
Reason for revert:
-Fixes NPE by checking that the surface was successfully created
(dropped that check when moving code originally)
-Added a no_sanitize guard around division by 0, since it's safe
in this case, we'll just return false from is_integer_translate.
-Initialized the origin output value, if there was no filtering
performed and we returned a null image, origin might not be written
to. Previously the saved origin was never read, but now we read it
to make an "undefined" translation matrix that is then never read.
Additional fixes for the stack overflow bugs are related to
rounding really large numbers and is in a separate CL:
https://skia-review.googlesource.com/c/skia/+/583583
Original change's description:
> Revert "Reland "Let FilterResults track a deferred transform""
>
> This reverts commit 6f86d51c4f64695958fc3e4d576675a830251cf6.
>
> Reason for revert: Several fuzzer bugs
>
> Original change's description:
> > Reland "Let FilterResults track a deferred transform"
> >
> > This is a reland of commit eba9c67a0c444ee820c196ceaae757ce268a1fda
> >
> > Original change's description:
> > > Let FilterResults track a deferred transform
> > >
> > > Change-Id: I26c964eb576aec9340847ecae46deb99e62d97b4
> > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/571796
> > > Reviewed-by: Robert Phillips <robertphillips@google.com>
> > > Reviewed-by: Brian Osman <brianosman@google.com>
> > > Commit-Queue: Michael Ludwig <michaelludwig@google.com>
> >
> > Bug: chromium:1360730, skia:9283
> > Change-Id: I5225feb9fa9412fa5acb97366c6a8cd0b32d2f1d
> > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/579997
> > Reviewed-by: Brian Osman <brianosman@google.com>
> > Commit-Queue: Michael Ludwig <michaelludwig@google.com>
> > Reviewed-by: Robert Phillips <robertphillips@google.com>
>
> Bug: chromium:1360730, skia:9283
> Change-Id: Ideb7f4b3ee5f09ece2f32cd45552e6df8b7d62d5
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/583196
> Auto-Submit: Brian Osman <brianosman@google.com>
> Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
> Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Bug: skia:9283, oss-fuzz:51631, oss-fuzz:51643, oss-fuzz:51627, chromium:1366185
Change-Id: If90b85ecc9373311fd4c960e2cc373e772b74212
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/583579
Reviewed-by: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Michael Ludwig <michaelludwig@google.com>
Diffstat (limited to 'gm/lazytiling.cpp')
-rw-r--r-- | gm/lazytiling.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/gm/lazytiling.cpp b/gm/lazytiling.cpp index 422d665d97..fda54096aa 100644 --- a/gm/lazytiling.cpp +++ b/gm/lazytiling.cpp @@ -207,9 +207,6 @@ protected: } DrawResult onDraw(GrRecordingContext* rContext, SkCanvas* canvas, SkString* errorMsg) override { - SkSamplingOptions sampling(SkFilterMode::kNearest, SkMipmapMode::kNone); - SkPaint p; - auto sdc = SkCanvasPriv::TopDeviceSurfaceDrawContext(canvas); if (!sdc) { *errorMsg = kErrorMsg_DrawSkippedGpuOnly; |