Index: src/core/SkCanvas.cpp |
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp |
index 653f4b117f4fa45b6a475a618a1e1337b0e47c36..aa3261dc033b49cd260f23769df70fad39502c90 100644 |
--- a/src/core/SkCanvas.cpp |
+++ b/src/core/SkCanvas.cpp |
@@ -1072,11 +1072,14 @@ bool SkCanvas::clipRectBounds(const SkRect* bounds, SaveLayerFlags saveLayerFlag |
if (!this->getClipDeviceBounds(&clipBounds)) { |
return false; |
} |
+ SkASSERT(!clipBounds.isEmpty()); |
const SkMatrix& ctm = fMCRec->fMatrix; // this->getTotalMatrix() |
if (imageFilter) { |
- imageFilter->filterBounds(clipBounds, ctm, &clipBounds); |
+ if (!imageFilter->filterBounds(clipBounds, ctm, &clipBounds) || clipBounds.isEmpty()) { |
+ return false; |
+ } |
if (bounds && !imageFilter->canComputeFastBounds()) { |
bounds = nullptr; |
} |
@@ -1778,6 +1781,7 @@ bool SkCanvas::getClipDeviceBounds(SkIRect* bounds) const { |
return false; |
} |
+ SkASSERT(!clip.getBounds().isEmpty()); |
if (bounds) { |
*bounds = clip.getBounds(); |
} |