revert fuzzer fixes for canvas, need to investigate more
authorreed <reed@google.com>
Sun, 21 Feb 2016 02:48:58 +0000 (18:48 -0800)
committerCommit bot <commit-bot@chromium.org>
Sun, 21 Feb 2016 02:48:58 +0000 (18:48 -0800)
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

src/core/SkCanvas.cpp

index aa3261d..653f4b1 100644 (file)
@@ -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();
     }