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

src/core/SkPictureStateTree.h

Index: src/core/SkPictureStateTree.h
diff --git a/src/core/SkPictureStateTree.h b/src/core/SkPictureStateTree.h
index d61bf032cb89f6241578e9e19bfb769a2f8366e3..448c0d31ce521651421afff0df290abc9b3551e3 100644
--- a/src/core/SkPictureStateTree.h
+++ b/src/core/SkPictureStateTree.h
@@ -75,16 +75,12 @@
     class Iterator {
     public:
         /** Returns the next offset into the picture stream, or kDrawComplete if complete. */
-        uint32_t nextDraw();
+        uint32_t draw();
         static const uint32_t kDrawComplete = SK_MaxU32;
         Iterator() : fPlaybackMatrix(), fValid(false) { }
         bool isValid() const { return fValid; }
-
     private:
         Iterator(const SkTDArray<void*>& draws, SkCanvas* canvas, Node* root);
-
-        void setCurrentMatrix(const SkMatrix*);
-
         // The draws this iterator is associated with
         const SkTDArray<void*>* fDraws;
 
@@ -101,7 +97,7 @@
         const SkMatrix fPlaybackMatrix;
 
         // Cache of current matrix, so we can avoid redundantly setting it
-        const SkMatrix* fCurrentMatrix;
+        SkMatrix* fCurrentMatrix;
 
         // current position in the array of draws
         int fPlaybackIndex;