check-point for aaclip
git-svn-id: http://skia.googlecode.com/svn/trunk@2419 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/core/SkAAClip.h b/src/core/SkAAClip.h
index 98df3a6..cebe97c 100644
--- a/src/core/SkAAClip.h
+++ b/src/core/SkAAClip.h
@@ -12,9 +12,6 @@
#include "SkBlitter.h"
#include "SkRegion.h"
-#define SkAAClip_gEmptyPtr ((SkAAClip::RunHead*)-1)
-#define SkAAClip_gRectPtr NULL
-
class SkAAClip {
public:
SkAAClip();
@@ -29,9 +26,7 @@
void swap(SkAAClip&);
- bool isEmpty() const { return SkAAClip_gEmptyPtr == fRunHead; }
-// bool isRect() const { return SkAAClip_gRectPtr == fRunHead; }
- bool isComplex() const { return !this->isEmpty() /*&& !this->isRect()*/; }
+ bool isEmpty() const { return NULL == fRunHead; }
const SkIRect& getBounds() const { return fBounds; }
bool setEmpty();
@@ -42,6 +37,11 @@
bool op(const SkAAClip&, const SkAAClip&, SkRegion::Op);
+ // Helpers for op()
+ bool op(const SkIRect&, SkRegion::Op);
+ bool op(const SkRect&, SkRegion::Op);
+ bool op(const SkAAClip&, SkRegion::Op);
+
/**
* Allocates a mask the size of the aaclip, and expands its data into
* the mask, using kA8_Format