Remove SkClipStack::Iter::combinedNext.
Review URL: https://codereview.appspot.com/6844114
git-svn-id: http://skia.googlecode.com/svn/trunk@6619 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/gpu/GrClipMaskManager.cpp b/src/gpu/GrClipMaskManager.cpp
index 9190bdc..fdaa067 100644
--- a/src/gpu/GrClipMaskManager.cpp
+++ b/src/gpu/GrClipMaskManager.cpp
@@ -416,7 +416,7 @@
const SkClipStack::Iter::Clip* clip = NULL;
for (clip = iter.skipToTopmost(SkRegion::kReplace_Op);
NULL != clip;
- clip = iter.nextCombined()) {
+ clip = iter.next()) {
if (clip->fDoAA) {
return true;
@@ -445,7 +445,7 @@
for (clip = iter.skipToTopmost(SkRegion::kReplace_Op);
NULL != clip;
- clip = iter.nextCombined()) {
+ clip = iter.next()) {
// rects can always be drawn directly w/o using the software path
// so only paths need to be checked
@@ -619,7 +619,7 @@
for (clip = iter->skipToTopmost(SkRegion::kReplace_Op);
NULL != clip && !done;
- clip = iter->nextCombined()) {
+ clip = iter->next()) {
switch (clip->fOp) {
case SkRegion::kReplace_Op:
// replace ignores everything previous
@@ -966,7 +966,7 @@
GrAutoScratchTexture temp;
bool first = true;
// walk through each clip element and perform its set op
- for ( ; NULL != clip; clip = iter.nextCombined()) {
+ for ( ; NULL != clip; clip = iter.next()) {
SkRegion::Op op = clip->fOp;
if (first) {
@@ -1107,7 +1107,7 @@
// walk through each clip element and perform its set op
// with the existing clip.
- for ( ; NULL != clip; clip = iter.nextCombined()) {
+ for ( ; NULL != clip; clip = iter.next()) {
GrPathFill fill;
bool fillInverted = false;
// enabled at bottom of loop
@@ -1473,7 +1473,7 @@
helper.clear(clearToInside ? 0xFF : 0x00);
bool first = true;
- for ( ; NULL != clip; clip = iter.nextCombined()) {
+ for ( ; NULL != clip; clip = iter.next()) {
SkRegion::Op op = clip->fOp;
if (first) {