Refactor SkPictureStateTree::Iterator to avoid use of kClip_SaveFlag.

src/core/SkPicturePlayback.cpp

Index: src/core/SkPicturePlayback.cpp
diff --git a/src/core/SkPicturePlayback.cpp b/src/core/SkPicturePlayback.cpp
index bd5244d223dec825777f286b9459e8e4cd2e87ca..7d4c8430838d56eb97c8bcf8e5a21e00066e417f 100644
--- a/src/core/SkPicturePlayback.cpp
+++ b/src/core/SkPicturePlayback.cpp
@@ -851,7 +851,7 @@ void SkPicturePlayback::draw(SkCanvas& canvas, SkDrawPictureCallback* callback)
         fStateTree->getIterator(*activeOps, &canvas);
 
     if (it.isValid()) {
-        uint32_t skipTo = it.draw();
+        uint32_t skipTo = it.nextDraw();
         if (kDrawComplete == skipTo) {
             return;
         }
@@ -907,7 +907,7 @@ void SkPicturePlayback::draw(SkCanvas& canvas, SkDrawPictureCallback* callback)
                 // iterator until at or after skipTo
                 uint32_t adjustedSkipTo;
                 do {
-                    adjustedSkipTo = it.draw();
+                    adjustedSkipTo = it.nextDraw();
                 } while (adjustedSkipTo < skipTo);
                 skipTo = adjustedSkipTo;
             }
@@ -1246,7 +1246,7 @@ void SkPicturePlayback::draw(SkCanvas& canvas, SkDrawPictureCallback* callback)
 #endif
 
         if (it.isValid()) {
-            uint32_t skipTo = it.draw();
+            uint32_t skipTo = it.nextDraw();
             if (kDrawComplete == skipTo) {
                 break;
             }