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

src/core/SkPictureStateTree.h

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkPictureStateTree_DEFINED
 #define SkPictureStateTree_DEFINED
@@ skipping 57 matching lines @@
      * due to a command pattern optimization in SkPicture.
      */
     void saveCollapsed();
 
     /**
      * Playback helper
      */
     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;
 
         // canvas this is playing into (so we can insert saves/restores as necessary)
         SkCanvas* fCanvas;
 
         // current state node
         Node* fCurrentNode;
 
         // List of nodes whose state we need to apply to reach TargetNode
         SkTDArray<Node*> fNodes;
 
         // The matrix of the canvas we're playing back into
         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;
         // Whether or not we need to do a save next iteration
         bool fSave;
 
         // Whether or not this is a valid iterator (the default public constructor sets this false)
         bool fValid;
 
         friend class SkPictureStateTree;
@@ skipping 28 matching lines @@
         };
     };
 
     Node fRoot;
     SkMatrix fRootMatrix;
 
     typedef SkRefCnt INHERITED;
 };
 
 #endif