commit c4fbc8d6cf34224d98c0e03a263c826d0d176b4e
author Robert Phillips <robertphillips@google.com> Mon Nov 30 10:17:53 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Nov 30 18:12:24 2020 +0000
tree 61b6dd8912c22a9252468ff4a14494135c4651ea
parent fd41d878b13db6572d52b70ef95a4031fdd2448f

Stop overflow of windows rects in GrClipStack

Bug: skia:10989
Change-Id: I512ccbd3d95178756ae436f7c67ed53d46105ae7
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/339165
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

src/gpu/GrClipStack.cpp

diff --git a/src/gpu/GrClipStack.cpp b/src/gpu/GrClipStack.cpp
index 98de71b..a639511 100644
--- a/src/gpu/GrClipStack.cpp
+++ b/src/gpu/GrClipStack.cpp
@@ -1401,8 +1401,7 @@
                     fullyApplied = e.innerBounds() == e.outerBounds() ||
                                    e.innerBounds().contains(scissorBounds);
                 } else {
-                    if (!e.innerBounds().isEmpty() &&
-                        out->windowRectsState().numWindows() < maxWindowRectangles) {
+                    if (!e.innerBounds().isEmpty() && windowRects.count() < maxWindowRectangles) {
                         // TODO: If we have more difference ops than available window rects, we
                         // should prioritize those with the largest inner bounds.
                         windowRects.addWindow(e.innerBounds());