Revert of 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 9e62eb11cd8a1008e5c05bcc6c06f65e47e0b359..ba18392c88507615208ef219c0d80628df9a324a 100644
--- a/src/core/SkPicturePlayback.cpp
+++ b/src/core/SkPicturePlayback.cpp
@@ -859,7 +859,7 @@
         fStateTree->getIterator(*activeOps, &canvas);
 
     if (it.isValid()) {
-        uint32_t skipTo = it.nextDraw();
+        uint32_t skipTo = it.draw();
         if (kDrawComplete == skipTo) {
             return;
         }
@@ -915,7 +915,7 @@
                 // iterator until at or after skipTo
                 uint32_t adjustedSkipTo;
                 do {
-                    adjustedSkipTo = it.nextDraw();
+                    adjustedSkipTo = it.draw();
                 } while (adjustedSkipTo < skipTo);
                 skipTo = adjustedSkipTo;
             }
@@ -1254,7 +1254,7 @@
 #endif
 
         if (it.isValid()) {
-            uint32_t skipTo = it.nextDraw();
+            uint32_t skipTo = it.draw();
             if (kDrawComplete == skipTo) {
                 break;
             }