Compact the clipstack for kReplace_Op'd geometry

src/core/SkClipStack.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SkClipStack.h"
 #include "SkPath.h"
 #include "SkThread.h"
@@ skipping 425 matching lines @@
 
     fSaveCount = 0;
 }
 
 void SkClipStack::save() {
     fSaveCount += 1;
 }
 
 void SkClipStack::restore() {
     fSaveCount -= 1;
+    restoreTo(fSaveCount);
+}
+
+void SkClipStack::restoreTo(int saveCount) {
     while (!fDeque.empty()) {
         Element* element = (Element*)fDeque.back();
-        if (element->fSaveCount <= fSaveCount) {
+        if (element->fSaveCount <= saveCount) {
             break;
         }
         this->purgeClip(element);
         element->~Element();
         fDeque.pop_back();
     }
 }
 
 void SkClipStack::getBounds(SkRect* canvFiniteBound,
                             BoundsType* boundType,
@@ skipping 61 matching lines @@
         element = iter.prev();
     }
     return true;
 }
 
 void SkClipStack::clipDevRect(const SkRect& rect, SkRegion::Op op, bool doAA) {
 
     // Use reverse iterator instead of back because Rect path may need previous
     SkDeque::Iter iter(fDeque, SkDeque::Iter::kBack_IterStart);
     Element* element = (Element*) iter.prev();
 

[robertphillips, 2013/06/10 17:10:33]

if (NULL != element) {

-    if (element && element->canBeIntersectedInPlace(fSaveCount, op)) {
-        switch (element->fType) {
-            case Element::kEmpty_Type:
-                element->checkEmpty();
-                return;
-            case Element::kRect_Type:
-                if (element->rectRectIntersectAllowed(rect, doAA)) {
-                    this->purgeClip(element);
-                    if (!element->fRect.intersect(rect)) {
+    if (element) {
+        if (element->canBeIntersectedInPlace(fSaveCount, op)) {
+            switch (element->fType) {
+                case Element::kEmpty_Type:
+                    element->checkEmpty();
+                    return;
+                case Element::kRect_Type:
+                    if (element->rectRectIntersectAllowed(rect, doAA)) {
+                        this->purgeClip(element);
+                        if (!element->fRect.intersect(rect)) {
+                            element->setEmpty();
+                            return;
+                        }
+
+                        element->fDoAA = doAA;
+                        Element* prev = (Element*) iter.prev();
+                        element->updateBoundAndGenID(prev);
+                        return;
+                    }
+                    break;
+                case Element::kPath_Type:
+                    if (!SkRect::Intersects(element->fPath.getBounds(), rect)) {
+                        this->purgeClip(element);
                         element->setEmpty();
                         return;
                     }
-
-                    element->fDoAA = doAA;
-                    Element* prev = (Element*) iter.prev();
-                    element->updateBoundAndGenID(prev);
-                    return;
-                }
-                break;
-            case Element::kPath_Type:
-                if (!SkRect::Intersects(element->fPath.getBounds(), rect)) {
-                    this->purgeClip(element);
-                    element->setEmpty();
-                    return;
-                }
-                break;
+                    break;
+            }
+        } else if (SkRegion::kReplace_Op == op) {
+            this->restoreTo(fSaveCount - 1);
+            element = (Element*) fDeque.back();
         }
     }
     new (fDeque.push_back()) Element(fSaveCount, rect, op, doAA);
     ((Element*) fDeque.back())->updateBoundAndGenID(element);
 
     if (element && element->fSaveCount == fSaveCount) {
         this->purgeClip(element);
     }
 }
 
 void SkClipStack::clipDevPath(const SkPath& path, SkRegion::Op op, bool doAA) {
     SkRect alt;
     if (path.isRect(&alt) && !path.isInverseFillType()) {
         return this->clipDevRect(alt, op, doAA);
     }
 
     Element* element = (Element*)fDeque.back();

[robertphillips, 2013/06/10 17:10:33]

if (NULL != element) {

-    if (element && element->canBeIntersectedInPlace(fSaveCount, op)) {
-        const SkRect& pathBounds = path.getBounds();
-        switch (element->fType) {
-            case Element::kEmpty_Type:
-                element->checkEmpty();
-                return;
-            case Element::kRect_Type:
-                if (!SkRect::Intersects(element->fRect, pathBounds)) {
-                    this->purgeClip(element);
-                    element->setEmpty();
+    if (element) {
+        if (element->canBeIntersectedInPlace(fSaveCount, op)) {
+            const SkRect& pathBounds = path.getBounds();
+            switch (element->fType) {
+                case Element::kEmpty_Type:
+                    element->checkEmpty();
                     return;
-                }
-                break;
-            case Element::kPath_Type:
-                if (!SkRect::Intersects(element->fPath.getBounds(), pathBounds)) {
-                    this->purgeClip(element);
-                    element->setEmpty();
-                    return;
-                }
-                break;
+                case Element::kRect_Type:
+                    if (!SkRect::Intersects(element->fRect, pathBounds)) {
+                        this->purgeClip(element);
+                        element->setEmpty();
+                        return;
+                    }
+                    break;
+                case Element::kPath_Type:
+                    if (!SkRect::Intersects(element->fPath.getBounds(), pathBounds)) {
+                        this->purgeClip(element);
+                        element->setEmpty();
+                        return;
+                    }
+                    break;
+            }
+        } else if (SkRegion::kReplace_Op == op) {
+            this->restoreTo(fSaveCount - 1);
+            element = (Element*) fDeque.back();
         }
     }
     new (fDeque.push_back()) Element(fSaveCount, path, op, doAA);
     ((Element*) fDeque.back())->updateBoundAndGenID(element);
 
     if (element && element->fSaveCount == fSaveCount) {
         this->purgeClip(element);
     }
 }
 
@@ skipping 157 matching lines @@
 
 int32_t SkClipStack::getTopmostGenID() const {
 
     if (fDeque.empty()) {
         return kInvalidGenID;
     }
 
     Element* element = (Element*)fDeque.back();
     return element->fGenID;
 }