Minor refactoring to remove duplicate enum from Ganesh (_SetOp -> SkRegion::Op)
http://codereview.appspot.com/6116047/
git-svn-id: http://skia.googlecode.com/svn/trunk@3763 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp
index c832b20..12967e2 100644
--- a/src/gpu/SkGr.cpp
+++ b/src/gpu/SkGr.cpp
@@ -159,26 +159,17 @@
}
}
-GrSetOp SkGrClipIterator::getOp() const {
+SkRegion::Op SkGrClipIterator::getOp() const {
// we skipped to the last "replace" op
// when this iter was reset.
// GrClip doesn't allow replace, so treat it as
// intersect.
- GrSetOp skToGrOps[] = {
- kDifference_SetOp, // kDifference_Op
- kIntersect_SetOp, // kIntersect_Op
- kUnion_SetOp, // kUnion_Op
- kXor_SetOp, // kXOR_Op
- kReverseDifference_SetOp, // kReverseDifference_Op
- kIntersect_SetOp // kReplace_op
- };
- GR_STATIC_ASSERT(0 == SkRegion::kDifference_Op);
- GR_STATIC_ASSERT(1 == SkRegion::kIntersect_Op);
- GR_STATIC_ASSERT(2 == SkRegion::kUnion_Op);
- GR_STATIC_ASSERT(3 == SkRegion::kXOR_Op);
- GR_STATIC_ASSERT(4 == SkRegion::kReverseDifference_Op);
- GR_STATIC_ASSERT(5 == SkRegion::kReplace_Op);
- return skToGrOps[fCurr->fOp];
+ if (SkRegion::kReplace_Op == fCurr->fOp) {
+ return SkRegion::kIntersect_Op;
+ }
+
+ return fCurr->fOp;
+
}
bool SkGrClipIterator::getDoAA() const {