Fix for rounded-rect clips with filters.
Don't use the base canvas size to limit raster of complex clips, since
the top canvas size may actually be larger (e.g., a blur filter which
expands the clip bounds to accommodate filter margins). Use the top
canvas bounds instead.
BUG=skia:4879,471212
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1657333002
Review URL: https://codereview.chromium.org/1657333002
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index ce08d41..c8c4b87 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -812,21 +812,19 @@
}
}
-SkISize SkCanvas::getTopLayerSize() const {
- SkBaseDevice* d = this->getTopDevice();
- return d ? SkISize::Make(d->width(), d->height()) : SkISize::Make(0, 0);
-}
-
-SkIPoint SkCanvas::getTopLayerOrigin() const {
- SkBaseDevice* d = this->getTopDevice();
- return d ? d->getOrigin() : SkIPoint::Make(0, 0);
-}
-
SkISize SkCanvas::getBaseLayerSize() const {
SkBaseDevice* d = this->getDevice();
return d ? SkISize::Make(d->width(), d->height()) : SkISize::Make(0, 0);
}
+SkIRect SkCanvas::getTopLayerBounds() const {
+ SkBaseDevice* d = this->getTopDevice();
+ if (!d) {
+ return SkIRect::MakeEmpty();
+ }
+ return SkIRect::MakeXYWH(d->getOrigin().x(), d->getOrigin().y(), d->width(), d->height());
+}
+
SkBaseDevice* SkCanvas::getDevice() const {
// return root device
MCRec* rec = (MCRec*) fMCStack.front();
@@ -1516,7 +1514,7 @@
if (rectStaysRect) {
const bool isAA = kSoft_ClipEdgeStyle == edgeStyle;
fClipStack->clipDevRect(devR, op, isAA);
- fMCRec->fRasterClip.op(devR, this->getBaseLayerSize(), op, isAA);
+ fMCRec->fRasterClip.op(devR, this->getTopLayerBounds(), op, isAA);
} else {
// since we're rotated or some such thing, we convert the rect to a path
// and clip against that, since it can handle any matrix. However, to
@@ -1529,11 +1527,6 @@
}
}
-static void rasterclip_path(SkRasterClip* rc, const SkCanvas* canvas, const SkPath& devPath,
- SkRegion::Op op, bool doAA) {
- rc->op(devPath, canvas->getBaseLayerSize(), op, doAA);
-}
-
void SkCanvas::clipRRect(const SkRRect& rrect, SkRegion::Op op, bool doAA) {
this->checkForDeferredSave();
ClipEdgeStyle edgeStyle = doAA ? kSoft_ClipEdgeStyle : kHard_ClipEdgeStyle;
@@ -1557,7 +1550,7 @@
fClipStack->clipDevRRect(transformedRRect, op, kSoft_ClipEdgeStyle == edgeStyle);
- fMCRec->fRasterClip.op(transformedRRect, this->getBaseLayerSize(), op,
+ fMCRec->fRasterClip.op(transformedRRect, this->getTopLayerBounds(), op,
kSoft_ClipEdgeStyle == edgeStyle);
return;
}
@@ -1643,7 +1636,7 @@
op = SkRegion::kReplace_Op;
}
- rasterclip_path(&fMCRec->fRasterClip, this, devPath, op, edgeStyle);
+ fMCRec->fRasterClip.op(devPath, this->getTopLayerBounds(), op, edgeStyle);
}
void SkCanvas::clipRegion(const SkRegion& rgn, SkRegion::Op op) {
@@ -1691,7 +1684,7 @@
default: {
SkPath path;
element->asPath(&path);
- rasterclip_path(&tmpClip, this, path, element->getOp(), element->isAA());
+ tmpClip.op(path, this->getTopLayerBounds(), element->getOp(), element->isAA());
break;
}
}
diff --git a/src/core/SkRasterClip.cpp b/src/core/SkRasterClip.cpp
index ea1a7db..5afe279 100644
--- a/src/core/SkRasterClip.cpp
+++ b/src/core/SkRasterClip.cpp
@@ -161,18 +161,18 @@
return this->updateCacheAndReturnNonEmpty();
}
-bool SkRasterClip::op(const SkRRect& rrect, const SkISize& size, SkRegion::Op op, bool doAA) {
+bool SkRasterClip::op(const SkRRect& rrect, const SkIRect& bounds, SkRegion::Op op, bool doAA) {
if (fForceConservativeRects) {
- return this->op(rrect.getBounds(), size, op, doAA);
+ return this->op(rrect.getBounds(), bounds, op, doAA);
}
SkPath path;
path.addRRect(rrect);
- return this->op(path, size, op, doAA);
+ return this->op(path, bounds, op, doAA);
}
-bool SkRasterClip::op(const SkPath& path, const SkISize& size, SkRegion::Op op, bool doAA) {
+bool SkRasterClip::op(const SkPath& path, const SkIRect& bounds, SkRegion::Op op, bool doAA) {
AUTO_RASTERCLIP_VALIDATE(*this);
if (fForceConservativeRects) {
@@ -181,7 +181,7 @@
case kDoNothing_MutateResult:
return !this->isEmpty();
case kReplaceClippedAgainstGlobalBounds_MutateResult:
- ir = SkIRect::MakeSize(size);
+ ir = bounds;
break;
case kContinue_MutateResult:
ir = path.getBounds().roundOut();
@@ -210,7 +210,7 @@
return this->op(clip, op);
}
} else {
- base.setRect(0, 0, size.width(), size.height());
+ base.setRect(bounds);
if (SkRegion::kReplace_Op == op) {
return this->setPath(path, base, doAA);
@@ -285,7 +285,7 @@
return x - SkScalarFloorToScalar(x) < domain;
}
-bool SkRasterClip::op(const SkRect& r, const SkISize& size, SkRegion::Op op, bool doAA) {
+bool SkRasterClip::op(const SkRect& r, const SkIRect& bounds, SkRegion::Op op, bool doAA) {
AUTO_RASTERCLIP_VALIDATE(*this);
if (fForceConservativeRects) {
@@ -294,7 +294,7 @@
case kDoNothing_MutateResult:
return !this->isEmpty();
case kReplaceClippedAgainstGlobalBounds_MutateResult:
- ir = SkIRect::MakeSize(size);
+ ir = bounds;
break;
case kContinue_MutateResult:
ir = r.roundOut();
diff --git a/src/core/SkRasterClip.h b/src/core/SkRasterClip.h
index 4e2b141..8f05bb9 100644
--- a/src/core/SkRasterClip.h
+++ b/src/core/SkRasterClip.h
@@ -45,9 +45,9 @@
bool op(const SkIRect&, SkRegion::Op);
bool op(const SkRegion&, SkRegion::Op);
- bool op(const SkRect&, const SkISize&, SkRegion::Op, bool doAA);
- bool op(const SkRRect&, const SkISize&, SkRegion::Op, bool doAA);
- bool op(const SkPath&, const SkISize&, SkRegion::Op, bool doAA);
+ bool op(const SkRect&, const SkIRect&, SkRegion::Op, bool doAA);
+ bool op(const SkRRect&, const SkIRect&, SkRegion::Op, bool doAA);
+ bool op(const SkPath&, const SkIRect&, SkRegion::Op, bool doAA);
void translate(int dx, int dy, SkRasterClip* dst) const;
void translate(int dx, int dy) {