aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Cary Clark <caryclark@skia.org>2017-04-12 12:03:15 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-04-12 16:48:31 +0000
commite0b728726d3b44bf18219b8c5bc5599332be7c34 (patch)
treec94bf120bca5ca6f094b1666a5ccd5ea672fddd4 /src
parent994ef97339a085b6d15432ed43f3ecc1776a3852 (diff)
fix drawDRRect for fuzzer
make assert abort instead Bug: skia:6450 Change-Id: I23ff51124fa8f069f2c7e5260f800017d7475d46 Reviewed-on: https://skia-review.googlesource.com/13197 Commit-Queue: Cary Clark <caryclark@google.com> Reviewed-by: Hal Canary <halcanary@google.com>
Diffstat (limited to 'src')
-rw-r--r--src/core/SkCanvas.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index aa69f09f47..8cef3353a2 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -1770,11 +1770,13 @@ void SkCanvas::drawDRRect(const SkRRect& outer, const SkRRect& inner,
}
// We don't have this method (yet), but technically this is what we should
- // be able to assert...
- // SkASSERT(outer.contains(inner));
+ // be able to return ...
+ // if (!outer.contains(inner))) {
//
// For now at least check for containment of bounds
- SkASSERT(outer.getBounds().contains(inner.getBounds()));
+ if (!outer.getBounds().contains(inner.getBounds())) {
+ return;
+ }
this->onDrawDRRect(outer, inner, paint);
}