diff options
| -rw-r--r-- | src/core/SkCanvas.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp index e4c03f3e5e..55e8b4ad10 100644 --- a/src/core/SkCanvas.cpp +++ b/src/core/SkCanvas.cpp @@ -833,7 +833,6 @@ static bool bounds_affects_clip(SkCanvas::SaveFlags flags) { bool SkCanvas::clipRectBounds(const SkRect* bounds, SaveFlags flags, SkIRect* intersection, const SkImageFilter* imageFilter) { SkIRect clipBounds; - SkRegion::Op op = SkRegion::kIntersect_Op; if (!this->getClipDeviceBounds(&clipBounds)) { return false; } @@ -842,8 +841,6 @@ bool SkCanvas::clipRectBounds(const SkRect* bounds, SaveFlags flags, if (imageFilter) { imageFilter->filterBounds(clipBounds, ctm, &clipBounds); - // Filters may grow the bounds beyond the device bounds. - op = SkRegion::kReplace_Op; } SkIRect ir; if (bounds) { @@ -863,9 +860,10 @@ bool SkCanvas::clipRectBounds(const SkRect* bounds, SaveFlags flags, } if (bounds_affects_clip(flags)) { - fClipStack->clipDevRect(ir, op); + // Simplify the current clips since they will be applied properly during restore() + fClipStack->clipDevRect(ir, SkRegion::kReplace_Op); // early exit if the clip is now empty - if (!fMCRec->fRasterClip.op(ir, op)) { + if (!fMCRec->fRasterClip.op(ir, SkRegion::kReplace_Op)) { return false; } } |