Reland "Fix handling of MaskFilter matrices"
This reverts commit c64ee20e135a336ed775ccb6dec8a87efd19ec02.
Reason for revert: initial failures should be fixed in https://skia.googlesource.com/skia.git/+/8eaf64ae12696d4189d3cea9f023658494cf82b8
Original change's description:
> Revert "Fix handling of MaskFilter matrices"
>
> This reverts commit 2097fd03ffea48bd904c48c93348b2350600870e.
>
> Reason for revert: This is breaking a lot of Windows bots (esp. on the shadermaskfilter_localmatrix)
>
> Original change's description:
> > Fix handling of MaskFilter matrices
> >
> > 1) extend GrFPArgs to track pre/post local matrices, add helpers for
> > creating pre/post wrapper args
> >
> > 2) add a SkShaderBase helper (totalLocalMatrix) to centralize the LM
> > sandwich logic.
> >
> > 3) update call sites to use the above
> >
> > 4) rename SkMatrixFilter::makeWithLocalMatrix -> makeWithMatrix, to
> > disambiguate vs. SkShader::makeWithLocalMatrix.
> >
> > BUG=skia:7744
> >
> > Change-Id: Ib2b7b007e6924979b00649dde7c94ef4b34771f1
> > Reviewed-on: https://skia-review.googlesource.com/119330
> > Commit-Queue: Florin Malita <fmalita@chromium.org>
> > Reviewed-by: Brian Salomon <bsalomon@google.com>
>
> TBR=bsalomon@google.com,robertphillips@google.com,fmalita@chromium.org,reed@google.com
>
> Change-Id: I918dbb95bf00b3122e6699b84566ec82dbb5fc5c
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:7744
> Reviewed-on: https://skia-review.googlesource.com/120340
> Reviewed-by: Robert Phillips <robertphillips@google.com>
> Commit-Queue: Robert Phillips <robertphillips@google.com>
TBR=bsalomon@google.com,robertphillips@google.com,fmalita@chromium.org,reed@google.com
Change-Id: If194862a928d1abe22ed8fa968436c725d19a8fc
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:7744
Reviewed-on: https://skia-review.googlesource.com/120480
Commit-Queue: Florin Malita <fmalita@chromium.org>
Reviewed-by: Florin Malita <fmalita@chromium.org>
diff --git a/src/shaders/gradients/SkLinearGradient.cpp b/src/shaders/gradients/SkLinearGradient.cpp
index b6436ca..a377442 100644
--- a/src/shaders/gradients/SkLinearGradient.cpp
+++ b/src/shaders/gradients/SkLinearGradient.cpp
@@ -195,16 +195,9 @@
SkASSERT(args.fContext);
SkMatrix matrix;
- if (!this->getLocalMatrix().invert(&matrix)) {
+ if (!this->totalLocalMatrix(args.fPreLocalMatrix, args.fPostLocalMatrix)->invert(&matrix)) {
return nullptr;
}
- if (args.fLocalMatrix) {
- SkMatrix inv;
- if (!args.fLocalMatrix->invert(&inv)) {
- return nullptr;
- }
- matrix.postConcat(inv);
- }
matrix.postConcat(fPtsToUnit);
return GrLinearGradient::Make(GrGradientEffect::CreateArgs(