commit 02be3c1c3f53858263df82b1db466b5bb7059ab0
author Mike Reed <reed@google.com> Thu Mar 23 12:34:15 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Mar 23 17:26:34 2017 +0000
tree c06b8251806559c256d6643079b912639befd594
parent 78075804c1e43ca32f3d8eb75d2a8b6c91e74b9b

add test and fix for canvas::isClipEmpty

BUG=skia:

Change-Id: I4e57e0da7111e861fbae1b88574bc1803442243c
Reviewed-on: https://skia-review.googlesource.com/10046
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Commit-Queue: Derek Sollenberger <djsollen@google.com>

src/core/SkRasterClip.cpp

diff --git a/src/core/SkRasterClip.cpp b/src/core/SkRasterClip.cpp
index 090297d..a08119a 100644
--- a/src/core/SkRasterClip.cpp
+++ b/src/core/SkRasterClip.cpp
@@ -108,10 +108,8 @@
 
 void SkConservativeClip::op(const SkIRect& devRect, SkRegion::Op op) {
     if (SkRegion::kIntersect_Op == op) {
-        if (devRect.isEmpty()) {
+        if (!fBounds.intersect(devRect)) {
             fBounds.setEmpty();
-        } else {
-            (void)fBounds.intersect(devRect);
         }
         return;
     }