commit c002d5619e614d30c2570746356a2d8dda2228f6
author Michael Ludwig <michaelludwig@google.com> Wed May 13 14:17:57 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed May 13 18:59:13 2020 +0000
tree 35d6c8c98c08e8af95d30651c4b1c139cd604daf
parent 71903997254fae5c2aea09da631d9ccabd3722d8

Simplify GrClip::getConservativeBounds() signature

It turns out no one was using the intersection of rect functionality on
GrClip, and this helps simplify what the new clip stack needs to define.

Bug: skia:10205
Change-Id: If85a0c744dd68a8ad2f380b54a539ac74850e4ac
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/289440
Commit-Queue: Michael Ludwig <michaelludwig@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>

src/gpu/GrClipStackClip.cpp

diff --git a/src/gpu/GrClipStackClip.cpp b/src/gpu/GrClipStackClip.cpp
index 4fa6246..37121fd 100644
--- a/src/gpu/GrClipStackClip.cpp
+++ b/src/gpu/GrClipStackClip.cpp
@@ -62,18 +62,14 @@
     return false;
 }
 
-void GrClipStackClip::getConservativeBounds(int width, int height, SkIRect* devResult,
-                                            bool* isIntersectionOfRects) const {
-    if (!fStack) {
-        devResult->setXYWH(0, 0, width, height);
-        if (isIntersectionOfRects) {
-            *isIntersectionOfRects = true;
-        }
-        return;
+SkIRect GrClipStackClip::getConservativeBounds(int width, int height) const {
+    if (fStack) {
+        SkRect devBounds;
+        fStack->getConservativeBounds(0, 0, width, height, &devBounds);
+        return devBounds.roundOut();
+    } else {
+        return this->GrClip::getConservativeBounds(width, height);
     }
-    SkRect devBounds;
-    fStack->getConservativeBounds(0, 0, width, height, &devBounds, isIntersectionOfRects);
-    devBounds.roundOut(devResult);
 }
 
 ////////////////////////////////////////////////////////////////////////////////