commit 47ac84edafc6f26e2146ab10363e2043c5af0e62
author reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Oct 06 13:11:25 2011 +0000
committer reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Oct 06 13:11:25 2011 +0000
tree 7090e91da01ea69f423f3787760076ecc7d53a7a
parent 1deaab51e76848a60b9e8afd8be3fe32557f5374

check-point for aaclip



git-svn-id: http://skia.googlecode.com/svn/trunk@2419 2bbb7eff-a529-9590-31e7-b0007b416f81

src/core/SkAAClip.cpp

diff --git a/src/core/SkAAClip.cpp b/src/core/SkAAClip.cpp
index a79cca1..ff5715e 100644
--- a/src/core/SkAAClip.cpp
+++ b/src/core/SkAAClip.cpp
@@ -112,7 +112,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 void SkAAClip::freeRuns() {
-    if (this->isComplex()) {
+    if (fRunHead) {
         SkASSERT(fRunHead->fRefCnt >= 1);
         if (1 == sk_atomic_dec(&fRunHead->fRefCnt)) {
             sk_free(fRunHead);
@@ -122,11 +122,11 @@
 
 SkAAClip::SkAAClip() {
     fBounds.setEmpty();
-    fRunHead = SkAAClip_gEmptyPtr;
+    fRunHead = NULL;
 }
 
 SkAAClip::SkAAClip(const SkAAClip& src) {
-    fRunHead = SkAAClip_gEmptyPtr;
+    fRunHead = NULL;
     *this = src;
 }
 
@@ -139,7 +139,7 @@
         this->freeRuns();
         fBounds = src.fBounds;
         fRunHead = src.fRunHead;
-        if (this->isComplex()) {
+        if (fRunHead) {
             sk_atomic_inc(&fRunHead->fRefCnt);
         }
     }
@@ -163,7 +163,7 @@
     }
 
     // now we insist that both are complex (but different ptrs)
-    if (!a.isComplex() || !b.isComplex()) {
+    if (!a.fRunHead || !b.fRunHead) {
         return false;
     }
 
@@ -185,7 +185,7 @@
 bool SkAAClip::setEmpty() {
     this->freeRuns();
     fBounds.setEmpty();
-    fRunHead = SkAAClip_gEmptyPtr;
+    fRunHead = NULL;
     return false;
 }
 
@@ -193,10 +193,14 @@
     if (bounds.isEmpty()) {
         return this->setEmpty();
     }
-    this->freeRuns();
-    fBounds = bounds;
-    fRunHead = SkAAClip_gRectPtr;
-    return true;
+
+    // TODO: special case this
+
+    SkRect r;
+    r.set(bounds);
+    SkPath path;
+    path.addRect(r);
+    return this->setPath(path);
 }
 
 bool SkAAClip::setRect(const SkRect& r) {
@@ -212,7 +216,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 const uint8_t* SkAAClip::findRow(int y, int* lastYForRow) const {
-    SkASSERT(this->isComplex());
+    SkASSERT(fRunHead);
 
     if (!y_in_rect(y, fBounds)) {
         return NULL;
@@ -894,6 +898,22 @@
     return !this->isEmpty();
 }
 
+bool SkAAClip::op(const SkIRect& r, SkRegion::Op op) {
+    SkAAClip clip;
+    clip.setRect(r);
+    return this->op(*this, clip, op);
+}
+
+bool SkAAClip::op(const SkRect& r, SkRegion::Op op) {
+    SkAAClip clip;
+    clip.setRect(r);
+    return this->op(*this, clip, op);
+}
+
+bool SkAAClip::op(const SkAAClip& clip, SkRegion::Op op) {
+    return this->op(*this, clip, op);
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////