Store SkRRects in SkClipStack

src/gpu/GrReducedClip.cpp

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrReducedClip.h"
 
@@ skipping 54 matching lines @@
         SkRect isectRect;
         if (stackBounds.contains(scalarQueryBounds)) {
             *initialState = kAllIn_InitialState;
             if (NULL != tighterBounds) {
                 *tighterBounds = queryBounds;
             }
             if (NULL != requiresAA) {
                *requiresAA = false;
             }
         } else if (isectRect.intersect(stackBounds, scalarQueryBounds)) {
+            // If the caller asked for tighter integer bounds we may be able to
+            // return kAllIn and give the bounds with no elements
             if (NULL != tighterBounds) {
                 isectRect.roundOut(tighterBounds);
                 SkRect scalarTighterBounds = SkRect::Make(*tighterBounds);
                 if (scalarTighterBounds == isectRect) {
                     // the round-out didn't add any area outside the clip rect.
                     if (NULL != requiresAA) {
                         *requiresAA = false;
                     }
                     *initialState = kAllIn_InitialState;
                     return;
                 }
-                *initialState = kAllOut_InitialState;
-                // iior should only be true if aa/non-aa status matches among all elements.
-                SkClipStack::Iter iter(stack, SkClipStack::Iter::kTop_IterStart);
-                bool doAA = iter.prev()->isAA();
-                SkNEW_INSERT_AT_LLIST_HEAD(result, Element, (isectRect, SkRegion::kReplace_Op, doAA));
-                if (NULL != requiresAA) {
-                    *requiresAA = doAA;
-                }
+            }
+            *initialState = kAllOut_InitialState;
+            // iior should only be true if aa/non-aa status matches among all elements.
+            SkClipStack::Iter iter(stack, SkClipStack::Iter::kTop_IterStart);
+            bool doAA = iter.prev()->isAA();
+            SkNEW_INSERT_AT_LLIST_HEAD(result, Element, (isectRect, SkRegion::kReplace_Op, doAA));
+            if (NULL != requiresAA) {
+                *requiresAA = doAA;
             }
         } else {
             *initialState = kAllOut_InitialState;
              if (NULL != requiresAA) {
                 *requiresAA = false;
              }
         }
         return;
     } else {
         if (SkClipStack::kNormal_BoundsType == stackBoundsType) {
@@ skipping 335 matching lines @@
 
     if (0 == result->count()) {
         if (*initialState == kAllIn_InitialState) {
             *resultGenID = SkClipStack::kWideOpenGenID;
         } else {
             *resultGenID = SkClipStack::kEmptyGenID;
         }
     }
 }
 } // namespace GrReducedClip