Revert of Refactor SkPictureStateTree::Iterator to avoid use of kClip_SaveFlag.

src/core/SkPicturePlayback.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include <new>
 #include "SkBBoxHierarchy.h"
 #include "SkPicturePlayback.h"
 #include "SkPictureRecord.h"
@@ skipping 841 matching lines @@
                 activeOps = &((const CachedOperationList&)activeOpsList).fOps;
             }
         }
     }
 
     SkPictureStateTree::Iterator it = (NULL == activeOps) ?
         SkPictureStateTree::Iterator() :
         fStateTree->getIterator(*activeOps, &canvas);
 
     if (it.isValid()) {
-        uint32_t skipTo = it.nextDraw();
+        uint32_t skipTo = it.draw();
         if (kDrawComplete == skipTo) {
             return;
         }
         reader.setOffset(skipTo);
     }
 
     // Record this, so we can concat w/ it if we encounter a setMatrix()
     SkMatrix initialMatrix = canvas.getTotalMatrix();
     int originalSaveCount = canvas.getSaveCount();
 
@@ skipping 35 matching lines @@
             }
 #endif
         }
 
         if (0 != skipTo) {
             if (it.isValid()) {
                 // If using a bounding box hierarchy, advance the state tree
                 // iterator until at or after skipTo
                 uint32_t adjustedSkipTo;
                 do {
-                    adjustedSkipTo = it.nextDraw();
+                    adjustedSkipTo = it.draw();
                 } while (adjustedSkipTo < skipTo);
                 skipTo = adjustedSkipTo;
             }
             if (kDrawComplete == skipTo) {
                 break;
             }
             reader.setOffset(skipTo);
             continue;
         }
 
@@ skipping 318 matching lines @@
             } break;
             default:
                 SkASSERT(0);
         }
 
 #ifdef SK_DEVELOPER
         this->postDraw(opIndex);
 #endif
 
         if (it.isValid()) {
-            uint32_t skipTo = it.nextDraw();
+            uint32_t skipTo = it.draw();
             if (kDrawComplete == skipTo) {
                 break;
             }
             reader.setOffset(skipTo);
         }
     }
 
 #ifdef SPEW_CLIP_SKIPPING
     {
         size_t size =  skipRect.fSize + skipRRect.fSize + skipPath.fSize + skipRegion.fSize +
@@ skipping 511 matching lines @@
     for (index = 0; index < fPictureCount; index++)
         bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - pBuffer),
             "picture%p, ", fPictureRefs[index]);
     if (fPictureCount > 0)
         SkDebugf("%s0};\n", pBuffer);
 
     const_cast<SkPicturePlayback*>(this)->dumpStream();
 }
 
 #endif