From: reed Date: Sun, 21 Feb 2016 02:48:58 +0000 (-0800) Subject: revert fuzzer fixes for canvas, need to investigate more X-Git-Tag: accepted/tizen/5.0/unified/20181102.025319~129^2~1922 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d97f07dc43ed07536921ec4e87a8785ae2da8e6a;p=platform%2Fupstream%2FlibSkiaSharp.git revert fuzzer fixes for canvas, need to investigate more BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1717943002 TBR= Review URL: https://codereview.chromium.org/1717943002 --- diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp index aa3261d..653f4b1 100644 --- a/src/core/SkCanvas.cpp +++ b/src/core/SkCanvas.cpp @@ -1072,14 +1072,11 @@ 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) { - if (!imageFilter->filterBounds(clipBounds, ctm, &clipBounds) || clipBounds.isEmpty()) { - return false; - } + imageFilter->filterBounds(clipBounds, ctm, &clipBounds); if (bounds && !imageFilter->canComputeFastBounds()) { bounds = nullptr; } @@ -1781,7 +1778,6 @@ bool SkCanvas::getClipDeviceBounds(SkIRect* bounds) const { return false; } - SkASSERT(!clip.getBounds().isEmpty()); if (bounds) { *bounds = clip.getBounds(); }