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/GrClip.cpp b/src/gpu/GrClip.cpp
index 87d58c4..a5120d4 100644
--- a/src/gpu/GrClip.cpp
+++ b/src/gpu/GrClip.cpp
@@ -59,7 +59,7 @@
fList.push_back();
fList.back().fRect = r;
fList.back().fType = kRect_ClipType;
- fList.back().fOp = kReplace_SetOp;
+ fList.back().fOp = SkRegion::kReplace_Op;
fList.back().fDoAA = false;
fConservativeBounds = r;
fConservativeBoundsValid = true;
@@ -75,7 +75,7 @@
fList.push_back();
fList.back().fRect.set(r);
fList.back().fType = kRect_ClipType;
- fList.back().fOp = kReplace_SetOp;
+ fList.back().fOp = SkRegion::kReplace_Op;
fList.back().fDoAA = false;
fConservativeBounds.set(r);
fConservativeBoundsValid = true;
@@ -108,7 +108,7 @@
fRequiresAA = true;
}
// iterators should not emit replace
- GrAssert(kReplace_SetOp != e.fOp);
+ GrAssert(SkRegion::kReplace_Op != e.fOp);
switch (e.fType) {
case kRect_ClipType:
iter->getRect(&e.fRect);
@@ -117,7 +117,7 @@
}
++rectCount;
if (isectRectValid) {
- if (kIntersect_SetOp == e.fOp) {
+ if (SkRegion::kIntersect_Op == e.fOp) {
GrAssert(fList.count() <= 2);
if (fList.count() > 1) {
GrAssert(2 == rectCount);